diff options
| -rw-r--r-- | make/build-test.xml | 17 | ||||
| -rw-r--r-- | make/build.xml | 5 | ||||
| -rwxr-xr-x | make/gluegen-cpptasks-base.xml | 1 | ||||
| -rwxr-xr-x | make/scripts/runtest.sh | 3 |
4 files changed, 4 insertions, 22 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> <!-- diff --git a/make/build.xml b/make/build.xml index 77a0ec0..dc6602f 100644 --- a/make/build.xml +++ b/make/build.xml @@ -413,8 +413,7 @@ </target> <target name="c.rename.lib.macosx" if="isOSX"> - <move file="${build}/obj/libgluegen-rt.dylib" tofile="${build}/obj/libgluegen-rt.jnilib" /> - <copy file="${build}/obj/libgluegen-rt.jnilib" tofile="${build}/obj/libgluegen-rt.so" /> + <copy file="${build}/obj/libgluegen-rt.dylib" tofile="${build}/obj/libgluegen-rt.so" /> </target> <target name="c.manifest" if="isVC8Family"> @@ -429,7 +428,7 @@ <property name="output.lib.name" value="gluegen-rt" /> <condition property="output.lib.name.os" value="lib${output.lib.name}.so"><isset property="isUnix"/></condition> <condition property="output.lib.name.os" value="${output.lib.name}.dll"><isset property="isWindows"/></condition> - <condition property="output.lib.name.os" value="lib${output.lib.name}.jnilib"><isset property="isOSX"/></condition> + <condition property="output.lib.name.os" value="lib${output.lib.name}.dylib"><isset property="isOSX"/></condition> <uptodate property="gluegen.build.skip.c"> <srcfiles dir= "${project.root}" includes="${c.compiler.src.files.os}"/> diff --git a/make/gluegen-cpptasks-base.xml b/make/gluegen-cpptasks-base.xml index 3837055..0a6fb25 100755 --- a/make/gluegen-cpptasks-base.xml +++ b/make/gluegen-cpptasks-base.xml @@ -1679,7 +1679,6 @@ <include name="**/*.so"/> <!-- unix --> <include name="**/*.dll"/> <!-- windows --> <include name="**/*.dylib"/> <!-- macosx --> - <include name="**/*.jnilib"/> <!-- macosx --> </fileset> </apply> </target> diff --git a/make/scripts/runtest.sh b/make/scripts/runtest.sh index be2e415..5ba9b73 100755 --- a/make/scripts/runtest.sh +++ b/make/scripts/runtest.sh @@ -62,7 +62,8 @@ X_ARGS="-Drootrel.build=$ROOTREL_BUILD -Dgluegen.root=$GLUEGEN_ROOT" #D_ARGS="-Djogamp.debug.Lock.TraceLock" #D_ARGS="-Djogamp.debug.IOUtil -Djogamp.debug.IOUtil.Exe -Djogamp.debug.IOUtil.Exe.NoStream" #D_ARGS="-Djogamp.debug.IOUtil -Djogamp.debug.TempFileCache -Djogamp.debug.TempJarCache -Djogamp.debug.IOUtil.Exe" -D_ARGS="-Djogamp.debug.IOUtil -Djogamp.debug.TempFileCache -Djogamp.debug.TempJarCache -Djava.io.tmpdir=/run/501" +#D_ARGS="-Djogamp.debug.IOUtil -Djogamp.debug.TempFileCache -Djogamp.debug.TempJarCache -Djava.io.tmpdir=/run/501" +D_ARGS="-Djogamp.debug.IOUtil -Djogamp.debug.TempFileCache -Djogamp.debug.TempJarCache" #D_ARGS="-Djogamp.debug.ByteBufferInputStream" #D_ARGS="-Djogamp.debug.Buffers" #D_ARGS="-Djogamp.debug.Bitstream" |