[MOBY-guts] biomoby commit

senger at ebi.ac.uk senger at pub.open-bio.org
Thu Sep 25 06:43:42 EDT 2003


senger
Thu Sep 25 05:43:42 EDT 2003
Update of /home/repository/moby/moby-live/Java
In directory pub.open-bio.org:/tmp/cvs-serv10948/Java

Modified Files:
	build-dev.bat build.bat 
Log Message:
Windows bat files updated - oh my god, I did this first time in my life!

moby-live/Java build-dev.bat,1.1,1.2 build.bat,1.1,1.2
===================================================================
RCS file: /home/repository/moby/moby-live/Java/build-dev.bat,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- /home/repository/moby/moby-live/Java/build-dev.bat	2003/09/24 12:33:47	1.1
+++ /home/repository/moby/moby-live/Java/build-dev.bat	2003/09/25 09:43:42	1.2
@@ -1,47 +1,49 @@
- at echo off
-REM $Id$
-
-REM Set the local environment
-REM Edit the following values according to your environment
-REM -------------------------------------------------------
-
-set JAVA_HOME=\development\jdk
-set ANT_HOME=\development\ant
-
-REM Remove the line below if you want to use a classic Java compiler
-set USE_JIKES=1
-
-
-REM (as defined in a separate file)  ... !!! work in progress !!!
-REM -------------------------------
-REM if exist setenv.bat goto next1
-REM echo ===========================================================
-REM echo Cannot find file 'setenv.bat' for setting your environment.
-REM echo Please create it from 'setenv.bat.template' and edit it in
-REM echo order to reflect your local environment.
-REM echo ==========================================================
-REM goto end
-REM :next1
-REM call setenv.bat
-
-REM What compiler to use
-REM --------------------
-if "%USE_JIKES%"=="" goto classic
-set COMPILER=-Dbuild.compiler=jikes
-goto next
-:classic
-set COMPILER=-Dbuild.compiler=classic
-:next
-
-REM Put Ant libraries in CLASSPATH
-REM ------------------------------
-set CP=
-for %%i in (%ANT_HOME%\lib\*.jar) do call cp.bat %%i
-set CP=%JAVA_HOME%\lib\tools.jar;%CP%
-
-REM Call Ant to do the building
-REM ---------------------------
-set JAVA=%JAVA_HOME%\bin\java
-
-%JAVA% -classpath %CP% %COMPILER% -Dant.home=%ANT_HOME% org.apache.tools.ant.Main %1 %2 %3 %4 %5 %6 %7 %8 %9 -buildfile build.xml
-
+ at echo off
+REM $Id$
+
+REM See comments in build-dev.sh.
+REM ALSO: I do not understand Windows and do not develop on this platform.
+REM       Therefore, any improvements of this script are welcome.
+REM       Please do not hesitate a contact Martin Senger <senger at ebi.ac.uk>
+
+REM Set-up JAVA_HOME
+REM ----------------
+
+if NOT "%JAVA_HOME%"=="" goto javadone
+echo =======================================================
+echo Setup the JAVA_HOME environment variable.
+echo Hint (for XP): Click Start -- Control Panel -- System.
+echo Then click Advanced, then click "Environment Variables".
+echo ========================================================
+goto end
+:javadone
+
+REM Set-up and check ANT_HOME
+REM -------------------------
+if NOT "%ANT_HOME%"=="" goto antdone
+set ANT_HOME=.\lib\ant_home
+:antdone
+
+REM What compiler to use
+REM --------------------
+if "%USE_JIKES%"=="" goto classic
+set COMPILER=-Dbuild.compiler=jikes
+goto compilerdone
+:classic
+set COMPILER=
+:compilerdone
+
+REM Put Ant libraries in CLASSPATH
+REM ------------------------------
+set CP=
+for %%i in (%ANT_HOME%\lib\*.jar) do call cp.bat %%i
+set CP=%JAVA_HOME%\lib\tools.jar;%CP%
+
+REM Call Ant to do the building
+REM ---------------------------
+set JAVA=%JAVA_HOME%\bin\java
+%JAVA% -classpath %CP% %COMPILER% -Dant.home=%ANT_HOME% org.apache.tools.ant.Main %1 %2 %3 %4 %5 %6 %7 %8 %9 -buildfile build.xml
+
+:end
+
+

