Login | Register
My pages Projects Community openCollabNet

Discussions > cvs > CVS update: joist/build build-joist.sh build-joist.bat

Project highlights: Architectural Overview

joist
Discussion topic

Back to topic list

CVS update: joist/build build-joist.sh build-joist.bat

Author lucas
Full name Josh Lucas
Date 2000-10-17 19:13:23 PDT
Message User: lucas
  Date: 00/10/17 19:13:23

  Modified: build build-joist.sh build-joist.bat
  Log:
  Cleaned these up quite a bit...
  
  These will be the basis of future ant wrapper scripts.
  
  Revision Changes Path
  1.2 +2 -28 joist/build/build-joist.sh
  
  Index: build-joist.sh
  ====================​====================​====================​=======
  RCS file: /cvs/joist/build/bui​ld-joist.sh,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- build-joist.sh 2000/09/29 22:55:00 1.1
  +++ build-joist.sh 2000/10/18 02:13:22 1.2
  @@ -1,26 +1,5 @@
   #!/bin/sh
   
  -# --------------------​--------------------​-------------------
  -# The targets are the different build scripts.
  -# The default "jar" is suggested
  -# and does not require any external packages
  -#
  -# "compile" target builds Turbine core classes
  -# "clean" target #oves bin directory
  -# "jar" target builds "core" + jar file
  -# "javadocs" target builds the javadocs
  -# --------------------​--------------------​-------------------
  -TARGET=${1}
  -# TARGET=javadocs
  -# TARGET=compile
  -# TARGET=clean
  -# TARGET=jar
  -
  -#------------------​--------------------​--------------------​---------
  -# Define the paths to each of the packages
  -#------------------​--------------------​--------------------​---------
  -JSDK=/classes/JSDK2​.0/lib/jsdk.jar
  -
   #-------------------​--------------------​-----
   # No need to edit anything past here
   #-------------------​--------------------​-----
  @@ -31,10 +10,6 @@
       exit
   fi
   
  -if test -z "${TARGET}" ; then
  -TARGET=jar
  -fi
  -
   if test -f ${JAVA_HOME}/lib/tools.jar ; then
       CLASSPATH=${CLASSPA​TH}:${JAVA_HOME}/li​b/tools.jar
   fi
  @@ -48,8 +23,7 @@
   echo "Now building ${TARGET}..."
   
   
  -CP=${CLASSPATH}:${JSDK}
  -
   BUILDFILE=build-joist.xml
   
  -${JAVA_HOME}/bin/java -classpath ${CP} -DJAVAC=${JAVAC} org.apache.tools.ant.Main -buildfile ${BUILDFILE} ${TARGET}
  +${JAVA_HOME}/bin/java -DJAVAC=${JAVAC} org.apache.tools.ant.Main \
  + -buildfile ${BUILDFILE} "$@"
  
  
  
  1.2 +1 -33 joist/build/build-joist.bat
  
  Index: build-joist.bat
  ====================​====================​====================​=======
  RCS file: /cvs/joist/build/bui​ld-joist.bat,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- build-joist.bat 2000/09/29 22:55:00 1.1
  +++ build-joist.bat 2000/10/18 02:13:22 1.2
  @@ -1,38 +1,10 @@
   @echo off
   
  -REM --------------------​--------------------​-------------------
  -REM The targets are the different build scripts.
  -REM The default "jar" is suggested
  -REM and does not require any external packages
  -REM
  -REM "compile" target builds Turbine core classes
  -REM "clean" target removes bin directory
  -REM "jar" target builds "core" + jar file
  -REM "javadocs" target builds the javadocs
  -REM --------------------​--------------------​-------------------
  -set TARGET=%1%
  -REM set TARGET=javadocs
  -REM set TARGET=compile
  -REM set TARGET=clean
  -REM set TARGET=jar
  -
  -REM --------------------​--------------------​--------------------​-------
  -REM Define the paths to each of the packages.
  -REM --------------------​--------------------​--------------------​-------
  -set JSDK=C:\classes\js​dk2.0\lib\jsdk.jar​
  -
   REM --------------------​--------------------​----
   REM No need to edit anything past here
   REM --------------------​--------------------​----
   set BUILDFILE=build-joist.xml
   
  -if "%TARGET%" == "" goto setdist
  -goto final
  -
  -:setdist
  -set TARGET=jar
  -goto final
  -
   :final
   
   REM set JIKES to be non-null (eg set JIKES=Y) to use the jikes compiler -
  @@ -45,14 +17,10 @@
   if "%JAVA_HOME%" == "" goto javahomeerror
   if exist %JAVA_HOME%\lib\tools.jar set CLASSPATH=%CLASSPATH​%;%JAVA_HOME%\lib\​tools.jar
   
  -echo Now building %TARGET%...
  -REM we expect xerces-1.1.3.jar to be in the CP
  -set CP=%CLASSPATH%;%TOOL​S%;%JSDK%;ant.jar
  -
   echo Classpath: %CP%
   echo JAVA_HOME: %JAVA_HOME%
   
  -%JAVA_HOME%\bin\java.exe -classpath "%CP%" -DJAVAC=%JAVAC% org.apache.tools.ant.Main -buildfile %BUILDFILE% %TARGET%
  +%JAVA_HOME%\bin\java.exe -classpath "%CP%" -DJAVAC=%JAVAC% org.apache.tools.ant.Main -buildfile %BUILDFILE% %1 %2 %3 %4 %5 %6 %7 %8 %9
   
   goto end

« Previous message in topic | 1 of 1 | Next message in topic »

Messages

Show all messages in topic

CVS update: joist/build build-joist.sh build-joist.bat lucas Josh Lucas 2000-10-17 19:13:23 PDT
Messages per page: