diff options
Diffstat (limited to 'make')
| -rw-r--r-- | make/build-test.xml | 15 | ||||
| -rw-r--r-- | make/build.xml | 8 | ||||
| -rwxr-xr-x | make/gluegen-cpptasks-base.xml | 1 |
3 files changed, 5 insertions, 19 deletions
diff --git a/make/build-test.xml b/make/build-test.xml index a83333d..85437f6 100644 --- a/make/build-test.xml +++ b/make/build-test.xml @@ -177,7 +177,9 @@ <src path="${test.jcpp.base.dir}"/> <src path="${build_t.gen}" /> </javac> + </target> + <target name="jar.build"> <jar destfile="${gluegen-test-util.jar}"> <fileset dir="${build_t.java}"> <include name="${test.junit.util.rel}/**/*.class"/> @@ -198,7 +200,7 @@ </jar> </target> - <target name="android.package" depends="java.generate,java.build,native.build" if="isAndroid"> + <target name="android.package" depends="java.generate,java.build,native.build,jar.build" if="isAndroid"> <aapt.signed assetsdir="resources/assets-test" jarbuilddir="${build_t}" @@ -591,7 +593,7 @@ chmod 644 ${results}/* \${line.separator} </gluegen> </target> - <target name="junit.test1.c.build" depends="junit.test1i.c.build, c.rename.lib.test1.mingw, junit.test1p1.c.build, c.rename.lib.test1p1.mingw, junit.test1p2.c.build, c.rename.lib.test1p2.mingw" unless="build.javaonly" /> + <target name="junit.test1.c.build" depends="junit.test1i.c.build, junit.test1p1.c.build, junit.test1p2.c.build" unless="build.javaonly" /> <!-- this is the test1 implementation --> <target name="junit.test1i.c.build"> @@ -609,9 +611,6 @@ chmod 644 ${results}/* \${line.separator} linker.cfg.id="linker.test1.dll.cfg.id"/> </target> - <target name="c.rename.lib.test1.mingw" if="isMingW"> - <move file="${build_t.lib}/libtest1.so" tofile="${build_t.lib}/test1.dll" /> - </target> <!-- this is a fixed binding to the test1 implementation --> <target name="junit.test1p1.c.build"> @@ -632,9 +631,6 @@ chmod 644 ${results}/* \${line.separator} compiler.cfg.id="${compiler.cfg.id}" linker.cfg.id="linker.test1.fixed.cfg.id"/> </target> - <target name="c.rename.lib.test1p1.mingw" if="isMingW"> - <move file="${build_t.lib}/libBindingtest1p1.so" tofile="${build_t.lib}/Bindingtest1p1.dll" /> - </target> <!-- this is a dynamic lookup binding to the test1 implementation --> <target name="junit.test1p2.c.build"> @@ -654,9 +650,6 @@ chmod 644 ${results}/* \${line.separator} compiler.cfg.id="${compiler.cfg.id}" linker.cfg.id="linker.test1.runtime.cfg.id"/> </target> - <target name="c.rename.lib.test1p2.mingw" if="isMingW"> - <move file="${build_t.lib}/libBindingtest1p2.so" tofile="${build_t.lib}/Bindingtest1p2.dll" /> - </target> <!-- diff --git a/make/build.xml b/make/build.xml index dc14668..7117860 100644 --- a/make/build.xml +++ b/make/build.xml @@ -434,12 +434,6 @@ <target name="c.configure" depends="gluegen.cpptasks.detect.os,gluegen.cpptasks.setup.compiler,declare.win32,declare.linux,declare.android,declare.solaris,declare.macosx,declare.ios.amd64,declare.ios.arm64,declare.freebsd,declare.hpux,gluegen.cpptasks.configure.compiler" /> - <target name="c.rename.lib.mingw" if="isMingW"> - <!-- FIXME: this is a hack; the cpptask should have an option to change the - suffix or at least understand the override from .so to .dll --> - <move file="${build}/obj/libgluegen_rt.so" tofile="${build}/obj/gluegen_rt.dll" /> - </target> - <target name="c.manifest" if="isVC8Family"> <!-- exec mt, the Microsoft Manifest Tool, to include DLL manifests in order to resolve the location of msvcr80.dll --> <msvc.manifest objdir="${build}/obj" dllname="gluegen_rt" /> @@ -520,8 +514,6 @@ </cc> - <antcall target="c.rename.lib.mingw" inheritRefs="true" /> - <gluegen.make.libsymbols builddir="${build}" nativelib="${gluegen.lib.dir}/${output.lib.name.os}" symbolsfile="${gluegen.lib.dir}/${native.library.prefix}${output.lib.name}.symbols" /> diff --git a/make/gluegen-cpptasks-base.xml b/make/gluegen-cpptasks-base.xml index cda6592..33d9c9f 100755 --- a/make/gluegen-cpptasks-base.xml +++ b/make/gluegen-cpptasks-base.xml @@ -785,6 +785,7 @@ <echo message="os and arch: ${os.and.arch}" /> <echo message="os and arch.dot: ${os.and.arch.dot}" /> <echo message="os and arch.slash: ${os.and.arch.slash}" /> + <echo message="native library: prefix '${native.library.prefix}', suffix '${native.library.suffix}'" /> </target> <target name="gluegen.cpptasks.detect.os" depends="gluegen.properties.load.user,gluegen.cpptasks.detect.os.custom,gluegen.cpptasks.detect.os.1,gluegen.cpptasks.detect.os.2"> |