From 2ac4006de0af87a87bc4f37abb3ba763379da207 Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Wed, 23 Feb 2011 15:13:56 +0100
Subject: Inverse build attribute build.noarchive -> build.archiveon

---
 make/build-common.xml                      | 1 +
 make/build-test.xml                        | 4 ++--
 make/build.xml                             | 2 +-
 make/scripts/make.jogl.all.linux-x86.sh    | 3 ---
 make/scripts/make.jogl.all.linux-x86_64.sh | 4 ----
 make/scripts/make.jogl.all.macosx.sh       | 2 --
 make/scripts/make.jogl.all.win32.bat       | 3 +--
 make/scripts/make.jogl.all.win64.bat       | 3 +--
 make/scripts/make.jogl.cdcfp.linux-x86.sh  | 2 --
 make/scripts/make.jogl.cdcfp.macosx.sh     | 2 --
 make/scripts/make.jogl.doc.all.x86_64.sh   | 1 -
 make/scripts/make.jogl.doc.x86_64.sh       | 1 -
 make/scripts/tests.sh                      | 4 ++--
 13 files changed, 8 insertions(+), 24 deletions(-)

(limited to 'make')

diff --git a/make/build-common.xml b/make/build-common.xml
index 71ee4c238..7b168773e 100644
--- a/make/build-common.xml
+++ b/make/build-common.xml
@@ -39,6 +39,7 @@
         <!-- Set the project root directory to be up one directory. -->
         <property name="project.root"               value=".." />
         <property name="build"                      value="${project.root}/${rootrel.build}" />
+        <property name="build.path"                 location="${build}"/> <!-- absolute path -->
         <property name="src"                        value="${project.root}/src" />
         <property name="lib"                        value="${build}/lib" />
         <property name="jar"                        value="${build}/jar" />
diff --git a/make/build-test.xml b/make/build-test.xml
index e8f3b49a3..1f7483aa4 100644
--- a/make/build-test.xml
+++ b/make/build-test.xml
@@ -55,7 +55,7 @@
       <!-- Clean the results -->
       <delete quiet="true">
         <fileset dir="${results.test}" includes="**"/>
-        <fileset file="${build}/${test.archive.name}.7z"/>
+        <fileset file="${build.path}/${test.archive.name}.7z"/>
       </delete>
       <mkdir dir="${results.test}" />
 
@@ -385,7 +385,7 @@
 
     <!-- updates / create the test results zip file -->
     <target name="test-zip-archive" depends="declare.common">
-        <archive.7z destfile="${build}/${test.archive.name}.7z"
+        <archive.7z destfile="${build.path}/${test.archive.name}.7z"
                     basedir="${results.test}" 
                     includes="**" />
     </target>
diff --git a/make/build.xml b/make/build.xml
index aee9509bd..1b3107993 100644
--- a/make/build.xml
+++ b/make/build.xml
@@ -116,7 +116,7 @@
        - This must be called after all of the build targets complete.
       -->
 
-    <target name="developer-zip-archive" depends="init" unless="build.noarchives">
+    <target name="developer-zip-archive" depends="init" if="build.archiveon">
         <delete includeEmptyDirs="true" quiet="true" dir="${archive}" failonerror="false" />
         <mkdir dir="${archive}" />
         <copy file="${build}/artifact.properties" todir="${archive}" />
diff --git a/make/scripts/make.jogl.all.linux-x86.sh b/make/scripts/make.jogl.all.linux-x86.sh
index 76b46a03b..03dedb99c 100755
--- a/make/scripts/make.jogl.all.linux-x86.sh
+++ b/make/scripts/make.jogl.all.linux-x86.sh
@@ -31,7 +31,6 @@ fi
 # -Djogl.cg=1
 #    -Dc.compiler.debug=true 
 #    -DuseOpenMAX=true \
-#    -Dbuild.noarchives=true
 #    -Dgluegen.cpptasks.detected.os=true \
 #    -DisUnix=true \
 #    -DisLinux=true \
@@ -53,9 +52,7 @@ echo LIBGL_DEBUG: $LIBGL_DEBUG 2>&1 | tee -a $LOGF
 
 ant \
     $CUSTOMLIBDIR \
-    -Dbuild.noarchives=true \
     -Dgluegen-cpptasks.file=`pwd`/../../gluegen/make/lib/gluegen-cpptasks-linux-32bit.xml \
-    -Dbuild.noarchives=true \
     -Djogl.cg=1 \
     -Drootrel.build=build-x86 \
     -Dos.arch=x86 \
