Skip to content
Permalink
Browse files

Updated for latest clang and fixed odd Ivy issues

  • Loading branch information
Ian Emmons
Ian Emmons committed Sep 29, 2019
1 parent 0b8bd6a commit 3cbb2c8732fd57bed5492248fd158e778123a158
@@ -18,10 +18,10 @@ class LazyRsrc
{
public:
LazyRsrc(KbInstance* pKB, const char*const pUri);
LazyRsrc(const LazyRsrc&) = default;
LazyRsrc& operator=(const LazyRsrc&) = default;
LazyRsrc(LazyRsrc&&) = default;
LazyRsrc& operator=(LazyRsrc&&) = default;
LazyRsrc(const LazyRsrc&) = delete;
LazyRsrc& operator=(const LazyRsrc&) = delete;
LazyRsrc(LazyRsrc&&) = delete;
LazyRsrc& operator=(LazyRsrc&&) = delete;
~LazyRsrc() = default;

PARLIAMENT_EXPORT ResourceId id() const;
@@ -31,8 +31,8 @@ class LazyRsrc
{ return m_pUri; }

private:
KbInstance* m_pKB;
const char*const m_pUri;
KbInstance* m_pKB;
const char*const m_pUri;
mutable RsrcString m_uri;
mutable ResourceId m_id;
};
@@ -41,10 +41,10 @@ class UriLib
{
public:
explicit UriLib(KbInstance* pKB = nullptr);
UriLib(const UriLib&) = default;
UriLib& operator=(const UriLib&) = default;
UriLib(UriLib&&) = default;
UriLib& operator=(UriLib&&) = default;
UriLib(const UriLib&) = delete;
UriLib& operator=(const UriLib&) = delete;
UriLib(UriLib&&) = delete;
UriLib& operator=(UriLib&&) = delete;
~UriLib() = default;

ResourceId translateReservedPredicate(ResourceId predicateId) const;
@@ -225,7 +225,7 @@
casesensitive="false"
defaultValue="${env.BOOST_VERSION}"/>
<property name="boostLibSuffix"
value="-clang-darwin100-mt${variantSuffix}${addrModelSuffix}-${boostVer}.dylib"/>
value="-clang-darwin110-mt${variantSuffix}${addrModelSuffix}-${boostVer}.dylib"/>

<antcall target="changeInstallName">
<param name="dylibDir" value="${dylibDir}"/>
@@ -19,11 +19,8 @@
<dependencies>
<dependency org="org.apache.jena" name="jena-arq" rev="2.9.4"
conf="default->default"/>
<dependency org="org.slf4j" name="slf4j-api" rev="${slf4j.version}" conf="default->default">
<!-- Artifact element avoids bug https://jira.qos.ch/browse/SLF4J-285 -->
<artifact name="slf4j-api" type="jar"
url="https://repo1.maven.org/maven2/org/slf4j/slf4j-api/${slf4j.version}/slf4j-api-${slf4j.version}.jar"/>
</dependency>
<dependency org="org.slf4j" name="slf4j-api" rev="${slf4j.version}"
conf="default->default"/>
<dependency org="org.slf4j" name="slf4j-log4j12" rev="${slf4j.version}"
conf="default->default"/>
<dependency org="org.slf4j" name="jcl-over-slf4j" rev="${slf4j.version}"
149 build.xml
@@ -280,153 +280,4 @@
<arg line="update"/>
</exec>
</target>

<!-- ======= IVY PUBLISHING TASKS ============= -->

<property name="project.organization" value="com.bbn.parliament"/>
<property name="artifacts.dir" value="${artifactsDir}"/>
<property name="ivy.repo" value="tools-ke-publish"/>
<property name="ivy.log.level" value="quiet"/>

<target name="publish-integration" description="Publish the Parliament components as an Ivy integration build">
<antcall target="publish">
<param name="overwrite" value="true"/>
<param name="release.status" value="integration"/>
<param name="release.version" value="${parliamentVersion}-SNAPSHOT"/>
</antcall>
</target>

<target name="publish-release" description="Publish the Parliament components as an Ivy release">
<antcall target="publish">
<param name="overwrite" value="false"/>
<param name="release.status" value="release"/>
<param name="release.version" value="${parliamentVersion}"/>
</antcall>
</target>

<target name="publish" depends="checkForNatives">
<fail
unless="release.version"
message="Publishing requires a version. Set the release.version property (e.g. ant publish-release -Drelease.version=1.0) - ${release.version}"/>
<fail
unless="overwrite"
message="Property, 'overwrite' must be set to true or false"/>
<fail
unless="release.status"
message="Property, 'release.status' must be set to integration or release"/>

<echo level="info">
#### Publishing Parliament Components to tools-ke repository as ${release.status} build with version ${release.version}. ####
</echo>

<!-- Parliament JNI -->
<ivy:resolve log="${ivy.log.level}" file="${ivyDir}/ivy-parliamentjni.xml"/>
<ivy:publish
organisation="${project.organization}"
module="Parliament"
pubrevision="${release.version}"
forcedeliver="true"
resolver="${ivy.repo}"
overwrite="${overwrite}"
status="${release.status}"
artifactspattern="${artifacts.dir}/[artifact].[ext]"/>

<!-- JenaParliament -->
<ivy:resolve log="${ivy.log.level}" file="${ivyDir}/ivy-jenaparliament.xml"/>
<ivy:publish
organisation="${project.organization}"
module="JenaParliament"
pubrevision="${release.version}"
forcedeliver="true"
resolver="${ivy.repo}"
overwrite="${overwrite}"
status="${release.status}"
artifactspattern="${artifacts.dir}/[artifact].[ext]"/>

<!-- Joseki Parliament Client -->
<ivy:resolve log="${ivy.log.level}" file="${ivyDir}/ivy-josekiparliamentclient.xml"/>
<ivy:publish
organisation="${project.organization}"
module="JosekiParliamentClient"
pubrevision="${release.version}"
forcedeliver="true"
resolver="${ivy.repo}"
overwrite="${overwrite}"
status="${release.status}"
artifactspattern="${artifacts.dir}/[artifact].[ext]"/>

<!-- Win32 Natives -->
<antcall target="publishWin32">
<param name="overwrite" value="${overwrite}"/>
<param name="release.status" value="${release.status}"/>
<param name="release.version" value="${release.version}"/>
</antcall>

<!-- Win64 Natives -->
<antcall target="publishWin64">
<param name="overwrite" value="${overwrite}"/>
<param name="release.status" value="${release.status}"/>
<param name="release.version" value="${release.version}"/>
</antcall>
<!-- MacOs Natives -->
<antcall target="publishMacOs">
<param name="overwrite" value="${overwrite}"/>
<param name="release.status" value="${release.status}"/>
<param name="release.version" value="${release.version}"/>
</antcall>
</target>

<target name="checkForNatives">
<available file="${windowsReleaseDir}/32" type="dir" property="win32.exists"/>
<available file="${windowsReleaseDir}/64" type="dir" property="win64.exists"/>
<available file="${macosReleaseDir}" type="dir" property="macos.exists"/>
</target>

<target name="publishWin32" if="win32.exists">
<zip destfile="${artifactsDir}/ParliamentDB-win32.zip">
<fileset dir="${windowsReleaseDir}/32" includes="*"/>
</zip>
<ivy:resolve log="${ivy.log.level}" file="${ivyDir}/ivy-parliamentdb-win32.xml"/>
<ivy:publish
organisation="${project.organization}"
module="ParliamentDB-win32"
pubrevision="${release.version}"
forcedeliver="true"
resolver="${ivy.repo}"
overwrite="${overwrite}"
status="${release.status}"
artifactspattern="${artifacts.dir}/[artifact].[ext]"/>
</target>

<target name="publishWin64" if="win64.exists">
<zip destfile="${artifactsDir}/ParliamentDB-win64.zip">
<fileset dir="${windowsReleaseDir}/64" includes="*"/>
</zip>
<ivy:resolve log="${ivy.log.level}" file="${ivyDir}/ivy-parliamentdb-win64.xml"/>
<ivy:publish
organisation="${project.organization}"
module="ParliamentDB-win64"
pubrevision="${release.version}"
forcedeliver="true"
resolver="${ivy.repo}"
overwrite="${overwrite}"
status="${release.status}"
artifactspattern="${artifacts.dir}/[artifact].[ext]"/>
</target>

<target name="publishMacOs" if="macos.exists">
<zip destfile="${artifactsDir}/ParliamentDB-macos.zip">
<fileset dir="${macosReleaseDir}" includes="*"/>
</zip>
<ivy:resolve log="${ivy.log.level}" file="${ivyDir}/ivy-parliamentdb-macos.xml"/>
<ivy:publish
organisation="${project.organization}"
module="ParliamentDB-macos"
pubrevision="${release.version}"
forcedeliver="true"
resolver="${ivy.repo}"
overwrite="${overwrite}"
status="${release.status}"
artifactspattern="${artifacts.dir}/[artifact].[ext]"/>
</target>
</project>
@@ -14,7 +14,7 @@ constant BoostVersionAbbrvAlternatives : [ MATCH "([0-9]+_[0-9]+)_0" "([0-9]+_[0
constant BoostVersionAbbrv : $(BoostVersionAbbrvAlternatives[1]) ;
constant BdbVersion : [ os.environ BDB_VERSION ] ;

constant Compiler : clang-darwin100 ;
constant Compiler : clang-darwin110 ;

constant BoostPfx : <source>$(BoostDir)/stage-clang/lib/libboost_ ;

@@ -6,6 +6,11 @@ Version 2.7.14 (?):
command line, the logging configuration is unchanged, so you will still be able to
see the log contents in real time in that case.)

* Updated for Apple's clang 11 compiler

* Fixed an issue in the way Ivy dependencies on SLF4J were coded.

* Removed the obsolete support for Ivy publishing to the BBN-internal tools server.


=================================================
@@ -45,11 +45,8 @@
conf="compile-ide->master;runtime-ide->default;test->default"/>
<dependency name="junit" org="junit" rev="4.12"
conf="test->default"/>
<dependency org="org.slf4j" name="slf4j-api" rev="${slf4j.version}" conf="compile-ide->master;runtime-ide->default">
<!-- Artifact element avoids bug https://jira.qos.ch/browse/SLF4J-285 -->
<artifact name="slf4j-api" type="jar"
url="https://repo1.maven.org/maven2/org/slf4j/slf4j-api/${slf4j.version}/slf4j-api-${slf4j.version}.jar"/>
</dependency>
<dependency org="org.slf4j" name="slf4j-api" rev="${slf4j.version}"
conf="compile-ide->master;runtime-ide->default"/>
<dependency org="org.slf4j" name="slf4j-log4j12" rev="${slf4j.version}"
conf="compile-ide->master;runtime-ide->default"/>
<dependency org="org.slf4j" name="jcl-over-slf4j" rev="${slf4j.version}"
@@ -41,11 +41,8 @@
<dependencies>
<dependency org="org.apache.jena" name="jena-arq" rev="2.9.4"
conf="compile-ide->master;runtime-ide->default"/>
<dependency org="org.slf4j" name="slf4j-api" rev="${slf4j.version}" conf="compile-ide->master;runtime-ide->default">
<!-- Artifact element avoids bug https://jira.qos.ch/browse/SLF4J-285 -->
<artifact name="slf4j-api" type="jar"
url="https://repo1.maven.org/maven2/org/slf4j/slf4j-api/${slf4j.version}/slf4j-api-${slf4j.version}.jar"/>
</dependency>
<dependency org="org.slf4j" name="slf4j-api" rev="${slf4j.version}"
conf="compile-ide->master;runtime-ide->default"/>
<dependency org="org.slf4j" name="slf4j-log4j12" rev="${slf4j.version}"
conf="compile-ide->master;runtime-ide->default"/>
<dependency org="org.slf4j" name="jcl-over-slf4j" rev="${slf4j.version}"
@@ -41,11 +41,8 @@
<dependencies>
<dependency org="org.apache.jena" name="jena-arq" rev="2.9.4"
conf="compile-ide->master;runtime-ide->default;test->default"/>
<dependency org="org.slf4j" name="slf4j-api" rev="${slf4j.version}" conf="compile-ide->master;runtime-ide->default">
<!-- Artifact element avoids bug https://jira.qos.ch/browse/SLF4J-285 -->
<artifact name="slf4j-api" type="jar"
url="https://repo1.maven.org/maven2/org/slf4j/slf4j-api/${slf4j.version}/slf4j-api-${slf4j.version}.jar"/>
</dependency>
<dependency org="org.slf4j" name="slf4j-api" rev="${slf4j.version}"
conf="compile-ide->master;runtime-ide->default"/>
<dependency org="org.slf4j" name="slf4j-log4j12" rev="${slf4j.version}"
conf="compile-ide->master;runtime-ide->default"/>
<dependency org="org.slf4j" name="jcl-over-slf4j" rev="${slf4j.version}"
@@ -1,7 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>

<ivysettings>
<property name="ivy.ssh.keyfile" value="${ivy.default.ivy.user.dir}/loki.keyfile"/>
<properties environment="env"/>
<property name="ivy.default.ivy.user.dir" value="${env.IVY_USER_DIR}" ifset="env.IVY_USER_DIR"/>

<property name="ivy.retrieve.pattern" value="${ivy.lib.dir}/[conf]/[artifact]-[revision].[ext]"/>

<property name="berkeleydb-je.version" value="18.3.12"/>
@@ -19,46 +21,35 @@
<settings defaultResolver="default"/>

<!-- Creates the 'public' resolver for http://repo1.maven.org/maven2/ -->
<include url="${ivy.default.settings.dir}/ivysettings-public.xml"/>

<!-- Creates the default 'shared' resolver -->
<!-- include url="${ivy.default.settings.dir}/ivysettings-shared.xml"/ -->

<!-- Creates the 'local' resolver which is ${user.home}/.ivy2/local -->
<include url="${ivy.default.settings.dir}/ivysettings-local.xml"/>

<!-- Creates the default 'main' chain resolver -->
<!-- include url="${ivy.default.settings.dir}/ivysettings-main-chain.xml"/ -->

<!-- Creates the default 'default' chain resolver -->
<!-- include url="${ivy.default.settings.dir}/ivysettings-default-chain.xml"/ -->
<!-- include url="${ivy.default.settings.dir}/ivysettings-public.xml"/ -->

<resolvers>
<!-- Read-only Repository on tools.ke.bbn.com -->
<url name="tools-ke">
<ivy pattern="http://tools.ke.bbn.com/ivy-public/[organisation]/[module]/[revision]/ivys/ivy.xml"/>
<artifact pattern="http://tools.ke.bbn.com/ivy-public/[organisation]/[module]/[revision]/[type]s/[artifact].[ext]"/>
</url>

<!-- Writeable Repository on tools.ke.bbn.com -->
<sftp name="tools-ke-publish" user="${user.name}" keyFile="${ivy.ssh.keyfile}" host="tools.ke.bbn.com">
<ivy pattern="/var/www/html/ivy-public/[organisation]/[module]/[revision]/ivys/ivy.xml"/>
<artifact pattern="/var/www/html/ivy-public/[organisation]/[module]/[revision]/[type]s/[artifact].[ext]"/>
</sftp>
<!-- Resolver for http://repo1.maven.org/maven2/ -->
<ibiblio name="default-public" m2compatible="true"/>

<ibiblio name="geotools" m2compatible="true"
root="http://download.osgeo.org/webdav/geotools/"/>

<chain name="main" returnFirst="true">
<resolver ref="tools-ke"/>
<chain name="public" returnFirst="true">
<resolver ref="default-public"/>
<resolver ref="geotools"/>
<resolver ref="public"/>
</chain>

<!-- Chain resolver that says to check local first, then try tools-ke -->
<chain name="default" returnFirst="true">
<resolver ref="local"/>
<resolver ref="main"/>
</chain>
<!--
<ivy pattern="http://tools.ke.bbn.com/ivy-public/[organisation]/[module]/[revision]/ivys/ivy.xml"/>
<artifact pattern="http://tools.ke.bbn.com/ivy-public/[organisation]/[module]/[revision]/[type]s/[artifact].[ext]"/>
-->
</resolvers>

<!-- Creates the default 'shared' resolver -->
<include url="${ivy.default.settings.dir}/ivysettings-shared.xml"/>

<!-- Creates the 'local' resolver which is ${user.home}/.ivy2/local -->
<include url="${ivy.default.settings.dir}/ivysettings-local.xml"/>

<!-- Creates the default 'main' chain resolver -->
<include url="${ivy.default.settings.dir}/ivysettings-main-chain.xml"/>

<!-- Creates the default 'default' chain resolver -->
<include url="${ivy.default.settings.dir}/ivysettings-default-chain.xml"/>
</ivysettings>
@@ -19,11 +19,8 @@
conf="default->default"/>
<dependency org="com.github.jsonld-java" name="jsonld-java" rev="${jsonld-java.version}"
conf="default->default"/>
<dependency org="org.slf4j" name="slf4j-api" rev="${slf4j.version}" conf="default->default">
<!-- Artifact element avoids bug https://jira.qos.ch/browse/SLF4J-285 -->
<artifact name="slf4j-api" type="jar"
url="https://repo1.maven.org/maven2/org/slf4j/slf4j-api/${slf4j.version}/slf4j-api-${slf4j.version}.jar"/>
</dependency>
<dependency org="org.slf4j" name="slf4j-api" rev="${slf4j.version}"
conf="default->default"/>
<dependency org="org.slf4j" name="slf4j-log4j12" rev="${slf4j.version}"
conf="default->default"/>
<dependency org="org.slf4j" name="jcl-over-slf4j" rev="${slf4j.version}"
@@ -18,11 +18,8 @@
</configurations>

<dependencies>
<dependency org="org.slf4j" name="slf4j-api" rev="${slf4j.version}" conf="logging->default">
<!-- Artifact element avoids bug https://jira.qos.ch/browse/SLF4J-285 -->
<artifact name="slf4j-api" type="jar"
url="https://repo1.maven.org/maven2/org/slf4j/slf4j-api/${slf4j.version}/slf4j-api-${slf4j.version}.jar"/>
</dependency>
<dependency org="org.slf4j" name="slf4j-api" rev="${slf4j.version}"
conf="logging->default"/>
<dependency org="org.slf4j" name="slf4j-log4j12" rev="${slf4j.version}"
conf="logging->default"/>
<dependency org="org.slf4j" name="jcl-over-slf4j" rev="${slf4j.version}"

0 comments on commit 3cbb2c8

Please sign in to comment.
You can’t perform that action at this time.