diff options
| -rwxr-xr-x | make/build.xml | 2 | ||||
| -rwxr-xr-x | make/scripts/make.joal.all.win32.bat | 3 | ||||
| -rwxr-xr-x | make/scripts/make.joal.all.win64.bat | 3 |
3 files changed, 3 insertions, 5 deletions
diff --git a/make/build.xml b/make/build.xml index 3d08fb5..4caf436 100755 --- a/make/build.xml +++ b/make/build.xml @@ -493,7 +493,7 @@ </target> <!-- Build binary zip archives for developers --> - <target name="developer-zip-archive" depends="init" unless="build.noarchives"> + <target name="developer-zip-archive" depends="init" if="build.archiveon"> <!-- Clean up and create temporary directory --> <delete includeEmptyDirs="true" quiet="true" dir="${archive}" failonerror="false" /> <mkdir dir="${archive}" /> diff --git a/make/scripts/make.joal.all.win32.bat b/make/scripts/make.joal.all.win32.bat index e404460..afce857 100755 --- a/make/scripts/make.joal.all.win32.bat +++ b/make/scripts/make.joal.all.win32.bat @@ -7,6 +7,5 @@ set PATH=%JAVA_HOME%\bin;%ANT_PATH%\bin;c:\mingw\bin;%PATH% set LIB_GEN=%THISDIR%\lib
set CLASSPATH=.;%THISDIR%\build-win32\classes
REM -Dc.compiler.debug=true
-REM -Dbuild.noarchives=true
-ant -Dbuild.noarchives=true -Drootrel.build=build-win32 %1 %2 %3 %4 %5 %6 %7 %8 %9 > make.joal.all.win32.log 2>&1
+ant -Drootrel.build=build-win32 %1 %2 %3 %4 %5 %6 %7 %8 %9 > make.joal.all.win32.log 2>&1
diff --git a/make/scripts/make.joal.all.win64.bat b/make/scripts/make.joal.all.win64.bat index 0890b44..120926b 100755 --- a/make/scripts/make.joal.all.win64.bat +++ b/make/scripts/make.joal.all.win64.bat @@ -7,6 +7,5 @@ set PATH=%JAVA_HOME%\bin;%ANT_PATH%\bin;c:\mingw64\bin;c:\mingw\bin;%PATH% set LIB_GEN=%THISDIR%\lib
set CLASSPATH=.;%THISDIR%\build-win64\classes
REM -Dc.compiler.debug=true
-REM -Dbuild.noarchives=true
-ant -Dc.compiler.debug=true -Dbuild.noarchives=true -Drootrel.build=build-win64 %1 %2 %3 %4 %5 %6 %7 %8 %9 > make.joal.all.win64.log 2>&1
+ant -Dc.compiler.debug=true -Drootrel.build=build-win64 %1 %2 %3 %4 %5 %6 %7 %8 %9 > make.joal.all.win64.log 2>&1
|