diff options
| author | Kenneth Russel <[email protected]> | 2009-06-17 03:42:28 +0000 |
|---|---|---|
| committer | Kenneth Russel <[email protected]> | 2009-06-17 03:42:28 +0000 |
| commit | 1ce689ce9383ac55c961f82903d60d1cc7b89246 (patch) | |
| tree | 0faa128c7128ad3f1e9034e8ae3e48da909d8a25 /make/build-jogl.xml | |
| parent | df341ba65d01a9562b45c77768efa37cc4733084 (diff) | |
Steps toward revamping the dist build. Changed individual builds to
produce the Java Web Start native library jar file,
[project]-natives-[os.and-arch].jar, and the top-level build to
produce the developer binary archive, jogl-[version]-[os.and.arch].zip,
as well as the source archive, jogl-[version]-src.zip. (This was only
possible thanks to Sven, who made all of the platforms' Java-level
binaries identical.) More work coming to simplify the dist target and
redo the associated nightly build scripts. Minor documentation updates;
more needed.
git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/trunk@1970 232f8b59-042b-4e1e-8c03-345bb8c30851
Diffstat (limited to 'make/build-jogl.xml')
| -rw-r--r-- | make/build-jogl.xml | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/make/build-jogl.xml b/make/build-jogl.xml index 7fbf265eb..c88bbddf7 100644 --- a/make/build-jogl.xml +++ b/make/build-jogl.xml @@ -1620,6 +1620,12 @@ <target name="c.build.jogl" depends="c.configure,c.build.jogl.prepare,c.build.jogl.gl2es12,c.build.jogl.gl2,c.build.jogl.es2,c.build.jogl.es1,c.build.jogl.cg"> <antcall target="c.manifest" inheritRefs="true" /> + <!-- Create the Java Web Start jar file for the built native code --> + <jar destfile="${build}/jogl-natives-${os.and.arch}.jar"> + <fileset dir="${obj}"> + <include name="*.${native.library.suffix}" /> + </fileset> + </jar> </target> <!-- ================================================================== --> @@ -2146,14 +2152,14 @@ </target> <target name="setup-version-RI" if="jogl.ri"> - <property name="tmp.version" value="${base_version}" /> + <property name="tmp.version" value="${jogl_base_version}" /> </target> <target name="setup-version-non-RI" unless="jogl.ri"> <tstamp> <format property="timestamp" pattern="yyyyMMdd"/> </tstamp> - <property name="tmp.version" value="${base_version}-pre-${timestamp}" /> + <property name="tmp.version" value="${jogl_base_version}-pre-${timestamp}" /> </target> <target name="dist" depends="dist.dir.check,dist.check.windows,dist.check.windows-amd64,dist.check.linux,dist.check.linux-amd64,dist.check.macosx,dist.check.macosxfat,dist.check.solsparc,dist.check.solsparcv9,dist.check.solx86,dist.check.solamd64,setup-version-RI,setup-version-non-RI"> |