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-jogl.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-jogl.xml')
| -rw-r--r-- | make/build-jogl.xml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/make/build-jogl.xml b/make/build-jogl.xml index 4b58061f3..b0162d9aa 100644 --- a/make/build-jogl.xml +++ b/make/build-jogl.xml @@ -1719,7 +1719,7 @@ <srcfileset dir="${src.java}" includes="${java.part.nonjava}"/> <targetfileset dir="." - includes="${jogl-core.jar} ${jogl-util.jar} ${jogl-util-graph.jar} ${jogl-util-fixedfuncemu.jar}" /> + includes="${jogl.jar} ${jogl-util.jar} ${jogl-util-graph.jar} ${jogl-util-fixedfuncemu.jar}" /> </dependset> </target> <target name="build-jars" depends="build-jars-dependset,build-jars-javase" /> @@ -1814,7 +1814,7 @@ <target name="build-jars-javase" depends="setup-manifestfile, build-jars-android, build-jars-mobile-javase, build-jars-desktop-javase, build-jars-awt-javase, build-jars-swt-javase"> - <jar manifest="${build.jogl}/manifest.mf" destfile="${jogl-core.jar}" filesonly="true"> + <jar manifest="${build.jogl}/manifest.mf" destfile="${jogl.jar}" filesonly="true"> <fileset dir="${classes}" includes="${java.part.core}" excludes="${java.part.core.exclude}"/> |