===================================================================
RCS file: /home/repository/moby/moby-live/Java/build.bat,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- /home/repository/moby/moby-live/Java/build.bat	2003/09/24 12:33:47	1.1
+++ /home/repository/moby/moby-live/Java/build.bat	2003/09/25 09:43:42	1.2
@@ -1,55 +1,49 @@
- at echo off
-
-REM  You *can* use this script to compile everything anytime,
-REM  but you *must* use it the first time (because it gathers
-REM  all third-party libraries needed for compilation).
-REM  Otherwise you *may* use build-dev.bat which is slightly
-REM  faster because it does not attemp to fetch libraries.
-
-REM  $Id$
-
-REM Set the local environment
-
-REM Edit the following values according to your environment
-REM -------------------------------------------------------
-
-set JAVA_HOME=\development\jdk
-set ANT_HOME=\development\ant
-
-REM Remove the line below if you want to use a classic Java compiler
-set USE_JIKES=1
-
-
-REM (as defined in a separate file)  ... !!! work in progress !!!
-REM -------------------------------
-REM if exist setenv.bat goto next1
-REM echo ===========================================================
-REM echo Cannot find file 'setenv.bat' for setting your environment.
-REM echo Please create it from 'setenv.bat.template' and edit it in
-REM echo order to reflect your local environment.
-REM echo ==========================================================
-REM goto end
-REM :next1
-REM call setenv.bat
-
-REM What compiler to use
-REM --------------------
-if "%USE_JIKES%"=="" goto classic
-set COMPILER=-Dbuild.compiler=jikes
-goto next
-:classic
-set COMPILER=-Dbuild.compiler=classic
-:next
-
-REM Put Ant libraries in CLASSPATH
-REM ------------------------------
-set CP=
-for %%i in (%ANT_HOME%\lib\*.jar) do call cp.bat %%i
-set CP=%JAVA_HOME%\lib\tools.jar;%CP%
-
-REM Call Ant to do the building
-REM ---------------------------
-set JAVA=%JAVA_HOME%\bin\java
-
-%JAVA% -classpath %CP% -Dant.home=%ANT_HOME% org.apache.tools.ant.Main -buildfile build.xml gather
-%JAVA% -classpath %CP% %COMPILER% -Dant.home=%ANT_HOME% org.apache.tools.ant.Main %1 %2 %3 %4 %5 %6 %7 %8 %9 -buildfile build.xml
+ at echo off
+REM  $Id$
+
+REM See comments in build.sh.
+REM ALSO: I do not understand Windows and do not develop on this platform.
+REM       Therefore, any improvements of this script are welcome.
+REM       Please do not hesitate a contact Martin Senger <senger at ebi.ac.uk>
+
+REM Set-up JAVA_HOME
+REM ----------------
+REM Example: set JAVA_HOME=\development\jdk
+
+if NOT "%JAVA_HOME%"=="" goto javadone
+echo =======================================================
+echo Setup the JAVA_HOME environment variable.
+echo Hint (for XP): Click Start -- Control Panel -- System.
+echo Then click Advanced, then click "Environment Variables".
+echo ========================================================
+goto end
+:javadone
+
+REM Set-up and check ANT_HOME
+REM -------------------------
+if NOT "%ANT_HOME%"=="" goto antdone
+set ANT_HOME=.\lib\ant_home
+:antdone
+
+REM What compiler to use
+REM --------------------
+if "%USE_JIKES%"=="" goto classic
+set COMPILER=-Dbuild.compiler=jikes
+goto compilerdone
+:classic
+set COMPILER=
+:compilerdone
+
+REM Put Ant libraries in CLASSPATH
+REM ------------------------------
+set CP=
+for %%i in (%ANT_HOME%\lib\*.jar) do call cp.bat %%i
+set CP=%JAVA_HOME%\lib\tools.jar;%CP%
+
+REM Call Ant to do the building
+REM ---------------------------
+set JAVA=%JAVA_HOME%\bin\java
+%JAVA% -classpath %CP% -Dant.home=%ANT_HOME% org.apache.tools.ant.Main -buildfile build.xml gather
+%JAVA% -classpath %CP% %COMPILER% -Dant.home=%ANT_HOME% org.apache.tools.ant.Main %1 %2 %3 %4 %5 %6 %7 %8 %9 -buildfile build.xml
+
+:end



More information about the MOBY-guts mailing list