diff options
| author | Sven Gothel <[email protected]> | 2014-07-05 15:13:19 +0200 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2014-07-05 15:13:19 +0200 |
| commit | 06fc570f70dc5ccfad7399d8426bdf224c239a5a (patch) | |
| tree | f844f7c9bcd564a8d945e5e7f1f085409f91d3b1 /make/build.xml | |
| parent | bda482e4eee76a5ba2139645682ae64dadacbc6b (diff) | |
| parent | 5951b33b303df3a12888fe0fbc5ccc88112a3984 (diff) | |
Merge remote-tracking branch 'github-mark/master' (Bug 1023/Bug 1024)
Conflicts:
make/scripts/tests.sh
(build.xml: Using <copy tofile=".."/> instead of producing new jar files via <jar> to keep identity)
Diffstat (limited to 'make/build.xml')
| -rw-r--r-- | make/build.xml | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/make/build.xml b/make/build.xml index 4eb27449d..50a0cfc28 100644 --- a/make/build.xml +++ b/make/build.xml @@ -166,6 +166,10 @@ <exclude name="*jogl_cg.${native.library.suffix}" /> </fileset> </jar> + <!-- Produce duplicates for diff 'all' configuration, since non-native-jar aliasing (Bug 1023/Bug 1024) --> + <copy file="${jar}/jogl-all-natives-${os.and.arch}.jar" tofile="${jar}/jogl-all-noawt-natives-${os.and.arch}.jar" /> + <copy file="${jar}/jogl-all-natives-${os.and.arch}.jar" tofile="${jar}/jogl-all-mobile-natives-${os.and.arch}.jar" /> + <copy file="${jar}/jogl-all-natives-${os.and.arch}.jar" tofile="${jar}/jogl-all-android-natives-${os.and.arch}.jar" /> </target> <target name="android.package.jogl.skip.check" depends="init,gluegen.cpptasks.detect.os"> |