diff options
| author | Sven Gothel <[email protected]> | 2010-04-28 14:27:47 +0200 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2010-04-28 14:27:47 +0200 |
| commit | 14256647c8954bb8d6d2afa88927e75783bc912b (patch) | |
| tree | 54b2eb74000f410ade6d55e4739088d3df281f38 /make/build-nativewindow.xml | |
| parent | 3dfb97a57bf1116c44709c50cbb9d0628967fd52 (diff) | |
- JAR Manifest: Trusted-Library: true
- Added JAR Manifest to native libs as well,
otherwise our chain would become mixed code.
- JNLP: Set JogAmp community as vendor ..
- JOGL Windows hack: WindowsWGLContext.java
- temporary removed the ARB CreateContext path
for Windows, due to a bug in this implementation.
Diffstat (limited to 'make/build-nativewindow.xml')
| -rw-r--r-- | make/build-nativewindow.xml | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/make/build-nativewindow.xml b/make/build-nativewindow.xml index 8d1639502..0fd0af79b 100644 --- a/make/build-nativewindow.xml +++ b/make/build-nativewindow.xml @@ -635,25 +635,13 @@ <antcall target="c.fixup.jawt.version.macosx" inheritrefs="true" /> <antcall target="c.manifest" inheritRefs="true" /> - <!-- Create the Java Web Start jar file for the built native code --> - <jar destfile="${build.nativewindow}/nativewindow-natives-${os.and.arch}.jar" filesonly="true"> - <fileset dir="${obj.nativewindow}"> - <include name="*.${native.library.suffix}" /> - </fileset> - </jar> - <jar destfile="${build.nativewindow}/nativewindow-natives-${os.and.arch}-cdc.jar" filesonly="true"> - <fileset dir="${obj.nativewindow}"> - <include name="*_jvm.${native.library.suffix-cdc}" /> - <include name="*_x11.${native.library.suffix-cdc}" /> - </fileset> - </jar> </target> <!-- ================================================================== --> <!-- - Build the nativewindow.jar files. --> - <target name="jar" depends="java.compile,build-jars-javase,build-jars-cdc"/> + <target name="build-jars" depends="gluegen.cpptasks.detect.os,build-jars-javase,build-jars-cdc" /> <target name="setup-manifestfile"> <condition property="manifestfile" value="nativewindowRIversion"> @@ -747,6 +735,11 @@ includes="${java.part.core}" excludes="${java.part.awt} ${java.part.x11}"/> </jar> + <jar manifest="tempversion" destfile="${build.nativewindow}/nativewindow-natives-${os.and.arch}.jar" filesonly="true"> + <fileset dir="${obj.nativewindow}"> + <include name="*.${native.library.suffix}" /> + </fileset> + </jar> <delete file="tempversion"/> </target> @@ -756,6 +749,12 @@ includes="${java.part.core}" excludes="${java.part.awt} ${java.part.x11}"/> </jar> + <jar manifest="tempversion-cdc" destfile="${build.nativewindow}/nativewindow-natives-${os.and.arch}-cdc.jar" filesonly="true"> + <fileset dir="${obj.nativewindow}"> + <include name="*_jvm.${native.library.suffix-cdc}" /> + <include name="*_x11.${native.library.suffix-cdc}" /> + </fileset> + </jar> <delete file="tempversion-cdc"/> </target> @@ -828,7 +827,7 @@ <!-- - Build everything. --> - <target name="all" description="Build NativeWindow JAR file(s) and native libraries." depends="init,jar,c.build.nativewindow,generate.version.txt" /> + <target name="all" description="Build NativeWindow JAR file(s) and native libraries." depends="init,java.compile,c.build.nativewindow,build-jars,generate.version.txt" /> <target name="generate.version.txt" depends="init"> <!-- Create a version.txt file indicating which version we just built --> |