rollback JOGL2 changes

git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/../svn-server-sync/jogl-demos/trunk@248 3298f667-5e0e-4b4a-8ed4-a3559d26a5f4

1 files changed, 5 insertions, 101 deletions

diff --git a/make/build.xml b/make/build.xml
index 60c3268..1394819 100644
--- a/make/build.xml
+++ b/make/build.xml
@@ -31,23 +31,6 @@
         </fail>
     </target>
 
-    <target name="setup.gles">
-        <condition property="isGLES">
-          <or>
-            <isset property="jogl.es1" />
-            <isset property="jogl.es2" />
-          </or>
-        </condition>
-
-        <condition property="isGLES1">
-            <isset property="jogl.es1" />
-        </condition>
-
-        <condition property="isGLES2">
-            <isset property="jogl.es2" />
-        </condition>
-    </target>
-
     <target name="setup.cg.excludes" unless="jogl.cg">
         <property name="jogl.cg.excludes" value="demos/cg/**,demos/hdr/CgPipeline.java,demos/hdr/shaders/cg/**" />
     </target>
@@ -56,21 +39,8 @@
         <property name="jogl.cg.excludes" value="" />
     </target>
 
-    <target name="init" depends="java.class.path.validate,setup.gles,setup.cg.excludes,skip.cg.excludes">
-        <property name="jogl.core.jar"       value="../../jogl/build/jogl.core.jar" />
-        <property name="jogl.oswin.jar"      value="../../jogl/build/jogl.oswin.jar" />
-        <property name="jogl.gles1.jar"      value="../../jogl/build/jogl.gles1.jar" />
-        <property name="jogl.gles1.dbg.jar"  value="../../jogl/build/jogl.gles1.dbg.jar" />
-        <property name="jogl.gles2.jar"      value="../../jogl/build/jogl.gles2.jar" />
-        <property name="jogl.gles2.dbg.jar"  value="../../jogl/build/jogl.gles2.dbg.jar" />
-        <property name="jogl.egl.jar"        value="../../jogl/build/jogl.egl.jar" />
-        <property name="jogl.gl2.jar"        value="../../jogl/build/jogl.gl2.jar" />
-        <property name="jogl.gl2.dbg.jar"    value="../../jogl/build/jogl.gl2.dbg.jar" />
-        <property name="jogl.awt.jar"        value="../../jogl/build/jogl.awt.jar" />
-        <property name="jogl.util.jar"       value="../../jogl/build/jogl.util.jar" />
-        <property name="jogl.util.awt.jar"   value="../../jogl/build/jogl.util.awt.jar" />
-        <property name="jogl.util.gl2.jar"   value="../../jogl/build/jogl.util.gl2.jar" />
-        <property name="newt.jar"            value="../../jogl/build/newt.jar" />
+    <target name="init" depends="java.class.path.validate,setup.cg.excludes,skip.cg.excludes">
+        <property name="jogl.jar"            value="../../jogl/build/jogl.jar" />
         <property name="joal.jar"            value="../lib/joal.jar" />
         <property name="joal-demos.jar"      value="../lib/joal-demos.jar" />
         <property name="simple-xml.jar"      value="../lib/simple-xml-1.1.1.jar" />
@@ -103,28 +73,15 @@
         <copy file="../lib/stax-1.2.0.jar" todir="../build" />
     </target>
 
-    <target name="all-desktop" unless="isGLES">
+    <target name="all" depends="init">
         <mkdir dir="${classes}" />
         <path id="jogl-demos.classpath">
