diff options
Diffstat (limited to 'make/build.xml')
| -rw-r--r-- | make/build.xml | 117 |
1 files changed, 49 insertions, 68 deletions
diff --git a/make/build.xml b/make/build.xml index b424fe0..0a2a4f9 100644 --- a/make/build.xml +++ b/make/build.xml @@ -94,38 +94,17 @@ </target> <target name="init" depends="jogamp.env.init,gluegen.cpptasks.detect.os,java.class.path.validate,setup.gles,setup.cg.excludes,skip.cg.excludes,init.swt"> - <property name="jogl.core.jar" value="${jogl.build}/jogl/jogl.core.jar" /> - <condition property="jogl.cg.jar" value="${jogl.build}/jogl/jogl.cg.jar"> - <isset property="jogl.cg"/> - </condition> <property name="gluegen-rt.jar" value="${gluegen.build}/gluegen-rt.jar" /> - <property name="jogl.gles12.jar" value="${jogl.build}/jogl/jogl.gles12.jar" /> - <property name="jogl.gles12.dbg.jar" value="${jogl.build}/jogl/jogl.gles12.dbg.jar" /> - <property name="jogl.gles1.jar" value="${jogl.build}/jogl/jogl.gles1.jar" /> - <property name="jogl.gles1.dbg.jar" value="${jogl.build}/jogl/jogl.gles1.dbg.jar" /> - <property name="jogl.gles2.jar" value="${jogl.build}/jogl/jogl.gles2.jar" /> - <property name="jogl.gles2.dbg.jar" value="${jogl.build}/jogl/jogl.gles2.dbg.jar" /> - <property name="jogl.egl.jar" value="${jogl.build}/jogl/jogl.egl.jar" /> - <property name="jogl.gldesktop.jar" value="${jogl.build}/jogl/jogl.gldesktop.jar" /> - <property name="jogl.gldesktop.dbg.jar" value="${jogl.build}/jogl/jogl.gldesktop.dbg.jar" /> - <property name="jogl.awt.jar" value="${jogl.build}/jogl/jogl.awt.jar" /> - <property name="jogl.util.jar" value="${jogl.build}/jogl/jogl.util.jar" /> - <property name="jogl.util.awt.jar" value="${jogl.build}/jogl/jogl.util.awt.jar" /> - <property name="jogl.util.fixedfuncemu.jar" value="${jogl.build}/jogl/jogl.util.fixedfuncemu.jar" /> - <property name="jogl.util.gldesktop.jar" value="${jogl.build}/jogl/jogl.util.gldesktop.jar" /> - <property name="nativewindow.core.jar" value="${jogl.build}/nativewindow/nativewindow.core.jar" /> - <property name="nativewindow.x11.jar" value="${jogl.build}/nativewindow/nativewindow.x11.jar" /> - <property name="nativewindow.awt.jar" value="${jogl.build}/nativewindow/nativewindow.awt.jar" /> - <property name="newt.core.jar" value="${jogl.build}/newt/newt.core.jar" /> - <property name="newt.ogl.jar" value="${jogl.build}/newt/newt.ogl.jar" /> - <property name="newt.awt.jar" value="${jogl.build}/newt/newt.awt.jar" /> + <property name="jogl.all.jar" value="${jogl.build}/jar/jogl.all.jar" /> + <property name="jogl.cg.jar" value="${jogl.build}/jar/atomic/jogl.cg.jar" /> <property name="joal.jar" value="${joal.build}/joal.jar" /> <property name="simple-xml.jar" value="${project.root}/lib/simple-xml-1.1.1.jar" /> <property name="classes" value="${build}/classes" /> <property name="src" value="${project.root}/src" /> <property name="javadoc" value="${project.root}/javadoc" /> <!-- property name="javadoc.link" value="http://java.sun.com/j2se/1.4.2/docs/api/" /--> - <property name="javadoc.link" value="http://download.oracle.com/javase/1.5.0/docs/api/" /> + <!--property name="javadoc.link" value="http://download.oracle.com/javase/1.5.0/docs/api/" /--> + <property name="javadoc.link" value="http://docs.oracle.com/javase/6/docs/api/" /> <property name="javadoc.link.jogl" value="${jogl.root}/javadoc-public/" /> <property name="jogl.demos.jar" value="${build}/jogl-demos.jar" /> <property name="jogl.demos.util.jar" value="${build}/jogl-demos-util.jar" /> @@ -138,9 +117,15 @@ </target> <target name="nurbs" if="jogl.nurbs"> - <!-- NOTE: this target requires a 1.5 javac to be on the PATH --> - <javac destdir="${classes}" includes="demos/nurbs/**" source="1.5" debug="true" debuglevel="source,lines" - includeantruntime="false"> + <javac destdir="${classes}" + includeAntRuntime="false" + includes="demos/nurbs/**" + memoryMaximumSize="${javac.memorymax}" + encoding="UTF-8" + source="${target.sourcelevel}" + target="${target.targetlevel}" + bootclasspath="${target.rt.jar}" + debug="${javacdebug}" debuglevel="${javacdebuglevel}"> <src path="${src}" /> <classpath refid="jogl-demos.classpath" /> </javac> @@ -157,8 +142,14 @@ </target> <target name="redbook-javac"> - <javac destdir="${classes}" source="1.5" target="1.5" debug="true" debuglevel="source,lines" - includeantruntime="false"> + <javac destdir="${classes}" + includeantruntime="false" + memoryMaximumSize="${javac.memorymax}" + encoding="UTF-8" + source="${target.sourcelevel}" + target="${target.targetlevel}" + bootclasspath="${target.rt.jar}" + debug="${javacdebug}" debuglevel="${javacdebuglevel}"> <src path="${src}/redbook/src" /> <classpath refid="jogl-demos.classpath" /> </javac> @@ -167,33 +158,22 @@ <target name="all-desktop" unless="isGLES"> <mkdir dir="${classes}" /> <path id="jogl-demos.classpath"> - <pathelement location="${nativewindow.core.jar}" /> - <pathelement location="${nativewindow.x11.jar}" /> - <pathelement location="${nativewindow.awt.jar}" /> - <pathelement location="${jogl.core.jar}" /> + <pathelement location="${jogl.all.jar}" /> <pathelement location="${jogl.cg.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.gldesktop.jar}" /> - <pathelement location="${jogl.gldesktop.dbg.jar}" /> - <pathelement location="${jogl.awt.jar}" /> - <pathelement location="${jogl.util.jar}" /> - <pathelement location="${jogl.util.fixedfuncemu.jar}" /> - <pathelement location="${jogl.util.awt.jar}" /> - <pathelement location="${jogl.util.gldesktop.jar}" /> - <pathelement location="${newt.core.jar}" /> - <pathelement location="${newt.ogl.jar}" /> - <pathelement location="${newt.awt.jar}" /> <pathelement location="${joal.jar}" /> <pathelement location="${gluegen-rt.jar}" /> <pathelement location="${simple-xml.jar}" /> <pathelement location="${swt.jar}" /> </path> - <javac destdir="${classes}" excludes="${jogl.cg.excludes},demos/nurbs/**,${jogl.swt.excludes},jbullet/**,${jogl.redbook.excludes}" source="1.5" debug="true" debuglevel="source,lines" - includeantruntime="false"> + <javac destdir="${classes}" + excludes="${jogl.cg.excludes},demos/nurbs/**,${jogl.swt.excludes},jbullet/**,${jogl.redbook.excludes}" + includeantruntime="false" + memoryMaximumSize="${javac.memorymax}" + encoding="UTF-8" + source="${target.sourcelevel}" + target="${target.targetlevel}" + bootclasspath="${target.rt.jar}" + debug="${javacdebug}" debuglevel="${javacdebuglevel}"> <src path="${src}" /> <classpath refid="jogl-demos.classpath" /> </javac> @@ -240,23 +220,19 @@ <echo message="classes destdir ${classes}" /> <mkdir dir="${classes}" /> <path id="jogl-demos.classpath"> - <pathelement location="${nativewindow.core.jar}" /> - <pathelement location="${nativewindow.x11.jar}" /> - <pathelement location="${jogl.core.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.util.jar}" /> - <pathelement location="${jogl.util.fixedfuncemu.jar}" /> + <pathelement location="${jogl.all.jar}" /> + <pathelement location="${jogl.cg.jar}" /> <pathelement location="${gluegen-rt.jar}" /> - <pathelement location="${newt.core.jar}" /> - <pathelement location="${newt.ogl.jar}" /> </path> - <javac destdir="${classes}" includes="demos/GLInfo*,demos/es1/**,demos/es2/**" source="1.5" debug="true" debuglevel="source,lines" - includeantruntime="false"> - bootclasspath="${gluegen.root}/make/lib/cdc_fp.jar"> + <javac destdir="${classes}" + includes="demos/GLInfo*,demos/es1/**,demos/es2/**" + includeantruntime="false" + memoryMaximumSize="${javac.memorymax}" + encoding="UTF-8" + source="${target.sourcelevel}" + target="${target.targetlevel}" + bootclasspath="${target.rt.jar}" + debug="${javacdebug}" debuglevel="${javacdebuglevel}"> <src path="${src}" /> <classpath refid="jogl-demos.classpath" /> </javac> @@ -276,6 +252,8 @@ <target name="all" depends="init, all-desktop, all-gles, tag.build, developer-zip-archive" /> + <target name="all.ide" depends="init, all-desktop, all-gles" /> + <target name="tag.build"> <copy file="${jogl.build}/artifact.properties" todir="${build}" overwrite="true"/> <echo message='jogl-demos.build.number=${jogl-demos.build.number}${line.separator}' file="${build}/artifact.properties" append="true"/> @@ -286,8 +264,11 @@ <target name="javadoc" depends="init"> <mkdir dir="${javadoc}" /> - <javadoc destdir="${javadoc}" windowtitle="JOGL Demos" - source="1.5"> + <javadoc destdir="${javadoc}" + windowtitle="JOGL Demos" + encoding="UTF-8" + source="${target.sourcelevel}" + maxmemory="${javac.memorymax}" > <packageset dir="${src}"> <exclude name="demos/cg/**" /> </packageset> |