diff options
Diffstat (limited to 'make/build-common.xml')
| -rw-r--r-- | make/build-common.xml | 34 |
1 files changed, 14 insertions, 20 deletions
diff --git a/make/build-common.xml b/make/build-common.xml index a13ccefe5..876aa27ce 100644 --- a/make/build-common.xml +++ b/make/build-common.xml @@ -168,17 +168,15 @@ <property name="build.newt" value="${build}/newt" /> <property name="obj.newt" value="${build.newt}/obj"/> - <property name="junit.make" value="." /> - <property name="junit.build.xml" value="${junit.make}/build-junit.xml" /> - <property name="results.junit" value="${build}/test/results" /> - <property name="build.junit" value="${build}/test/build" /> - <property name="obj.junit" value="${build.junit}/obj"/> + <property name="results.test" value="${build}/test/results" /> + <property name="build.test" value="${build}/test/build" /> + <property name="obj.test" value="${build.test}/obj"/> <condition property="obj.custom" value="${custom.libdir}${path.separator}" else=""> <isset property="custom.libdir"/> </condition> - <property name="obj.all.paths" value="${obj.custom}${obj.gluegen}${path.separator}${obj.nativewindow}${path.separator}${obj.jogl}${path.separator}${obj.newt}${path.separator}${obj.junit}" /> + <property name="obj.all.paths" value="${obj.custom}${obj.gluegen}${path.separator}${obj.nativewindow}${path.separator}${obj.jogl}${path.separator}${obj.newt}${path.separator}${obj.test}" /> <path id="gluegen.classpath"> <pathelement location="${gluegen.jar}" /> @@ -283,6 +281,9 @@ <pathelement location="${newt.all.jar}" /> <pathelement location="${jogl.test.jar}" /> </path> + <property name="junit_jogl_newt_awt.run.jars" + value="${junit.jar}${path.separator}${ant.jar}${path.separator}${ant-junit.jar}${path.separator}${gluegen-rt.jar}${path.separator}${nativewindow.all.jar}${path.separator}${jogl.all.jar}${path.separator}${newt.all.jar}${path.separator}${jogl.test.jar}"/> + <path id="jogl_newt_all-noawt.classpath"> <pathelement location="${gluegen-rt.jar}" /> @@ -322,7 +323,7 @@ <property name="nativewindow.core.jar" value="${build.nativewindow}/nativewindow.core.jar" /> <property name="nativewindow.awt.jar" value="${build.nativewindow}/nativewindow.awt.jar" /> <property name="nativewindow.os.x11.jar" value="${build.nativewindow}/nativewindow.os.x11.jar" /> - <property name="nativewindow.os.windows.jar" value="${build.nativewindow}/nativewindow.os.windows.jar" /> + <property name="nativewindow.os.win.jar" value="${build.nativewindow}/nativewindow.os.win.jar" /> <property name="jogl.core.jar" value="${build.jogl}/jogl.core.jar" /> <property name="jogl.cg.jar" value="${build.jogl}/jogl.cg.jar" /> @@ -357,13 +358,13 @@ <property name="newt.os.win.jar" value="${build.newt}/newt.os.win.jar" /> <property name="newt.os.osx.jar" value="${build.newt}/newt.os.osx.jar" /> <property name="newt.ogl.jar" value="${build.newt}/newt.ogl.jar" /> - <property name="newt.broadcomegl.jar" value="${build.newt}/newt.broadcomegl.jar" /> - <property name="newt.intelgdl.jar" value="${build.newt}/newt.intelgdl.jar" /> + <property name="newt.hw.broadcomegl.jar" value="${build.newt}/newt.hw.broadcomegl.jar" /> + <property name="newt.hw.intelgdl.jar" value="${build.newt}/newt.hw.intelgdl.jar" /> <!-- Atomic CDC JARS --> <property name="nativewindow.core.cdc.jar" value="${build.nativewindow}/nativewindow.core.cdc.jar" /> <property name="nativewindow.os.x11.cdc.jar" value="${build.nativewindow}/nativewindow.os.x11.cdc.jar" /> - <property name="nativewindow.os.windows.cdc.jar" value="${build.nativewindow}/nativewindow.os.windows.cdc.jar" /> + <property name="nativewindow.os.win.cdc.jar" value="${build.nativewindow}/nativewindow.os.win.cdc.jar" /> <property name="jogl.core.cdc.jar" value="${build.jogl}/jogl.core.cdc.jar" /> <property name="jogl.gles1.cdc.jar" value="${build.jogl}/jogl.gles1.cdc.jar" /> @@ -384,8 +385,8 @@ <property name="newt.os.win.cdc.jar" value="${build.newt}/newt.os.win.cdc.jar" /> <property name="newt.os.osx.cdc.jar" value="${build.newt}/newt.os.osx.cdc.jar" /> <property name="newt.ogl.cdc.jar" value="${build.newt}/newt.ogl.cdc.jar" /> - <property name="newt.broadcomegl.cdc.jar" value="${build.newt}/newt.broadcomegl.cdc.jar" /> - <property name="newt.intelgdl.cdc.jar" value="${build.newt}/newt.intelgdl.cdc.jar" /> + <property name="newt.hw.broadcomegl.cdc.jar" value="${build.newt}/newt.hw.broadcomegl.cdc.jar" /> + <property name="newt.hw.intelgdl.cdc.jar" value="${build.newt}/newt.hw.intelgdl.cdc.jar" /> <!-- The location and name of the configuration ANT file that will - validate to ensure that all user-define variables are set. --> @@ -402,14 +403,7 @@ <!-- Run the GlueGen build to ensure that the GlueGen ANT task - has been built. --> - <!-- FIXME: remove passing down of antlr.jar when gluegen.properties is on all - nightly build machines --> - <ant antfile="${gluegen.build.xml}" dir="${gluegen.make}" target="all" inheritAll="false"> - <propertyset> - <propertyref name="antlr.jar" /> - <!--propertyref name="gluegen.nsig" /--> - </propertyset> - </ant> + <ant antfile="${gluegen.build.xml}" dir="${gluegen.make}" target="base.compile" inheritAll="false"/> </target> |