-            <pathelement location="${jogl.core.jar}" />
-            <pathelement location="${jogl.oswin.jar}" />
-            <pathelement location="${jogl.gles1.jar}" />
-            <pathelement location="${jogl.gles1.dbg.jar}" />
-            <pathelement location="${jogl.gles2.jar}" />
-            <pathelement location="${jogl.gles2.dbg.jar}" />
-            <pathelement location="${jogl.egl.jar}" />
-            <pathelement location="${jogl.gl2.jar}" />
-            <pathelement location="${jogl.gl2.dbg.jar}" />
-            <pathelement location="${jogl.awt.jar}" />
-            <pathelement location="${jogl.util.jar}" />
-            <pathelement location="${jogl.util.awt.jar}" />
-            <pathelement location="${jogl.util.gl2.jar}" />
-            <pathelement location="${newt.jar}" />
+            <pathelement location="${jogl.jar}" />
             <pathelement location="${joal.jar}" />
             <pathelement location="${joal-demos.jar}" />
             <pathelement location="${simple-xml.jar}" />
         </path>
-        <javac destdir="${classes}" excludes="${jogl.cg.excludes},demos/nurbs/**,demos/es1/**,demos/es2/**" source="1.4" target="1.4" debug="true" debuglevel="source,lines">
+        <javac destdir="${classes}" excludes="${jogl.cg.excludes},demos/nurbs/**" source="1.4" target="1.4" debug="true" debuglevel="source,lines">
             <src path="${src}" />
             <classpath refid="jogl-demos.classpath" />
         </javac>
@@ -168,59 +125,6 @@
 	     />
     </target>
 
-    <target name="all-gles1" if="isGLES1">
-        <echo message="classes destdir ${classes}" />
-        <mkdir dir="${classes}" />
-        <path id="jogl-demos.classpath">
-            <pathelement location="${jogl.core.jar}" />
-            <pathelement location="${jogl.gles1.jar}" />
-            <pathelement location="${jogl.gles1.dbg.jar}" />
-            <pathelement location="${jogl.egl.jar}" />
-            <pathelement location="${newt.jar}" />
-        </path>
-        <!--javac destdir="${classes}" includes="demos/es1/**" source="1.4" target="1.4" debug="true" debuglevel="source,lines"
-               bootclasspath="../../gluegen/make/lib/cdc_fp.jar">
-            <src path="${src}" />
-            <classpath refid="jogl-demos.classpath" />
-        </javac-->
-        <javac destdir="${classes}" includes="demos/es1/RedSquare.java" source="1.4" target="1.4" debug="true" debuglevel="source,lines"
-               bootclasspath="../../gluegen/make/lib/cdc_fp.jar">
-            <src path="${src}" />
-            <classpath refid="jogl-demos.classpath" />
-        </javac>
-        <jar destfile="${jogl.demos.jar}">
-            <fileset dir="${classes}">
-                <include name="**" />
-            </fileset>
-            <fileset dir="${src}">
-                <include name="demos/es1/bump/*.brs" />
-            </fileset>
-        </jar>
-    </target>
-
-    <target name="all-gles2" if="isGLES2">
-        <mkdir dir="${classes}" />
-        <path id="jogl-demos.classpath">
-            <pathelement location="${jogl.core.jar}" />
-            <pathelement location="${jogl.gles2.jar}" />
-            <pathelement location="${jogl.gles2.dbg.jar}" />
-            <pathelement location="${jogl.egl.jar}" />
-            <pathelement location="${newt.jar}" />
-        </path>
-        <javac destdir="${classes}" includes="demos/es2/**" source="1.4" target="1.4" debug="true" debuglevel="source,lines"
-               bootclasspath="../../gluegen/make/lib/cdc_fp.jar">
-            <src path="${src}" />
-            <classpath refid="jogl-demos.classpath" />
-        </javac>
-        <jar destfile="${jogl.demos.jar}">
-            <fileset dir="${classes}">
-                <include name="**" />
-            </fileset>
-        </jar>
-    </target>
-
-    <target name="all" depends="init, all-desktop, all-gles1, all-gles2" />
-
     <target name="javadoc" depends="init">
         <mkdir dir="${javadoc}" />
         <javadoc destdir="${javadoc}" windowtitle="JOGL Demos"