diff options
| author | sg215889 <[email protected]> | 2009-07-15 07:16:01 -0700 |
|---|---|---|
| committer | sg215889 <[email protected]> | 2009-07-15 07:16:01 -0700 |
| commit | 0643ae0e2e9fed542d999ddcce72fa5081176294 (patch) | |
| tree | d5d1701c0d1539b1a762a4c8d2c59b49d8e5aafd | |
| parent | f9d332cc5764920e62989c67681245f03b6c757e (diff) | |
Build CDC named JARs for CVM in default build, no more specialized build necessary.
| -rw-r--r-- | make/build-nativewindow.xml | 8 | ||||
| -rw-r--r-- | make/build.xml | 14 |
2 files changed, 21 insertions, 1 deletions
diff --git a/make/build-nativewindow.xml b/make/build-nativewindow.xml index 53f91f6f0..ceb5a8661 100644 --- a/make/build-nativewindow.xml +++ b/make/build-nativewindow.xml @@ -648,6 +648,7 @@ <target name="rename.dylib" if="isOSX"> <move file="${src}" tofile="${dest}" /> + <copy file="${dest}" tofile="${dest-cdc}" /> </target> <macrodef name="c.build"> @@ -744,6 +745,7 @@ <antcall target="rename.dylib" inheritRefs="true"> <param name="src" value="${build}/obj/lib@{output.lib.name}.dylib" /> <param name="dest" value="${build}/obj/lib@{output.lib.name}.jnilib" /> + <param name="dest-cdc" value="${build}/obj/lib@{output.lib.name}.so" /> </antcall> <!-- FIXME: this is a hack; the cpptask should have an option to change the @@ -808,6 +810,12 @@ <include name="*.${native.library.suffix}" /> </fileset> </jar> + <jar destfile="${build}/nativewindow-cdc-natives-${os.and.arch}.jar"> + <fileset dir="${obj}"> + <include name="*_jvm.${native.library.suffix-cdc}" /> + <include name="*_x11.${native.library.suffix-cdc}" /> + </fileset> + </jar> </target> <!-- ================================================================== --> diff --git a/make/build.xml b/make/build.xml index 3e7c74c53..2bc1a56e0 100644 --- a/make/build.xml +++ b/make/build.xml @@ -78,6 +78,18 @@ <ant antfile="${newt.build.xml}" dir="${newt.make.dir}" target="all" inheritAll="false"/> </target> + <target name="one-lib-dir" depends="init,gluegen.cpptasks.detect.os"> + <property name="lib.dir" value="${build}/lib" /> + <delete includeEmptyDirs="true" quiet="true" dir="${lib.dir}" failonerror="false" /> + <mkdir dir="${lib.dir}" /> + <copy todir="${lib.dir}"> + <fileset dir="${project.root}/../gluegen/${rootrel.build}/obj" includes="*.${native.library.suffix} *.${native.library.suffix-cdc}" /> + <fileset dir="${build}/jogl/obj" includes="*.${native.library.suffix} *.${native.library.suffix-cdc}" /> + <fileset dir="${build}/nativewindow/obj" includes="*.${native.library.suffix} *.${native.library.suffix-cdc}" /> + <fileset dir="${build}/newt/obj" includes="*.${native.library.suffix} *.${native.library.suffix-cdc}" /> + </copy> + </target> + <!-- ================================================================== --> <!-- - Build the per-platform binary zip archive for developers. @@ -164,7 +176,7 @@ - Main build target. --> - <target name="all" description="Build nativewindow, jogl and newt projects" depends="init,build.nativewindow,build.jogl,build.newt,developer-zip-archive,source-archive" /> + <target name="all" description="Build nativewindow, jogl and newt projects" depends="init,build.nativewindow,build.jogl,build.newt,one-lib-dir,developer-zip-archive,source-archive" /> <target name="clean" depends="init"> <ant antfile="${nativewindow.build.xml}" dir="${nativewindow.make.dir}" target="clean" inheritAll="false"/> |