diff options
author | Sven Gothel <[email protected]> | 2010-11-01 20:12:30 +0100 |
---|---|---|
committer | Sven Gothel <[email protected]> | 2010-11-01 20:12:30 +0100 |
commit | 686ab85440a3f46556c304f2d83c12608a573bd8 (patch) | |
tree | c7205e16fad441721a51ef01ddc7c4e574e1a712 /make | |
parent | 81ee164ec139337254ef0e8938c19119908de6ae (diff) |
Fix: Move windows build scripts to ant 1.8.0 as well (1.8.1 is buggy)
Diffstat (limited to 'make')
-rwxr-xr-x | make/scripts/java-win32-dbg.bat | 2 | ||||
-rwxr-xr-x | make/scripts/java-win32.bat | 2 | ||||
-rwxr-xr-x | make/scripts/java-win64-dbg.bat | 4 | ||||
-rwxr-xr-x | make/scripts/java-win64.bat | 2 | ||||
-rwxr-xr-x | make/scripts/make.jogl.all.win32.bat | 2 | ||||
-rwxr-xr-x | make/scripts/make.jogl.all.win64.bat | 2 |
6 files changed, 7 insertions, 7 deletions
diff --git a/make/scripts/java-win32-dbg.bat b/make/scripts/java-win32-dbg.bat index b0474c824..856ee3265 100755 --- a/make/scripts/java-win32-dbg.bat +++ b/make/scripts/java-win32-dbg.bat @@ -2,7 +2,7 @@ set BLD_SUB=build-win32
set J2RE_HOME=c:\jre1.6.0_21_x32
set JAVA_HOME=c:\jdk1.6.0_21_x32
-set ANT_PATH=C:\apache-ant-1.8.1
+set ANT_PATH=C:\apache-ant-1.8.0
set PATH=%JAVA_HOME%\bin;%ANT_PATH%\bin;c:\mingw\bin;%PATH%
diff --git a/make/scripts/java-win32.bat b/make/scripts/java-win32.bat index ab3518649..aec1d4697 100755 --- a/make/scripts/java-win32.bat +++ b/make/scripts/java-win32.bat @@ -2,7 +2,7 @@ set BLD_SUB=build-win32
set J2RE_HOME=c:\jre1.6.0_21_x32
set JAVA_HOME=c:\jdk1.6.0_21_x32
-set ANT_PATH=C:\apache-ant-1.8.1
+set ANT_PATH=C:\apache-ant-1.8.0
set PATH=%JAVA_HOME%\bin;%ANT_PATH%\bin;c:\mingw\bin;%PATH%
diff --git a/make/scripts/java-win64-dbg.bat b/make/scripts/java-win64-dbg.bat index 1a3bd5910..ca999cf5f 100755 --- a/make/scripts/java-win64-dbg.bat +++ b/make/scripts/java-win64-dbg.bat @@ -2,7 +2,7 @@ set BLD_SUB=build-win64
set J2RE_HOME=c:\jre1.6.0_21_x64
set JAVA_HOME=c:\jdk1.6.0_21_x64
-set ANT_PATH=C:\apache-ant-1.8.1
+set ANT_PATH=C:\apache-ant-1.8.0
set PATH=%JAVA_HOME%\bin;%ANT_PATH%\bin;c:\mingw\bin;%PATH%
@@ -18,7 +18,7 @@ REM set D_ARGS="-Djogl.debug=all" "-Dnewt.debug=all" "-Dnativewindow.debug=all" REM set D_ARGS="-Dnewt.debug.Window" "-Dnativewindow.debug.TraceLock"
REM set D_ARGS="-Dnativewindow.debug.TraceLock"
REM set D_ARGS="-Dnewt.debug.Window" "-Dnewt.debug.Display"
-set D_ARGS="-Dnewt.debug=all" "-Dnewt.debug.EDT" "-Dnativewindow.debug=all" "-Djogamp.common.utils.locks.Lock.timeout=600000" "-Djogamp.debug.Lock" "-Djogamp.debug.Lock.TraceLock"
+set D_ARGS="-Dnewt.debug.Screen" "-Dnewt.debug.EDT" "-Dnativewindow.debug=all"
REM set D_ARGS="-Dnewt.debug.Window" "-Dnewt.debug.Display" "-Dnewt.test.Window.reparent.incompatible=true"
set X_ARGS="-Dsun.java2d.noddraw=true" "-Dsun.awt.noerasebackground=true"
diff --git a/make/scripts/java-win64.bat b/make/scripts/java-win64.bat index eb40ca40c..0dc710105 100755 --- a/make/scripts/java-win64.bat +++ b/make/scripts/java-win64.bat @@ -2,7 +2,7 @@ set BLD_SUB=build-win64
set J2RE_HOME=c:\jre1.6.0_21_x64
set JAVA_HOME=c:\jdk1.6.0_21_x64
-set ANT_PATH=C:\apache-ant-1.8.1
+set ANT_PATH=C:\apache-ant-1.8.0
set PATH=%JAVA_HOME%\bin;%ANT_PATH%\bin;c:\mingw\bin;%PATH%
diff --git a/make/scripts/make.jogl.all.win32.bat b/make/scripts/make.jogl.all.win32.bat index 9f93e5a0b..f3f775cf7 100755 --- a/make/scripts/make.jogl.all.win32.bat +++ b/make/scripts/make.jogl.all.win32.bat @@ -2,7 +2,7 @@ set THISDIR="C:\JOGL" set J2RE_HOME=c:\jre1.6.0_21_x32
set JAVA_HOME=c:\jdk1.6.0_21_x32
-set ANT_PATH=C:\apache-ant-1.8.1
+set ANT_PATH=C:\apache-ant-1.8.0
set PATH=%JAVA_HOME%\bin;%ANT_PATH%\bin;c:\mingw\bin;%PATH%
diff --git a/make/scripts/make.jogl.all.win64.bat b/make/scripts/make.jogl.all.win64.bat index 15df3878a..cfd5a1d09 100755 --- a/make/scripts/make.jogl.all.win64.bat +++ b/make/scripts/make.jogl.all.win64.bat @@ -2,7 +2,7 @@ set THISDIR="C:\JOGL" set J2RE_HOME=c:\jre1.6.0_21_x64
set JAVA_HOME=c:\jdk1.6.0_21_x64
-set ANT_PATH=C:\apache-ant-1.8.1
+set ANT_PATH=C:\apache-ant-1.8.0
set PATH=%JAVA_HOME%\bin;%ANT_PATH%\bin;c:\mingw64\bin;c:\mingw\bin;%PATH%
|