EJBoss CVS Development wrote:
Jorgen,
>
> User: jorgen
> Date: 00/02/05 05:51:49
>
> Modified: build build.bat build.xml
> Log:
> Substitute appropriate version numbers for ejboss and jdk into runtime startup
>scripts.
> (It will prevent people forgetting to change the scripts when a new version is
>released!)
> NOTE: These changes have NOT been made in the UNIX .sh script files, and perhaps
>should be!
>
> Revision Changes Path
> 1.4 +7 -2 ejboss/build/build.bat
>
> Index: build.bat
> ===================================================================
> RCS file: /products/cvs/ejboss/ejboss/build/build.bat,v
> retrieving revision 1.3
> retrieving revision 1.4
> diff -u -r1.3 -r1.4
> --- build.bat 2000/02/02 08:48:48 1.3
> +++ build.bat 2000/02/05 13:51:48 1.4
> @@ -1,8 +1,14 @@
> @echo off
> +@if not "%ECHO%" == "" echo %ECHO%
> +@if "%OS%" == "Windows_NT" setlocal
>
> REM Choose you JDK
> REM
> -set JDK=1.3
> +REM This can either be done by setting the environment variable JDK
> +REM or by explicitly changing this script.
> +REM
> +if "%JDK%" == "" set JDK=1.3
> +REM set JDK=1.3
> REM set JDK=1.2.2
>
> REM -----------------------------------------------------------
> @@ -53,4 +59,3 @@
> echo "Classpath: %CP%"
>
> java -classpath %CP% -Djdk="%JDK%" org.apache.tools.ant.Main -buildfile
>%BUILDFILE% %TARGET%
> -"
>
>
>
> 1.9 +24 -0 ejboss/build/build.xml
>
> Index: build.xml
> ===================================================================
> RCS file: /products/cvs/ejboss/ejboss/build/build.xml,v
> retrieving revision 1.8
> retrieving revision 1.9
> diff -u -r1.8 -r1.9
> --- build.xml 2000/02/03 02:11:05 1.8
> +++ build.xml 2000/02/05 13:51:48 1.9
> @@ -118,6 +118,8 @@
>
> <mkdir dir="${final.dir}"/>
> <mkdir dir="${final.dir}/beans"/>
> + <!-- For generated proxy files when running with java 1.2 -->
> + <mkdir dir="${final.dir}/beans/generated"/>
Good call, that was probably what throwing us off before.
> <mkdir dir="${final.dir}/conf"/>
> <mkdir dir="${final.dir}/lib"/>
> <mkdir dir="${final.dir}/storage"/>
> @@ -126,6 +128,7 @@
> <jar jarfile="${final.dir}/lib/${final.name}.jar" basedir="${build.dest}"
>items="org"/>
>
> <!-- Copy the configurations -->
> + <!-- TODO: Shouldn't these two files really both be in to same conf
>directory? -->
> <copyfile src="conf/system.properties"
>dest="${final.dir}/conf/system.properties"/>
> <copyfile src="conf/jndi.properties" dest="${final.dir}/jndi.properties"/>
No, one is for the server, the system.properties (and it includes the
naming properties as well), the other one is a utility for clients to
connect from "anywhere". It is in the diretory where the client.bat and
.sh are.
>
> @@ -138,12 +141,33 @@
> <!-- The Executables -->
> <copydir src="src/scripts/run" dest="${final.dir}"/>
>
> + <!-- Substitute appropriate version numbers in script files -->
> + <!-- TODO: These substitutions also need to be made in the UNIX .sh script
>files! -->
will do, but now I have to take time off my saturday morning :-(
> +
> + <replace file="${final.dir}/server.bat"
> + token="PROD.VER"
> + value="${version}" />
> +
> + <replace file="${final.dir}/server.bat"
> + token="JDK.VER"
> + value="${jdk}" />
> +
> + <replace file="${final.dir}/client.bat"
> + token="PROD.VER"
> + value="${version}" />
> +
> + <replace file="${final.dir}/client.bat"
> + token="JDK.VER"
> + value="${jdk}" />
> +
> <!-- Miscellaneous files -->
> <copyfile src="AUTHORS" dest="${final.dir}/AUTHORS"/>
> <copyfile src="ChangeLog" dest="${final.dir}/ChangeLog"/>
> <copyfile src="COPYING" dest="${final.dir}/COPYING"/>
> <copyfile src="INSTALL" dest="${final.dir}/INSTALL"/>
> +<!-- README.txt is copied from the scripts/run directory instead.
> <copyfile src="README" dest="${final.dir}/README"/>
> +-->
Good call
>
>
>
>
>
>
--
--------------------------------------------------------------
To subscribe: [EMAIL PROTECTED]
To unsubscribe: [EMAIL PROTECTED]
Problems?: [EMAIL PROTECTED]
