diff options
Diffstat (limited to 'make')
| -rw-r--r-- | make/build-common.xml | 4 | ||||
| -rw-r--r-- | make/build-newt.xml | 55 | ||||
| -rw-r--r-- | make/build.xml | 2 |
3 files changed, 40 insertions, 21 deletions
diff --git a/make/build-common.xml b/make/build-common.xml index cc40a5cd4..461e96f1f 100644 --- a/make/build-common.xml +++ b/make/build-common.xml @@ -283,12 +283,13 @@ <property name="jogl.sdk.jar" value="${build.jogl}/jogl.sdk.jar" /> <property name="newt.core.jar" value="${build.newt}/newt.core.jar" /> + <property name="newt.awt.jar" value="${build.newt}/newt.awt.jar" /> <property name="newt.os.x11.jar" value="${build.newt}/newt.os.x11.jar" /> <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.awt.jar" value="${build.newt}/newt.awt.jar" /> + <property name="newt.intelgdl.jar" value="${build.newt}/newt.intelgdl.jar" /> <!-- Atomic CDC JARS --> <property name="nativewindow.core.cdc.jar" value="${build.nativewindow}/nativewindow.core.cdc.jar" /> @@ -315,6 +316,7 @@ <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" /> <!-- The location and name of the configuration ANT file that will - validate to ensure that all user-define variables are set. --> diff --git a/make/build-newt.xml b/make/build-newt.xml index 22b34fdc2..c6d67b85c 100644 --- a/make/build-newt.xml +++ b/make/build-newt.xml @@ -87,25 +87,28 @@ <!-- partitioning --> <property name="java.part.core" - value="com/jogamp/newt/*, com/jogamp/newt/event/*, com/jogamp/newt/util/*, com/jogamp/newt/impl/*, com/jogamp/newt/intel/gdl/*"/> + value="com/jogamp/newt/*, com/jogamp/newt/event/*, com/jogamp/newt/util/*, com/jogamp/newt/impl/*"/> + + <property name="java.part.awt" + value="com/jogamp/newt/impl/awt/*, com/jogamp/newt/event/awt/*"/> <property name="java.part.x11" - value="com/jogamp/newt/x11/*"/> + value="com/jogamp/newt/impl/x11/*"/> <property name="java.part.windows" - value="com/jogamp/newt/windows/*"/> + value="com/jogamp/newt/impl/windows/*"/> <property name="java.part.macosx" - value="com/jogamp/newt/macosx/*"/> + value="com/jogamp/newt/impl/macosx/*"/> <property name="java.part.opengl" - value="com/jogamp/newt/opengl/*, com/jogamp/newt/opengl/kd/*"/> + value="com/jogamp/newt/opengl/*, com/jogamp/newt/impl/opengl/kd/*"/> <property name="java.part.broadcomegl" - value="com/jogamp/newt/opengl/broadcom/egl/*"/> + value="com/jogamp/newt/impl/opengl/broadcom/egl/*"/> - <property name="java.part.awt" - value="com/jogamp/newt/awt/**"/> + <property name="java.part.intelgdl" + value="com/jogamp/newt/impl/intel/gdl/*"/> <!-- condition excludes --> @@ -159,7 +162,7 @@ <property name="javadoc.link" value="http://java.sun.com/j2se/1.4.2/docs/api/" /> <property name="javadoc.windowtitle" value="NEWT API -- ${newt_base_version} Specification" /> <property name="javadoc.overview" value="spec-overview.html" /> - <property name="javadoc.spec.packagenames" value="com.jogamp.newt, com.jogamp.newt.opengl" /> + <property name="javadoc.spec.packagenames" value="com.jogamp.newt, com.jogamp.newt.event.*, com.jogamp.newt.opengl" /> <property name="javadoc.packagenames" value="${javadoc.spec.packagenames}" /> @@ -475,23 +478,23 @@ </macrodef> <target name="c.build.newt.prepare.KD" if="useKD"> - <javah destdir="${src.generated.c}/KD" classpath="${classes}" class="com.jogamp.newt.opengl.kd.KDWindow" /> + <javah destdir="${src.generated.c}/KD" classpath="${classes}" class="com.jogamp.newt.impl.opengl.kd.KDWindow" /> </target> <target name="c.build.newt.prepare.IntelGDL" if="useIntelGDL"> - <javah destdir="${src.generated.c}/IntelGDL" classpath="${classes}" class="com.jogamp.newt.intel.gdl.Display" /> - <javah destdir="${src.generated.c}/IntelGDL" classpath="${classes}" class="com.jogamp.newt.intel.gdl.Screen" /> - <javah destdir="${src.generated.c}/IntelGDL" classpath="${classes}" class="com.jogamp.newt.intel.gdl.Window" /> + <javah destdir="${src.generated.c}/IntelGDL" classpath="${classes}" class="com.jogamp.newt.impl.intel.gdl.Display" /> + <javah destdir="${src.generated.c}/IntelGDL" classpath="${classes}" class="com.jogamp.newt.impl.intel.gdl.Screen" /> + <javah destdir="${src.generated.c}/IntelGDL" classpath="${classes}" class="com.jogamp.newt.impl.intel.gdl.Window" /> </target> <target name="c.build.newt.prepare.BroadcomEGL" if="useBroadcomEGL"> - <javah destdir="${src.generated.c}/BroadcomEGL" classpath="${classes}" class="com.jogamp.newt.opengl.broadcom.egl.Window" /> + <javah destdir="${src.generated.c}/BroadcomEGL" classpath="${classes}" class="com.jogamp.newt.impl.opengl.broadcom.egl.Window" /> </target> <target name="c.build.newt.prepare.desktop" unless="setup.nodesktop"> - <javah destdir="${src.generated.c}/Windows" classpath="${classes}" class="com.jogamp.newt.windows.WindowsWindow" /> - <javah destdir="${src.generated.c}/MacOSX" classpath="${classes}" class="com.jogamp.newt.macosx.MacWindow" /> - <javah destdir="${src.generated.c}/X11" classpath="${classes}" class="com.jogamp.newt.x11.X11Window" /> + <javah destdir="${src.generated.c}/Windows" classpath="${classes}" class="com.jogamp.newt.impl.windows.WindowsWindow" /> + <javah destdir="${src.generated.c}/MacOSX" classpath="${classes}" class="com.jogamp.newt.impl.macosx.MacWindow" /> + <javah destdir="${src.generated.c}/X11" classpath="${classes}" class="com.jogamp.newt.impl.x11.X11Window" /> </target> <target name="c.build.newt.prepare" depends="c.build.newt.prepare.KD,c.build.newt.prepare.IntelGDL,c.build.newt.prepare.BroadcomEGL,c.build.newt.prepare.desktop" /> @@ -592,6 +595,13 @@ </jar> </target> + <target name="build-jars-driver" depends="setup-manifestfile"> + <jar manifest="tempversion" destfile="${newt.intelgdl.jar}" filesonly="true"> + <fileset dir="${classes}" + includes="${java.part.intelgdl}"/> + </jar> + </target> + <target name="build-jars-opengl-cdc" depends="setup-manifestfile-cdc" unless="setup.noOpenGL"> <jar manifest="tempversion-cdc" destfile="${newt.ogl.cdc.jar}" filesonly="true"> <fileset dir="${classes-cdc}" @@ -603,6 +613,13 @@ </jar> </target> + <target name="build-jars-driver-cdc" depends="setup-manifestfile-cdc"> + <jar manifest="tempversion-cdc" destfile="${newt.intelgdl.cdc.jar}" filesonly="true"> + <fileset dir="${classes}" + includes="${java.part.intelgdl}"/> + </jar> + </target> + <target name="build-jars-desktop" depends="setup-manifestfile" unless="setup.nodesktop"> <jar manifest="tempversion" destfile="${newt.os.x11.jar}" filesonly="true"> <fileset dir="${classes}" @@ -656,7 +673,7 @@ </jar> </target> - <target name="build-jars-javase" depends="setup-manifestfile,build-jars-awt,build-jars-opengl,build-jars-all-noawt,build-jars-all-awt,build-jars-desktop"> + <target name="build-jars-javase" depends="setup-manifestfile,build-jars-awt,build-jars-opengl,build-jars-all-noawt,build-jars-all-awt,build-jars-desktop,build-jars-driver"> <jar manifest="tempversion" destfile="${newt.core.jar}" filesonly="true"> <fileset dir="${classes}" includes="${java.part.core}"/> @@ -664,7 +681,7 @@ <delete file="tempversion"/> </target> - <target name="build-jars-cdc" depends="setup-manifestfile-cdc,build-jars-opengl-cdc,build-jars-all-cdc,build-jars-desktop-cdc" unless="setup.noCDC"> + <target name="build-jars-cdc" depends="setup-manifestfile-cdc,build-jars-opengl-cdc,build-jars-all-cdc,build-jars-desktop-cdc,build-jars-driver-cdc" unless="setup.noCDC"> <jar manifest="tempversion-cdc" destfile="${newt.core.cdc.jar}" filesonly="true"> <fileset dir="${classes-cdc}" includes="${java.part.core}"/> diff --git a/make/build.xml b/make/build.xml index 8d2c9765a..5a0952289 100644 --- a/make/build.xml +++ b/make/build.xml @@ -19,7 +19,7 @@ <property name="javadoc.spec.packagenames" value="javax.media.opengl.*" /> <property name="javadoc.windowtitle" value="JOGL, NativeWindow and NEWT APIs" /> - <property name="javadoc.packagenames" value="${javadoc.nw.spec.packagenames},${javadoc.spec.packagenames},com.jogamp.opengl.util.*,com.jogamp.newt, com.jogamp.newt.opengl" /> + <property name="javadoc.packagenames" value="${javadoc.nw.spec.packagenames},${javadoc.spec.packagenames},com.jogamp.opengl.util.*,com.jogamp.newt, com.jogamp.newt.event.*, com.jogamp.newt.opengl" /> <property name="javadoc.dev" value="${project.root}/javadoc_dev" /> <property name="javadoc.dev.packagenames" value="${javadoc.packagenames},com.jogamp.opengl.impl.*,com.jogamp.nativewindow.impl.*,com.jogamp.newt.*,com.sun.gluegen,com.jogamp.gluegen.runtime" /> |