aboutsummaryrefslogtreecommitdiffstats
path: root/make/build-test.xml
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2019-03-30 01:24:14 +0100
committerSven Gothel <[email protected]>2019-03-30 01:24:14 +0100
commit03bcef96e3105923ccc8c827b70b97ff0aa3464c (patch)
tree4caacb595238611501ee4df96930811edde431ae /make/build-test.xml
parent179c88fcc547f965cb5fdce2b03f4faa776871ac (diff)
Bug 1316: MacOSX: Keep *.dylib (Don't move to *.jnilib)
Since Java8 (or even earlier), JRE on OSX uses *.dylib native library suffix instead of *.jnilib when automatically searching and loading them. This is not easily being recognized by JogAmp, since we explicitly name the native libraries with full path when testing with our TempJarCache.
Diffstat (limited to 'make/build-test.xml')
-rw-r--r--make/build-test.xml17
1 files changed, 0 insertions, 17 deletions
diff --git a/make/build-test.xml b/make/build-test.xml
index 68f674f..6372696 100644
--- a/make/build-test.xml
+++ b/make/build-test.xml
@@ -215,12 +215,6 @@
<property name="linker.cfg.id" value="${linker.cfg.id.base}" />
</target>
- <!-- FIXME: this is a hack; the cpptask should have an option to change the
- suffix or at least understand the override from dylib to jnilib -->
- <target name="rename.dylib" if="isOSX">
- <move file="${src}" tofile="${dest}" />
- </target>
-
<macrodef name="c.build">
<attribute name="c.compiler.src.files" />
<attribute name="compiler.cfg.id" />
@@ -625,11 +619,6 @@ chmod 644 ${results}/* \${line.separator}
output.lib.name="Bindingtest1p1"
compiler.cfg.id="${compiler.cfg.id}"
linker.cfg.id="linker.test1.fixed.cfg.id"/>
-
- <antcall target="rename.dylib" inheritRefs="true">
- <param name="src" value="${build_t.lib}/libBindingtest1p1.dylib" />
- <param name="dest" value="${build_t.lib}/libBindingtest1p1.jnilib" />
- </antcall>
</target>
<!-- this is a dynamic lookup binding to the test1 implementation -->
@@ -651,12 +640,6 @@ chmod 644 ${results}/* \${line.separator}
output.lib.name="Bindingtest1p2"
compiler.cfg.id="${compiler.cfg.id}"
linker.cfg.id="linker.test1.runtime.cfg.id"/>
-
- <antcall target="rename.dylib" inheritRefs="true">
- <param name="src" value="${build_t.lib}/libBindingtest1p2.dylib" />
- <param name="dest" value="${build_t.lib}/libBindingtest1p2.jnilib" />
- </antcall>
-
</target>
<!--