diff options
| author | Sven Gothel <[email protected]> | 2009-11-10 03:42:07 +0100 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2009-11-10 03:42:07 +0100 |
| commit | 08d7de9c49d6bd778d0a915731ae9edbafdf646c (patch) | |
| tree | ea200a3ec874ae4e7115c51e902f4a5e2982c037 | |
| parent | 2d5f1650af2b64f7a8d25842b2b95192b3e4a4e9 (diff) | |
Redbook seperation ..
| -rw-r--r-- | make/build.xml | 15 | ||||
| -rw-r--r-- | make/make.jogl.all.x86_64.sh | 2 |
2 files changed, 11 insertions, 6 deletions
diff --git a/make/build.xml b/make/build.xml index dd14d05..080ae68 100644 --- a/make/build.xml +++ b/make/build.xml @@ -102,12 +102,7 @@ <property name="jogl.demos.data.jar" value="../${rootrel.build}/jogl-demos-data.jar" /> <property name="jogl.demos.src.zip" value="../${rootrel.build}/jogl-demos-src.zip" /> - <condition property="jogl.redbook.excludes" - value="redbook/**"> - <not> - <isset property="jogl.redbook" /> - </not> - </condition> + <property name="jogl.redbook.excludes" value="redbook/**" /> </target> @@ -129,6 +124,13 @@ <copy file="../lib/stax-1.2.0.jar" todir="../${rootrel.build}" /> </target> + <target name="redbook-javac" if="jogl.redbook"> + <javac destdir="${classes}" source="1.5" target="1.5" debug="true" debuglevel="source,lines"> + <src path="${src}/redbook/src" /> + <classpath refid="jogl-demos.classpath" /> + </javac> + </target> + <target name="all-desktop" unless="isGLES"> <mkdir dir="${classes}" /> <path id="jogl-demos.classpath"> @@ -161,6 +163,7 @@ <src path="${src}" /> <classpath refid="jogl-demos.classpath" /> </javac> + <antcall target="redbook-javac" inheritrefs="true" /> <antcall target="nurbs" inheritrefs="true" /> <jar destfile="${jogl.demos.jar}"> <fileset dir="${classes}"> diff --git a/make/make.jogl.all.x86_64.sh b/make/make.jogl.all.x86_64.sh index 1fa1675..dc49ee4 100644 --- a/make/make.jogl.all.x86_64.sh +++ b/make/make.jogl.all.x86_64.sh @@ -4,8 +4,10 @@ # -Dc.compiler.debug=true # -Djogl.cg=1 \ +# -Djogl.redbook=true \ ant \ -Djogl.cg=1 \ + -Duser.swt.jar=$HOME/.java/swt.jar \ -Drootrel.build=build-x86_64 \ $* 2>&1 | tee make.jogl.all.x86_64.log |