summaryrefslogtreecommitdiffstats
path: root/make
diff options
context:
space:
mode:
Diffstat (limited to 'make')
-rw-r--r--make/build-jogl.xml10
-rw-r--r--make/build-newt.xml40
-rw-r--r--make/build.xml6
-rw-r--r--make/config/jogl/glx-CustomJavaCode.java4
-rw-r--r--make/config/nativewindow/x11-CustomJavaCode.java4
-rw-r--r--make/newtRIversion2
-rw-r--r--make/newtRIversion-cdc2
-rw-r--r--make/newtversion2
-rw-r--r--make/newtversion-cdc2
9 files changed, 36 insertions, 36 deletions
diff --git a/make/build-jogl.xml b/make/build-jogl.xml
index c3bc96bd8..4a0bac4d5 100644
--- a/make/build-jogl.xml
+++ b/make/build-jogl.xml
@@ -191,10 +191,10 @@
</condition>
<property name="java.excludes.javadoc.packagenames"
- value="com.jogamp.opengl.impl.gl2.fixme.*,com.jogamp.javafx.audio.windows.waveout.TestSpatialization"/>
+ value="com.jogamp.opengl.impl.gl2.fixme.*,com.jogamp.audio.windows.waveout.TestSpatialization"/>
<property name="java.excludes.fixme"
- value="com/jogamp/opengl/impl/gl2/fixme/** com/jogamp/javafx/audio/windows/waveout/TestSpatialization.java" />
+ value="com/jogamp/opengl/impl/gl2/fixme/** com/jogamp/audio/windows/waveout/TestSpatialization.java" />
<property name="java.excludes.cdcfp"
value="${java.excludes.fixme} ${java.part.nv-cg} ${java.part.gl2} ${java.part.gl2.dbg} ${java.part.gl3} ${java.part.gl3.dbg} ${java.part.awt} ${java.part.glugl2} ${java.part.util.awt} ${java.part.util.gl2} com/jogamp/opengl/util/TGAWriter.java"/>
@@ -1590,7 +1590,7 @@
<target name="c.build.jogl.prepare" depends="c.build.jogl.prepare.openMAX">
<!-- Generate the waveout Mixer header -->
<!-- FIXME: this is temporary until we move this to another workspace -->
- <!--javah destdir="${build}/gensrc/native/jogl" classpath="${classes}" class="com.jogamp.javafx.audio.windows.waveout.Mixer" /-->
+ <!--javah destdir="${build}/gensrc/native/jogl" classpath="${classes}" class="com.jogamp.audio.windows.waveout.Mixer" /-->
</target>
<target name="c.build.jogl.gl2" unless="setup.nodesktop">
@@ -1826,7 +1826,7 @@
<include name="com/jogamp/opengl/**" />
<include name="${java.part.openmax}" />
<!-- FIXME: this is temporary until we move these classes to another workspace -->
- <include name="com/jogamp/javafx/**" />
+ <include name="com/jogamp/**" />
</fileset>
<fileset dir="${src.java}"
includes="${java.part.util.fixedfuncemu.shadercode}"/>
@@ -1835,7 +1835,7 @@
<target name="build-jars-all-noawt" depends="setup-manifestfile">
<jar manifest="${build}/tempversion" destfile="${jogl.all-noawt.jar}" filesonly="true">
<fileset dir="${classes}"
- includes="javax/media/opengl/** com/jogamp/gluegen/runtime/** com/jogamp/opengl/** ${java.part.openmax} com/jogamp/javafx/**"
+ includes="javax/media/opengl/** com/jogamp/gluegen/runtime/** com/jogamp/opengl/** ${java.part.openmax} com/jogamp/**"
excludes="${java.part.awt} ${java.part.util.awt}">
</fileset>
<fileset dir="${src.java}"
diff --git a/make/build-newt.xml b/make/build-newt.xml
index 0bbcf2ccd..eddbf609f 100644
--- a/make/build-newt.xml
+++ b/make/build-newt.xml
@@ -108,25 +108,25 @@
<!-- partitioning -->
<property name="java.part.core"
- value="com/jogamp/javafx/newt/*, com/jogamp/javafx/newt/util/*, com/jogamp/javafx/newt/impl/*, com/jogamp/javafx/newt/intel/gdl/*"/>
+ value="com/jogamp/newt/*, com/jogamp/newt/util/*, com/jogamp/newt/impl/*, com/jogamp/newt/intel/gdl/*"/>
<property name="java.part.x11"
- value="com/jogamp/javafx/newt/x11/*"/>
+ value="com/jogamp/newt/x11/*"/>
<property name="java.part.windows"
- value="com/jogamp/javafx/newt/windows/*"/>
+ value="com/jogamp/newt/windows/*"/>
<property name="java.part.macosx"
- value="com/jogamp/javafx/newt/macosx/*"/>
+ value="com/jogamp/newt/macosx/*"/>
<property name="java.part.opengl"
- value="com/jogamp/javafx/newt/opengl/*, com/jogamp/javafx/newt/opengl/kd/*"/>
+ value="com/jogamp/newt/opengl/*, com/jogamp/newt/opengl/kd/*"/>
<property name="java.part.broadcomegl"
- value="com/jogamp/javafx/newt/opengl/broadcom/egl/*"/>
+ value="com/jogamp/newt/opengl/broadcom/egl/*"/>
<property name="java.part.awt"
- value="com/jogamp/javafx/newt/awt/*"/>
+ value="com/jogamp/newt/awt/*"/>
<!-- condition excludes -->
@@ -279,11 +279,11 @@
<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.javafx.newt, com.jogamp.javafx.newt.opengl" />
+ <property name="javadoc.spec.packagenames" value="com.jogamp.newt, com.jogamp.newt.opengl" />
<property name="javadoc.packagenames" value="${javadoc.spec.packagenames}" />
- <property name="javadoc.dev.packagenames" value="${javadoc.packagenames},com.jogamp.javafx.newt.*" />
+ <property name="javadoc.dev.packagenames" value="${javadoc.packagenames},com.jogamp.newt.*" />
<property name="javadoc.bottom" value="Copyright 2005 Sun Microsystems, Inc. All rights reserved. Use is subject to &lt;a href=&quot;http://jcp.org/en/jsr/detail?id=231&quot;&gt;license terms&lt;/a&gt;." />
</target>
@@ -596,23 +596,23 @@
</macrodef>
<target name="c.build.newt.prepare.KD" if="useKD">
- <javah destdir="${src.generated.c}/KD" classpath="${classes}" class="com.jogamp.javafx.newt.opengl.kd.KDWindow" />
+ <javah destdir="${src.generated.c}/KD" classpath="${classes}" class="com.jogamp.newt.opengl.kd.KDWindow" />
</target>
<target name="c.build.newt.prepare.IntelGDL" if="useIntelGDL">
- <javah destdir="${src.generated.c}/IntelGDL" classpath="${classes}" class="com.jogamp.javafx.newt.intel.gdl.Display" />
- <javah destdir="${src.generated.c}/IntelGDL" classpath="${classes}" class="com.jogamp.javafx.newt.intel.gdl.Screen" />
- <javah destdir="${src.generated.c}/IntelGDL" classpath="${classes}" class="com.jogamp.javafx.newt.intel.gdl.Window" />
+ <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" />
</target>
<target name="c.build.newt.prepare.BroadcomEGL" if="useBroadcomEGL">
- <javah destdir="${src.generated.c}/BroadcomEGL" classpath="${classes}" class="com.jogamp.javafx.newt.opengl.broadcom.egl.Window" />
+ <javah destdir="${src.generated.c}/BroadcomEGL" classpath="${classes}" class="com.jogamp.newt.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.javafx.newt.windows.WindowsWindow" />
- <javah destdir="${src.generated.c}/MacOSX" classpath="${classes}" class="com.jogamp.javafx.newt.macosx.MacWindow" />
- <javah destdir="${src.generated.c}/X11" classpath="${classes}" class="com.jogamp.javafx.newt.x11.X11Window" />
+ <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" />
</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" />
@@ -759,14 +759,14 @@
<target name="build-jars-all-awt" depends="setup-manifestfile" unless="setup.noall">
<jar manifest="tempversion" destfile="${newt.all.jar}" filesonly="true">
<fileset dir="${classes}"
- includes="com/jogamp/javafx/newt/**" />
+ includes="com/jogamp/newt/**" />
</jar>
</target>
<target name="build-jars-all-noawt" depends="setup-manifestfile">
<jar manifest="tempversion" destfile="${newt.all-noawt.jar}" filesonly="true">
<fileset dir="${classes}"
- includes="com/jogamp/javafx/newt/**"
+ includes="com/jogamp/newt/**"
excludes="${java.part.awt}" />
</jar>
</target>
@@ -774,7 +774,7 @@
<target name="build-jars-all-cdc" depends="setup-manifestfile-cdc">
<jar manifest="tempversion-cdc" destfile="${newt.all.cdc.jar}" filesonly="true">
<fileset dir="${classes-cdc}"
- includes="com/jogamp/javafx/newt/**"
+ includes="com/jogamp/newt/**"
excludes="${java.excludes.cdcfp}" />
</jar>
</target>
diff --git a/make/build.xml b/make/build.xml
index e73235cac..54b6a8e67 100644
--- a/make/build.xml
+++ b/make/build.xml
@@ -43,12 +43,12 @@
<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.javafx.newt, com.jogamp.javafx.newt.opengl" />
+ <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.dev" value="${project.root}/javadoc_dev" />
- <property name="javadoc.dev.packagenames" value="${javadoc.packagenames},com.jogamp.opengl.impl.*,com.jogamp.nativewindow.impl.*,com.jogamp.javafx.newt.*,com.sun.gluegen,com.jogamp.gluegen.runtime" />
+ <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" />
- <property name="java.excludes.javadoc.packagenames" value="com.jogamp.opengl.impl.gl2.fixme.*,com.jogamp.javafx.audio.windows.waveout.TestSpatialization"/>
+ <property name="java.excludes.javadoc.packagenames" value="com.jogamp.opengl.impl.gl2.fixme.*,com.jogamp.audio.windows.waveout.TestSpatialization"/>
<property name="javadoc.bottom" value="Copyright 2005 Sun Microsystems, Inc. All rights reserved. Use is subject to &lt;a href=&quot;http://jcp.org/en/jsr/detail?id=231&quot;&gt;license terms&lt;/a&gt;." />
<property name="gluegen.jar" value="${gluegen.root}/${rootrel.build}/gluegen.jar" />
diff --git a/make/config/jogl/glx-CustomJavaCode.java b/make/config/jogl/glx-CustomJavaCode.java
index 56057377a..6ed31990e 100644
--- a/make/config/jogl/glx-CustomJavaCode.java
+++ b/make/config/jogl/glx-CustomJavaCode.java
@@ -20,7 +20,7 @@
if(nitems != null && nitems.length <= nitems_offset)
throw new GLException("array offset argument \"nitems_offset\" (" + nitems_offset + ") equals or exceeds array length (" + nitems.length + ")");
java.nio.ByteBuffer _res;
- _res = glXChooseFBConfigCopied1(dpy, screen, attribList, BufferFactory.SIZEOF_INT * attribList_offset, nitems, BufferFactory.SIZEOF_INT * nitems_offset);
+ _res = glXChooseFBConfigCopied1(dpy, screen, attribList, Buffers.SIZEOF_INT * attribList_offset, nitems, Buffers.SIZEOF_INT * nitems_offset);
if (_res == null) return null;
return PointerBuffer.wrap(_res);
@@ -35,7 +35,7 @@
if(attribList != null && attribList.length <= attribList_offset)
throw new GLException("array offset argument \"attribList_offset\" (" + attribList_offset + ") equals or exceeds array length (" + attribList.length + ")");
java.nio.ByteBuffer _res;
- _res = glXChooseVisualCopied1(dpy, screen, attribList, BufferFactory.SIZEOF_INT * attribList_offset);
+ _res = glXChooseVisualCopied1(dpy, screen, attribList, Buffers.SIZEOF_INT * attribList_offset);
if (_res == null) return null;
return XVisualInfo.create(_res);
diff --git a/make/config/nativewindow/x11-CustomJavaCode.java b/make/config/nativewindow/x11-CustomJavaCode.java
index b1ee3a6c3..5c269c6c8 100644
--- a/make/config/nativewindow/x11-CustomJavaCode.java
+++ b/make/config/nativewindow/x11-CustomJavaCode.java
@@ -5,10 +5,10 @@
if(arg3 != null && arg3.length <= arg3_offset)
throw new RuntimeException("array offset argument \"arg3_offset\" (" + arg3_offset + ") equals or exceeds array length (" + arg3.length + ")");
java.nio.ByteBuffer _res;
- _res = XGetVisualInfoCopied1(arg0, arg1, ((arg2 == null) ? null : arg2.getBuffer()), arg3, BufferFactory.SIZEOF_INT * arg3_offset);
+ _res = XGetVisualInfoCopied1(arg0, arg1, ((arg2 == null) ? null : arg2.getBuffer()), arg3, Buffers.SIZEOF_INT * arg3_offset);
if (_res == null) return null;
- BufferFactory.nativeOrder(_res);
+ Buffers.nativeOrder(_res);
XVisualInfo[] _retarray = new XVisualInfo[getFirstElement(arg3, arg3_offset)];
for (int _count = 0; _count < getFirstElement(arg3, arg3_offset); _count++) {
_res.position(_count * XVisualInfo.size());
diff --git a/make/newtRIversion b/make/newtRIversion
index 7b8608290..82cc0c0e9 100644
--- a/make/newtRIversion
+++ b/make/newtRIversion
@@ -4,5 +4,5 @@ Specification-Vendor: Sun Microsystems, Inc.
Implementation-Title: NEWT Runtime Environment
Implementation-Version: @BASEVERSION@
Implementation-Vendor: Sun Microsystems, Inc.
-Extension-Name: com.sun.javafx.newt
+Extension-Name: com.sun.newt
Implementation-Vendor-Id: com.sun
diff --git a/make/newtRIversion-cdc b/make/newtRIversion-cdc
index 0dd17ee93..5dcfecad8 100644
--- a/make/newtRIversion-cdc
+++ b/make/newtRIversion-cdc
@@ -4,5 +4,5 @@ Specification-Vendor: Sun Microsystems, Inc.
Implementation-Title: NEWT Runtime Environment CDC
Implementation-Version: @BASEVERSION@
Implementation-Vendor: Sun Microsystems, Inc.
-Extension-Name: com.sun.javafx.newt
+Extension-Name: com.sun.newt
Implementation-Vendor-Id: com.sun
diff --git a/make/newtversion b/make/newtversion
index 3c9335cf5..d1734f756 100644
--- a/make/newtversion
+++ b/make/newtversion
@@ -4,5 +4,5 @@ Specification-Vendor: Sun Microsystems, Inc.
Implementation-Title: NEWT Runtime Environment
Implementation-Version: @VERSION@
Implementation-Vendor: java.net JOGL community
-Extension-Name: com.sun.javafx.newt
+Extension-Name: com.sun.newt
Implementation-Vendor-Id: com.sun
diff --git a/make/newtversion-cdc b/make/newtversion-cdc
index 624111760..8227a4d42 100644
--- a/make/newtversion-cdc
+++ b/make/newtversion-cdc
@@ -4,5 +4,5 @@ Specification-Vendor: Sun Microsystems, Inc.
Implementation-Title: NEWT Runtime Environment CDC
Implementation-Version: @VERSION@
Implementation-Vendor: java.net JOGL community
-Extension-Name: com.sun.javafx.newt
+Extension-Name: com.sun.newt
Implementation-Vendor-Id: com.sun