diff --git a/make/scripts/make.jogl.all.linux-x86_64.sh b/make/scripts/make.jogl.all.linux-x86_64.sh
index 2b63ef0ab..577caeb14 100755
--- a/make/scripts/make.jogl.all.linux-x86_64.sh
+++ b/make/scripts/make.jogl.all.linux-x86_64.sh
@@ -29,14 +29,12 @@ fi
 
 # -Djogl.cg=1
 #    -Dc.compiler.debug=true \
-#    -Dbuild.noarchives=true \
 
 #    -Dgluegen.cpptasks.detected.os=true \
 #    -DisUnix=true \
 #    -DisLinux=true \
 #    -DisLinuxAMD64=true \
 #    -DisX11=true \
-#    -Dbuild.noarchives=true \
 
 #LD_LIBRARY_PATH=/opt-linux-x86_64/mesa-7.8.1/lib64
 #export LD_LIBRARY_PATH
@@ -50,7 +48,6 @@ echo LIBXCB_ALLOW_SLOPPY_LOCK: $LIBXCB_ALLOW_SLOPPY_LOCK 2>&1 | tee -a $LOGF
 echo LIBGL_DRIVERS_PATH: $LIBGL_DRIVERS_PATH 2>&1 | tee -a $LOGF
 echo LIBGL_DEBUG: $LIBGL_DEBUG 2>&1 | tee -a $LOGF
 
-#    -Dbuild.noarchives=true \
 #    -Dc.compiler.debug=true \
 #    -Djavacdebug="true" \
 #    -Djavacdebuglevel="source,lines,vars" \
@@ -58,7 +55,6 @@ echo LIBGL_DEBUG: $LIBGL_DEBUG 2>&1 | tee -a $LOGF
 ant  \
     $CUSTOMLIBDIR \
     -Djavacdebuglevel="source,lines,vars" \
-    -Dbuild.noarchives=true \
     -Djogl.cg=1 \
     -Drootrel.build=build-x86_64 \
     -DuseKD=true \
diff --git a/make/scripts/make.jogl.all.macosx.sh b/make/scripts/make.jogl.all.macosx.sh
index f8c147cd6..967790b6e 100755
--- a/make/scripts/make.jogl.all.macosx.sh
+++ b/make/scripts/make.jogl.all.macosx.sh
@@ -6,10 +6,8 @@ fi
 
 
 #    -Dc.compiler.debug=true 
-#    -Dbuild.noarchives=true
 
 ant \
-    -Dbuild.noarchives=true \
     -Djogl.cg=1 \
     -Drootrel.build=build-macosx \
     $* 2>&1 | tee make.jogl.all.macosx.log
diff --git a/make/scripts/make.jogl.all.win32.bat b/make/scripts/make.jogl.all.win32.bat
index 0585808cb..f73a332d3 100755
--- a/make/scripts/make.jogl.all.win32.bat
+++ b/make/scripts/make.jogl.all.win32.bat
@@ -12,6 +12,5 @@ REM    -Dc.compiler.debug=true
 REM    -DuseOpenMAX=true 
 REM    -DuseKD=true
 REM    -Djogl.cg=1
-REM    -Dbuild.noarchives=true
 
-ant -Dbuild.noarchives=true -Drootrel.build=build-win32 -Djogl.cg=1 %1 %2 %3 %4 %5 %6 %7 %8 %9 > make.jogl.all.win32.log 2>&1
+ant -Drootrel.build=build-win32 -Djogl.cg=1 %1 %2 %3 %4 %5 %6 %7 %8 %9 > make.jogl.all.win32.log 2>&1
diff --git a/make/scripts/make.jogl.all.win64.bat b/make/scripts/make.jogl.all.win64.bat
index 54c00187d..76e459ae7 100755
--- a/make/scripts/make.jogl.all.win64.bat
+++ b/make/scripts/make.jogl.all.win64.bat
@@ -12,6 +12,5 @@ REM    -Dc.compiler.debug=true
 REM    -DuseOpenMAX=true 
 REM    -DuseKD=true
 REM    -Djogl.cg=1
-REM    -Dbuild.noarchives=true
 
-ant -Dc.compiler.debug=true -Dbuild.noarchives=true -Drootrel.build=build-win64 -Djogl.cg=1 %1 %2 %3 %4 %5 %6 %7 %8 %9 > make.jogl.all.win64.log 2>&1
+ant -Dc.compiler.debug=true -Drootrel.build=build-win64 -Djogl.cg=1 %1 %2 %3 %4 %5 %6 %7 %8 %9 > make.jogl.all.win64.log 2>&1
diff --git a/make/scripts/make.jogl.cdcfp.linux-x86.sh b/make/scripts/make.jogl.cdcfp.linux-x86.sh
index ad80f194d..b26926804 100755
--- a/make/scripts/make.jogl.cdcfp.linux-x86.sh
+++ b/make/scripts/make.jogl.cdcfp.linux-x86.sh
@@ -10,13 +10,11 @@ fi
 #    -Djavacdebuglevel="none" \
 #
 #    -Djava.generate.skip=true \
