diff options
| author | Sven Gothel <[email protected]> | 2020-01-04 18:46:33 +0100 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2020-01-04 18:46:33 +0100 |
| commit | 26024b4b205d34563c641578dc1d2791cb1a03d9 (patch) | |
| tree | 4717a22c0f9c12615051a749042c39bf47e330e9 /make | |
| parent | 5a59c20f9bd9be5c20b176720810dd5a95a75d87 (diff) | |
native.tag.jar: Revert explicit inclusion of *.symbols file -> implicit inclusion/exclusion based on build.dynamiclibs
Exclude *.symbols files implicitly when building 'build.dynamiclibs'
and include *.symbols files implicitly when not building 'build.dynamiclibs' (static libs)
Diffstat (limited to 'make')
| -rw-r--r-- | make/build.xml | 2 | ||||
| -rwxr-xr-x | make/gluegen-cpptasks-base.xml | 21 |
2 files changed, 19 insertions, 4 deletions
diff --git a/make/build.xml b/make/build.xml index 07ef699..396cc75 100644 --- a/make/build.xml +++ b/make/build.xml @@ -557,7 +557,7 @@ nativejarfile="${build}/gluegen-rt-natives-${os.and.arch}.jar" manifestfile="${build}/Manifest-rt-natives.temp" module="common" - includelibs="*${output.lib.name}.${native.library.suffix} *.symbols" /> + includelibs="*${output.lib.name}.${native.library.suffix}" /> <!-- Produce duplicates for different configurations, since non-native-jar aliasing (Bug 1023/Bug 1024) --> <copy file="${build}/gluegen-rt-natives-${os.and.arch}.jar" tofile="${build}/gluegen-rt-android-natives-${os.and.arch}.jar"/> diff --git a/make/gluegen-cpptasks-base.xml b/make/gluegen-cpptasks-base.xml index 6c86b15..414a4de 100755 --- a/make/gluegen-cpptasks-base.xml +++ b/make/gluegen-cpptasks-base.xml @@ -1909,24 +1909,39 @@ <attribute name="excludelibs" default="" /> <sequential> - <echo message="native.tag.jar @{module} for @{nativejarfile} include @{includelibs} exclude @{excludelibs}"/> + <echo message="native.tag.jar @{module} (attr) for @{nativejarfile} include @{includelibs} exclude @{excludelibs}"/> <var name="nativejarfile.basename" unset="true"/> <var name="nativejarfile.tmpdir" unset="true"/> <var name="nativejarfile.tmpdir.natives" unset="true"/> + <var name="nativejarfile.includelibs" unset="true"/> + <var name="nativejarfile.excludelibs" unset="true"/> <basename property="nativejarfile.basename" file="@{nativejarfile}"/> <property name="nativejarfile.tmpdir" value="@{objdir}/${nativejarfile.basename}.d" /> <property name="nativejarfile.tmpdir.natives" value="${nativejarfile.tmpdir}/jar" /> <!-- In case we like to switch to a natives subfolder 'natives/${os.and.arch}' use the following --> <!-- property name="nativejarfile.tmpdir.natives" value="${nativejarfile.tmpdir}/jar/natives/${os.and.arch}" /--> + <!-- enforce inclusion/exclusion of *.symbols depending on build.dynamiclibs --> + <condition property="nativejarfile.includelibs" + value="@{includelibs}" + else="@{includelibs} *.symbols"> + <istrue value="${build.dynamiclibs}"/> + </condition> + <condition property="nativejarfile.excludelibs" + value="@{excludelibs} *.symbols" + else="@{excludelibs}"> + <istrue value="${build.dynamiclibs}"/> + </condition> + <echo message="native.tag.jar @{module} (props) ${nativejarfile.basename} include ${nativejarfile.includelibs} exclude ${nativejarfile.excludelibs}"/> + <mkdir dir="${nativejarfile.tmpdir}/java" /> <mkdir dir="${nativejarfile.tmpdir.natives}" /> <mkdir dir="${nativejarfile.tmpdir.natives}/natives" /> <mkdir dir="${nativejarfile.tmpdir.natives}/natives/${os.and.arch}" /> <copy todir="${nativejarfile.tmpdir.natives}/natives/${os.and.arch}"> <fileset dir="@{objdir}" - includes="@{includelibs}" - excludes="@{excludelibs}"/> + includes="${nativejarfile.includelibs}" + excludes="${nativejarfile.excludelibs}"/> </copy> <echo message='package ${nativejartag.package}.@{module}.${os.and.arch.dot}; public final class TAG { }' file="${nativejarfile.tmpdir}/java/${nativejartag.prefix}/@{module}/${os.and.arch.slash}/TAG.java"/> <javac destdir="${nativejarfile.tmpdir}/jar" |