diff options
| author | Sven Gothel <[email protected]> | 2023-01-23 10:11:45 +0100 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2023-01-23 10:11:45 +0100 |
| commit | a9f1ccf10e42076d88813d369cfbc3e205469428 (patch) | |
| tree | 4685861d1ca5432a5bad5876cef649efe1d3ab72 /make/build-test.xml | |
| parent | 594a960cd72a5859429967e3f23fa7aaac1f712c (diff) | |
Remove Windows dll-rename, adopting to cpptasks.jar change
Diffstat (limited to 'make/build-test.xml')
| -rw-r--r-- | make/build-test.xml | 15 |
1 files changed, 4 insertions, 11 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> <!-- |