tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r...@apache.org
Subject cvs commit: jakarta-tomcat-5 build.xml tomcat.nsi
Date Thu, 02 Sep 2004 13:16:52 GMT
remm        2004/09/02 06:16:52

  Modified:    .        build.xml tomcat.nsi
  Log:
  - Add jmx and xerces before running tester.
  - Remove useless stuff in installer: tools.jar and the JDK path are now useless. My Java
detection code, which has always been soso, needs
    to be updated: I have JDK 1.4, JDK 5 and JRE 5, and the thing preselects JDK 1.4 (the
worst default) ;)
  
  Revision  Changes    Path
  1.207     +5 -0      jakarta-tomcat-5/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
  retrieving revision 1.206
  retrieving revision 1.207
  diff -u -r1.206 -r1.207
  --- build.xml	2 Sep 2004 00:47:50 -0000	1.206
  +++ build.xml	2 Sep 2004 13:16:52 -0000	1.207
  @@ -1135,6 +1135,11 @@
     <target name="run-tester"
      description="Catalina Tests" depends="dist-tester">
   
  +  	<!-- For Java 1.4 -->
  +  	<copy file="${jmx.jar}" tofile="${tomcat.build}/bin/jmx.jar" />
  +    <copy todir="${tomcat.build}/common/endorsed" file="${xercesImpl.jar}"/>
  +    <copy todir="${tomcat.build}/common/endorsed" file="${xml-apis.jar}"/>
  +  	
       <parallel>
   
           <java classname="LauncherBootstrap" fork="yes">
  
  
  
  1.54      +9 -19     jakarta-tomcat-5/tomcat.nsi
  
  Index: tomcat.nsi
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-5/tomcat.nsi,v
  retrieving revision 1.53
  retrieving revision 1.54
  diff -u -r1.53 -r1.54
  --- tomcat.nsi	2 Sep 2004 10:07:02 -0000	1.53
  +++ tomcat.nsi	2 Sep 2004 13:16:52 -0000	1.54
  @@ -24,12 +24,12 @@
   !include "MUI.nsh"
   !include "StrFunc.nsh"
   ${StrRep}
  -  Var "JavaHome"
  +  Var "JavaHome"
   
   ;--------------------------------
   ;Configuration
   
  -  !define MUI_WELCOMEFINISHPAGE_BITMAP side_left.bmp 
  +  !define MUI_WELCOMEFINISHPAGE_BITMAP side_left.bmp 
     !define MUI_FINISHPAGE_SHOWREADME "$INSTDIR\webapps\ROOT\RELEASE-NOTES.txt"
     !define MUI_FINISHPAGE_RUN $INSTDIR\bin\tomcat5w.exe
     !define MUI_FINISHPAGE_RUN_PARAMETERS //MS//Tomcat5
  @@ -70,7 +70,7 @@
     !insertmacro MUI_UNPAGE_INSTFILES
   
     ;License dialog
  -  LicenseData License.rtf
  +  LicenseData License.rtf
   
     ;Component-selection page
       ;Descriptions
  @@ -138,16 +138,6 @@
     SetOutPath $INSTDIR\conf\Catalina\localhost
     File conf\Catalina\localhost\manager.xml
   
  -  IfSilent 0 +3
  -  Call findJavaPath
  -  Pop $2
  -
  -  IfSilent +2 0
  -  !insertmacro MUI_INSTALLOPTIONS_READ $2 "jvm.ini" "Field 2" "State"
  -
  -;  CopyFiles /SILENT "$2\lib\tools.jar" "$INSTDIR\common\lib" 4500
  -  ClearErrors
  -
     Call configure
     Call findJavaPath
     Pop $2
  @@ -155,7 +145,7 @@
     IfSilent +2 0
     !insertmacro MUI_INSTALLOPTIONS_READ $2 "jvm.ini" "Field 2" "State"
   
  -  StrCpy "$JavaHome" $2
  +  StrCpy "$JavaHome" $2
     Push $2
     Call findJVMPath
     Pop $2
  @@ -178,7 +168,7 @@
     IfSilent +2 0
     !insertmacro MUI_INSTALLOPTIONS_READ $2 "jvm.ini" "Field 2" "State"
   
  -  StrCpy "$JavaHome" $2
  +  StrCpy "$JavaHome" $2
     Push $2
     Call findJVMPath
     Pop $2
  @@ -282,8 +272,8 @@
   SectionEnd
   
   Section -post
  -  nsExec::ExecToLog '"$INSTDIR\bin\tomcat5.exe" //US//Tomcat5 --Classpath "$JavaHome\lib\tools.jar;$INSTDIR\bin\bootstrap.jar"
--StartClass org.apache.catalina.startup.Bootstrap --StopClass org.apache.catalina.startup.Bootstrap
--StartParams start --StopParams stop  --StartMode jvm --StopMode jvm'
  -  nsExec::ExecToLog '"$INSTDIR\bin\tomcat5.exe" //US//Tomcat5 --JvmOptions "-Dcatalina.home=$INSTDIR#-Djava.endorsed.dirs=$INSTDIR\common\endorsed#-Djava.io.tmpdir=$INSTDIR\temp"
--StdOutput "$INSTDIR\logs\stdout.log" --StdError "$INSTDIR\logs\stderr.log"'
  +  nsExec::ExecToLog '"$INSTDIR\bin\tomcat5.exe" //US//Tomcat5 --Classpath ";$INSTDIR\bin\bootstrap.jar"
--StartClass org.apache.catalina.startup.Bootstrap --StopClass org.apache.catalina.startup.Bootstrap
--StartParams start --StopParams stop  --StartMode jvm --StopMode jvm'
  +  nsExec::ExecToLog '"$INSTDIR\bin\tomcat5.exe" //US//Tomcat5 --JvmOptions "-Dcatalina.home=$INSTDIR#-Djava.endorsed.dirs=$INSTDIR\common\endorsed#-Djava.io.tmpdir=$INSTDIR\temp"
--StdOutput "$INSTDIR\logs\stdout.log" --StdError "$INSTDIR\logs\stderr.log"'
   
     WriteUninstaller "$INSTDIR\Uninstall.exe"
   
  @@ -433,7 +423,7 @@
     MessageBox MB_OK "No Java Virtual Machine found."
     Quit
   NoErrors1:
  -  StrCpy "$JavaHome" $3
  +  StrCpy "$JavaHome" $3
     Push $3
     Call findJVMPath
     Pop $4
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org


Mime
View raw message