-#    -Dbuild.noarchives=true
 
 BUILD_SUBDIR=build-cdcfp-x86
 
 ant -v \
     -Dgluegen-cpptasks.file=`pwd`/../../gluegen/make/lib/gluegen-cpptasks-linux-32bit.xml \
-    -Dbuild.noarchives=true \
     -Drootrel.build=$BUILD_SUBDIR \
     -Dsetup.cdcfp=true \
     -Dgluegen.cpptasks.detected.os=true \
diff --git a/make/scripts/make.jogl.cdcfp.macosx.sh b/make/scripts/make.jogl.cdcfp.macosx.sh
index 88ec8750d..6875a4d2c 100755
--- a/make/scripts/make.jogl.cdcfp.macosx.sh
+++ b/make/scripts/make.jogl.cdcfp.macosx.sh
@@ -6,12 +6,10 @@ fi
 
 
 #    -Dc.compiler.debug=true 
-#    -Dbuild.noarchives=true
 
 BUILD_SUBDIR=build-cdcfp-macosx
 
 ant \
-    -Dbuild.noarchives=true \
     -Dsetup.cdcfp=true \
     -Drootrel.build=$BUILD_SUBDIR \
     $* 2>&1 | tee make.jogl.cdcfp.macosx.log
diff --git a/make/scripts/make.jogl.doc.all.x86_64.sh b/make/scripts/make.jogl.doc.all.x86_64.sh
index 3711171af..5e111d50b 100755
--- a/make/scripts/make.jogl.doc.all.x86_64.sh
+++ b/make/scripts/make.jogl.doc.all.x86_64.sh
@@ -6,6 +6,5 @@ fi
 
 
 ant -v  \
-    -Dbuild.noarchives=true \
     -Drootrel.build=build-x86_64 \
     javadoc.spec javadoc javadoc.dev $* 2>&1 | tee make.jogl.doc.all.x86_64.log
diff --git a/make/scripts/make.jogl.doc.x86_64.sh b/make/scripts/make.jogl.doc.x86_64.sh
index daf09ec33..677de394c 100755
--- a/make/scripts/make.jogl.doc.x86_64.sh
+++ b/make/scripts/make.jogl.doc.x86_64.sh
@@ -6,6 +6,5 @@ fi
 
 
 ant -v  \
-    -Dbuild.noarchives=true \
     -Drootrel.build=build-x86_64 \
     javadoc $* 2>&1 | tee make.jogl.doc.x86_64.log
diff --git a/make/scripts/tests.sh b/make/scripts/tests.sh
index f264b7755..682158eea 100644
--- a/make/scripts/tests.sh
+++ b/make/scripts/tests.sh
@@ -126,7 +126,7 @@ function testawt() {
 #testawt com.jogamp.opengl.test.junit.jogl.demos.gl2.gears.TestGearsGLJPanelAWT $*
 #testawt com.jogamp.opengl.test.junit.jogl.texture.TestTexture01AWT
 #testawt com.jogamp.opengl.test.junit.jogl.caps.TestMultisampleAWT
-testawt com.jogamp.opengl.test.junit.jogl.swt.TestSWT01GLn $*
+#testawt com.jogamp.opengl.test.junit.jogl.swt.TestSWT01GLn $*
 #testawt com.jogamp.opengl.test.junit.jogl.awt.TestBug461OffscreenSupersamplingSwingAWT
 #testawt com.jogamp.opengl.test.junit.jogl.texture.TestGrayTextureFromFileAWTBug417
 
@@ -134,7 +134,7 @@ testawt com.jogamp.opengl.test.junit.jogl.swt.TestSWT01GLn $*
 # newt.awt (testawt)
 #
 #testawt com.jogamp.opengl.test.junit.jogl.newt.TestSwingAWTRobotUsageBeforeJOGLInitBug411
-#testawt com.jogamp.opengl.test.junit.jogl.demos.gl2.gears.newt.TestGearsNewtAWTWrapper
+testawt com.jogamp.opengl.test.junit.jogl.demos.gl2.gears.newt.TestGearsNewtAWTWrapper
 #testawt com.jogamp.opengl.test.junit.newt.TestEventSourceNotAWTBug
 #testawt com.jogamp.opengl.test.junit.newt.TestFocus01SwingAWTRobot
 #testawt com.jogamp.opengl.test.junit.newt.TestFocus02SwingAWTRobot
-- 
cgit v1.2.3