diff options
| author | sg215889 <[email protected]> | 2009-07-15 08:54:22 -0700 |
|---|---|---|
| committer | sg215889 <[email protected]> | 2009-07-15 08:54:22 -0700 |
| commit | 88cc61ba1b5bb874ca9b2a172f7dae187f0f3b17 (patch) | |
| tree | 510a4ac509f85a9c720dde0d08c82049acecfa82 | |
| parent | 0643ae0e2e9fed542d999ddcce72fa5081176294 (diff) | |
Fix CDC JAR unificationCDC_CVM_Integration
| -rw-r--r-- | make/build-jogl.xml | 8 | ||||
| -rw-r--r-- | make/build-nativewindow.xml | 5 | ||||
| -rw-r--r-- | make/build-newt.xml | 2 |
3 files changed, 9 insertions, 6 deletions
diff --git a/make/build-jogl.xml b/make/build-jogl.xml index 204a80ca3..2997c4028 100644 --- a/make/build-jogl.xml +++ b/make/build-jogl.xml @@ -391,9 +391,9 @@ <!-- The resulting CDC jogl.jar. --> <property name="jogl.core.cdc.jar" value="${build}/jogl.core.cdc.jar" /> <property name="jogl.gles1.cdc.jar" value="${build}/jogl.gles1.cdc.jar" /> - <property name="jogl.gles1.dbg.cdc.jar" value="${build}/jogl.gles1-cdc.dbg.cdc.jar" /> - <property name="jogl.gles2.cdc.jar" value="${build}/jogl.gles2-cdc.cdc.jar" /> - <property name="jogl.gles2.dbg.cdc.jar" value="${build}/jogl.gles2-cdc.dbg.cdc.jar" /> + <property name="jogl.gles1.dbg.cdc.jar" value="${build}/jogl.gles1.dbg.cdc.jar" /> + <property name="jogl.gles2.cdc.jar" value="${build}/jogl.gles2.cdc.jar" /> + <property name="jogl.gles2.dbg.cdc.jar" value="${build}/jogl.gles2.dbg.cdc.jar" /> <property name="jogl.egl.cdc.jar" value="${build}/jogl.egl.cdc.jar" /> <property name="jogl.glutess.cdc.jar" value="${build}/jogl.glu.tess.cdc.jar" /> <property name="jogl.glumipmap.cdc.jar" value="${build}/jogl.glu.mipmap.cdc.jar" /> @@ -1561,7 +1561,7 @@ <include name="*.${native.library.suffix}" /> </fileset> </jar> - <jar destfile="${build}/jogl-cdc-natives-${os.and.arch}.jar"> + <jar destfile="${build}/jogl-natives-${os.and.arch}-cdc.jar"> <fileset dir="${obj}"> <include name="*_es1.${native.library.suffix-cdc}" /> <include name="*_es2.${native.library.suffix-cdc}" /> diff --git a/make/build-nativewindow.xml b/make/build-nativewindow.xml index ceb5a8661..d6d57bce0 100644 --- a/make/build-nativewindow.xml +++ b/make/build-nativewindow.xml @@ -287,6 +287,8 @@ <property name="nativewindow.awt.jar" value="${build}/nativewindow.awt.jar" /> <property name="nativewindow.all.jar" value="${build}/nativewindow.all.jar" /> + <property name="nativewindow.core.cdc.jar" value="${build}/nativewindow.core.cdc.jar" /> + <!-- The javadoc dirs. --> <property name="javadoc" value="${project.root}/javadoc_nativewindow_public" /> <property name="javadoc.spec" value="${project.root}/javadoc_nativewindow_spec" /> @@ -810,7 +812,7 @@ <include name="*.${native.library.suffix}" /> </fileset> </jar> - <jar destfile="${build}/nativewindow-cdc-natives-${os.and.arch}.jar"> + <jar destfile="${build}/nativewindow-natives-${os.and.arch}-cdc.jar"> <fileset dir="${obj}"> <include name="*_jvm.${native.library.suffix-cdc}" /> <include name="*_x11.${native.library.suffix-cdc}" /> @@ -870,6 +872,7 @@ includes="${java.part.core}" excludes="${java.part.awt}"/> </jar> + <copy file="${nativewindow.core.jar}" tofile="${nativewindow.core.cdc.jar}" /> <delete file="tempversion"/> </target> diff --git a/make/build-newt.xml b/make/build-newt.xml index 7f72b1c08..03477cf27 100644 --- a/make/build-newt.xml +++ b/make/build-newt.xml @@ -537,7 +537,7 @@ <include name="*.${native.library.suffix}" /> </fileset> </jar> - <jar destfile="${build}/newt-cdc-natives-${os.and.arch}.jar"> + <jar destfile="${build}/newt-natives-${os.and.arch}-cdc.jar"> <fileset dir="${obj}"> <include name="*.${native.library.suffix-cdc}" /> </fileset> |