tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mt...@apache.org
Subject cvs commit: jakarta-tomcat-5 tomcat.nsi build.xml
Date Wed, 07 Apr 2004 11:33:40 GMT
mturk       2004/04/07 04:33:40

  Modified:    .        tomcat.nsi build.xml
  Log:
  Use the new Procrun 2.0
  
  Revision  Changes    Path
  1.43      +20 -14    jakarta-tomcat-5/tomcat.nsi
  
  Index: tomcat.nsi
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-5/tomcat.nsi,v
  retrieving revision 1.42
  retrieving revision 1.43
  diff -u -r1.42 -r1.43
  --- tomcat.nsi	11 Feb 2004 12:54:30 -0000	1.42
  +++ tomcat.nsi	7 Apr 2004 11:33:40 -0000	1.43
  @@ -27,8 +27,8 @@
   ;Configuration
   
     !define MUI_FINISHPAGE_SHOWREADME "$INSTDIR\webapps\ROOT\RELEASE-NOTES.txt"
  -  !define MUI_FINISHPAGE_RUN $INSTDIR\bin\tomcatw.exe
  -  !define MUI_FINISHPAGE_RUN_PARAMETERS //GT//Tomcat5
  +  !define MUI_FINISHPAGE_RUN $INSTDIR\bin\tomcat5w.exe
  +  !define MUI_FINISHPAGE_RUN_PARAMETERS //MS//Tomcat5
     !define MUI_FINISHPAGE_NOREBOOTSUPPORT
   
     !define MUI_ABORTWARNING
  @@ -134,8 +134,14 @@
     ClearErrors
   
     Call configure
  +  Call findJavaPath
  +  Call findJVMPath
  +  Pop $2
   
  -  ExecWait '"$INSTDIR\bin\tomcatw.exe" //IS//Tomcat5 --DisplayName "Apache Tomcat" --Description
"Apache Tomcat @VERSION@ Server - http://jakarta.apache.org/tomcat/"  --Install "$INSTDIR\bin\tomcat.exe"
--ImagePath "$INSTDIR\bin\bootstrap.jar" --StartupClass org.apache.catalina.startup.Bootstrap;main;start
--ShutdownClass org.apache.catalina.startup.Bootstrap;main;stop --Java java --JavaOptions
-Xrs --Startup manual'
  +  DetailPrint "Using Jvm: $2"
  +
  +  nsExec::ExecToLog '"$INSTDIR\bin\tomcat5.exe" //IS//Tomcat5 --DisplayName "Apache Tomcat"
--Description "Apache Tomcat @VERSION@ Server - http://jakarta.apache.org/tomcat/" --LogPath
"$INSTDIR\logs" --Install "$INSTDIR\bin\tomcat5.exe" --Jvm "$2"'
  +  ClearErrors
   
   SectionEnd
   
  @@ -154,7 +160,7 @@
     Call findJVMPath
     Pop $2
   
  -  ExecWait '"$INSTDIR\bin\tomcatw.exe" //US//Tomcat5 --Startup auto'
  +  nsExec::ExecToLog '"$INSTDIR\bin\tomcat5.exe" //US//Tomcat5 --Startup auto'
   
     ClearErrors
   
  @@ -208,15 +214,15 @@
     CreateShortCut "$SMPROGRAMS\Apache Tomcat 5.0\Tomcat 5.0 Program Directory.lnk" \
                    "$INSTDIR"
   
  -  CreateShortCut "$SMPROGRAMS\Apache Tomcat 5.0\Start Tomcat.lnk" \
  -                 "$INSTDIR\bin\tomcatw.exe" \
  -                 '//GT//Tomcat5' \
  -                 "$INSTDIR\bin\tomcatw.exe" 1 SW_SHOWNORMAL
  +  CreateShortCut "$SMPROGRAMS\Apache Tomcat 5.0\Monitor Tomcat.lnk" \
  +                 "$INSTDIR\bin\tomcat5w.exe" \
  +                 '//MS//Tomcat5' \
  +                 "$INSTDIR\tomcat.ico" 0 SW_SHOWNORMAL
   
     CreateShortCut "$SMPROGRAMS\Apache Tomcat 5.0\Configure Tomcat.lnk" \
  -                 "$INSTDIR\bin\tomcatw.exe" \
  +                 "$INSTDIR\bin\tomcat5w.exe" \
                    '//ES//Tomcat5' \
  -                 "$INSTDIR\bin\tomcatw.exe" 0 SW_SHOWNORMAL
  +                 "$INSTDIR\tomcat.ico" 0 SW_SHOWNORMAL
   
   SectionEnd
   
  @@ -233,8 +239,8 @@
   SectionEnd
   
   Section -post
  -
  -  ExecWait '"$INSTDIR\bin\tomcatw.exe" //US//Tomcat5 --JavaOptions -Dcatalina.home="\"$INSTDIR\""#-Djava.endorsed.dirs="\"$INSTDIR\common\endorsed\""#-Xrs
--StdOutputFile "$INSTDIR\logs\stdout.log" --StdErrorFile "$INSTDIR\logs\stderr.log" --WorkingPath
"$INSTDIR"'
  +  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"
--StdOutput "$INSTDIR\logs\stdout.log" --StdError "$INSTDIR\logs\stderr.log"'
   
     WriteUninstaller "$INSTDIR\Uninstall.exe"
   
  @@ -496,7 +502,7 @@
     Delete "$INSTDIR\Uninstall.exe"
   
     ; Delete Tomcat service
  -  ExecWait '"$INSTDIR\bin\tomcatw.exe" //DS//Tomcat5'
  +  nsExec::ExecToLog '"$INSTDIR\bin\tomcat5.exe" //DS//Tomcat5'
     ClearErrors
   
     DeleteRegKey HKCR "JSPFile"
  
  
  
  1.183     +6 -4      jakarta-tomcat-5/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
  retrieving revision 1.182
  retrieving revision 1.183
  diff -u -r1.182 -r1.183
  --- build.xml	30 Mar 2004 14:48:54 -0000	1.182
  +++ build.xml	7 Apr 2004 11:33:40 -0000	1.183
  @@ -1287,10 +1287,11 @@
         <fileset dir="resources" />
       </copy>
       <copy file="${nsis.installoptions.dll}" todir="${tomcat.dist}" />
  -    <copy file="${jtc.home}/procrun/bin/tomcat.exe" 
  -        tofile="${tomcat.dist}/bin/tomcat.exe" />
  -    <copy file="${jtc.home}/procrun/bin/tomcatw.exe" 
  -        tofile="${tomcat.dist}/bin/tomcatw.exe" />
  +    <copy file="${nsis.nsexec.dll}" todir="${tomcat.dist}" />
  +    <copy file="${jtc.home}/procrun/bin/tomcat5.exe" 
  +        tofile="${tomcat.dist}/bin/tomcat5.exe" />
  +    <copy file="${jtc.home}/procrun/bin/tomcat5w.exe" 
  +        tofile="${tomcat.dist}/bin/tomcat5w.exe" />
       <filter token="VERSION" value="${version}"/>
       <copy file="tomcat.nsi" tofile="${tomcat.dist}/tomcat.nsi" 
        filtering="true"/>
  @@ -1399,6 +1400,7 @@
           <os family="windows" />
           <available file="${nsis.exe}" />
           <available file="${nsis.installoptions.dll}" />
  +        <available file="${nsis.nsexec.dll}" />
         </and>
       </condition>
   
  
  
  

---------------------------------------------------------------------
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