cvs commit: jakarta-tomcat-5 build.xml tomcat.nsi

[remm]

remm2005/03/03 07:13:39

  Modified:catalina/src/bin catalina.bat catalina.sh
   .build.xml tomcat.nsi
  Log:
  - Add some script magic for Juli.
  
  Revision  ChangesPath
  1.12  +5 -1  jakarta-tomcat-catalina/catalina/src/bin/catalina.bat
  
  Index: catalina.bat
  ===
  RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/bin/catalina.bat,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- catalina.bat  23 Sep 2004 20:14:48 -  1.11
  +++ catalina.bat  3 Mar 2005 15:13:39 -   1.12
  @@ -77,6 +77,10 @@
   set CATALINA_TMPDIR=%CATALINA_BASE%\temp
   :gotTmpdir
   
  +if not exist "%CATALINA_HOME%\bin\tomcat-juli.jar" goto noJuli
  +set JAVA_OPTS=%JAVA_OPTS% 
-Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager
  +:noJuli
  +
   rem - Execute The Requested Command 
---
   
   echo Using CATALINA_BASE:   %CATALINA_BASE%
  
  
  
  1.19  +6 -1  jakarta-tomcat-catalina/catalina/src/bin/catalina.sh
  
  Index: catalina.sh
  ===
  RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/bin/catalina.sh,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- catalina.sh   10 Jan 2005 18:16:10 -  1.18
  +++ catalina.sh   3 Mar 2005 15:13:39 -   1.19
  @@ -114,6 +114,11 @@
 fi
   fi
   
  +# Set juli LogManager if it is present
  +if [ -r "$CATALINA_HOME"/bin/tomcat-juli.jar ]; then
  +  JAVA_OPTS="$JAVA_OPTS 
"-Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager
  +fi
  +
   # Add on extra jar files to CLASSPATH
   if [ -n "$JSSE_HOME" ]; then
 
CLASSPATH="$CLASSPATH":"$JSSE_HOME"/lib/jcert.jar:"$JSSE_HOME"/lib/jnet.jar:"$JSSE_HOME"/lib/jsse.jar
  
  
  
  1.226 +0 -1  jakarta-tomcat-5/build.xml
  
  Index: build.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
  retrieving revision 1.225
  retrieving revision 1.226
  diff -u -r1.225 -r1.226
  --- build.xml 3 Mar 2005 13:34:17 -   1.225
  +++ build.xml 3 Mar 2005 15:13:39 -   1.226
  @@ -1229,7 +1229,6 @@



  - 
 
   
   
  
  
  
  1.70  +3 -2  jakarta-tomcat-5/tomcat.nsi
  
  Index: tomcat.nsi
  ===
  RCS file: /home/cvs/jakarta-tomcat-5/tomcat.nsi,v
  retrieving revision 1.69
  retrieving revision 1.70
  diff -u -r1.69 -r1.70
  --- tomcat.nsi15 Feb 2005 15:32:32 -  1.69
  +++ tomcat.nsi3 Mar 2005 15:13:39 -   1.70
  @@ -131,6 +131,7 @@
 SetOutPath $INSTDIR\bin
 File bin\bootstrap.jar
 File bin\commons-logging-api.jar
  +  File bin\tomcat-juli.jar
 File bin\*.exe
 SetOutPath $INSTDIR\conf
 File conf\*.*
  @@ -307,7 +308,7 @@
   
   Section -post
 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 auto --StdError auto'
  +  nsExec::ExecToLog '"$INSTDIR\bin\tomcat5.exe" //US//Tomcat5 --JvmOptions 
"-Dcatalina.home=$INSTDIR#-Djava.endorsed.dirs=$INSTDIR\common\endorsed#-Djava.io.tmpdir=$INSTDIR\temp#-Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager"
 --StdOutput auto --StdError auto'
   
 WriteUninstaller "$INSTDIR\Uninstall.exe"
   
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Re: cvs commit: jakarta-tomcat-5 build.xml tomcat.nsi

[Mladen Turk]

Remy Maucherat wrote:
Does it mean that the classloader is taking care of that?

Well, there's a Java compiler bundled, so tools.jar is not needed (and 
Tomcat can now use a JRE).

Wow, I'll try it then with the fresh 1.5.0-RC released today :).
Regards,
MT.


smime.p7s
Description: S/MIME Cryptographic Signature

Re: cvs commit: jakarta-tomcat-5 build.xml tomcat.nsi

[Remy Maucherat]

Mladen Turk wrote:
[EMAIL PROTECTED] wrote:
  - Remove useless stuff in installer: tools.jar and the JDK path are 
now useless.

Does it mean that the classloader is taking care of that?
Well, there's a Java compiler bundled, so tools.jar is not needed (and 
Tomcat can now use a JRE).

Does 5_0 branch still needs the tools.jar?
Yes.
Rémy
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Re: cvs commit: jakarta-tomcat-5 build.xml tomcat.nsi

[Mladen Turk]

[EMAIL PROTECTED] wrote:
  - Remove useless stuff in installer: tools.jar and the JDK path are now useless.
Does it mean that the classloader is taking care of that?
Does 5_0 branch still needs the tools.jar?
Regards,
MT.


smime.p7s
Description: S/MIME Cryptographic Signature

cvs commit: jakarta-tomcat-5 build.xml tomcat.nsi

[remm]

remm2004/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  ChangesPath
  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 -   1.206
  +++ build.xml 2 Sep 2004 13:16:52 -   1.207
  @@ -1135,6 +1135,11 @@
 
   
  + 
  + 
  +
  +
  + 
   
   
   
  
  
  
  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.nsi2 Sep 2004 10:07:02 -   1.53
  +++ tomcat.nsi2 Sep 2004 13:16:52 -   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: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: jakarta-tomcat-5 build.xml tomcat.nsi

[markt]

markt   2004/02/01 10:27:28

  Modified:.build.xml tomcat.nsi
  Log:
  - Update build process to include WebDAV servlet.
  
  Revision  ChangesPath
  1.176 +4 -0  jakarta-tomcat-5/build.xml
  
  Index: build.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
  retrieving revision 1.175
  retrieving revision 1.176
  diff -u -r1.175 -r1.176
  --- build.xml 31 Jan 2004 03:55:54 -  1.175
  +++ build.xml 1 Feb 2004 18:27:28 -   1.176
  @@ -561,6 +561,10 @@
   
   
   
  +
  +
  +
  +
   

   
  
  
  
  1.41  +3 -1  jakarta-tomcat-5/tomcat.nsi
  
  Index: tomcat.nsi
  ===
  RCS file: /home/cvs/jakarta-tomcat-5/tomcat.nsi,v
  retrieving revision 1.40
  retrieving revision 1.41
  diff -u -r1.40 -r1.41
  --- tomcat.nsi27 Dec 2003 17:32:23 -  1.40
  +++ tomcat.nsi1 Feb 2004 18:27:28 -   1.41
  @@ -215,6 +215,7 @@
 SetOutPath $INSTDIR\webapps
 File /r webapps\jsp-examples
 File /r webapps\servlets-examples
  +  File /r webapps\webdav
   
   SectionEnd
   
  @@ -493,6 +494,7 @@
 RMDir /r "$INSTDIR\webapps\tomcat-docs"
 RMDir /r "$INSTDIR\webapps\servlets-examples"
 RMDir /r "$INSTDIR\webapps\jsp-examples"
  +  RMDir /r "$INSTDIR\webapps\webdav"
 RMDir "$INSTDIR\webapps"
 RMDir /r "$INSTDIR\work"
 RMDir /r "$INSTDIR\temp"
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: jakarta-tomcat-5 build.xml tomcat.nsi

[remm]

remm2002/10/28 07:53:33

  Modified:.build.xml tomcat.nsi
  Log:
  - Cleanup installoptions support.
  - Update to NSIS nightly.
  
  Revision  ChangesPath
  1.52  +3 -2  jakarta-tomcat-5/build.xml
  
  Index: build.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
  retrieving revision 1.51
  retrieving revision 1.52
  diff -u -r1.51 -r1.52
  --- build.xml 26 Oct 2002 18:52:56 -  1.51
  +++ build.xml 28 Oct 2002 15:53:33 -  1.52
  @@ -508,8 +508,9 @@
   
   
 
  -
  -
  +
  +
  +
   
 
   
  
  
  
  1.11  +61 -86jakarta-tomcat-5/tomcat.nsi
  
  Index: tomcat.nsi
  ===
  RCS file: /home/cvs/jakarta-tomcat-5/tomcat.nsi,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- tomcat.nsi26 Oct 2002 14:20:47 -  1.10
  +++ tomcat.nsi28 Oct 2002 15:53:33 -  1.11
  @@ -5,22 +5,27 @@
   !define NAME "Apache Tomcat"
   !define VERSION "@VERSION@"
   
  -!verbose 3
  -  !include "${NSISDIR}\Contrib\Modern UI\System.nsh"
  -!verbose 4
  +!include "${NSISDIR}\Contrib\Modern UI\System.nsh"
   
   ;
   ;Configuration
   
  +  !define MUI_INSTALLOPTIONS
  +
 !define MUI_LICENSEPAGE
 !define MUI_COMPONENTPAGE
 !define MUI_DIRSELECTPAGE
  +  !define MUI_INSTALLBUTTONTEXT_NEXT
  +  !define MUI_ABORTWARNING
 !define MUI_UNINSTALLER
   
  +  !define MUI_SETPAGE_FUNCTIONNAME "SetPage"
  +  !define MUI_UNSETPAGE_FUNCTIONNAME "un.SetPage"
  +
 ;Language
   ;English
   LoadLanguageFile "${NSISDIR}\Contrib\Language files\English.nlf"
  -!include "${NSISDIR}\Contrib\Modern UI\English.nsh"
  +!include "${NSISDIR}\Contrib\Modern UI\Language files\English.nsh"
   
 ;General
 Name "${NAME} ${VERSION}"
  @@ -33,7 +38,8 @@
 SetCompressor bzip2
 SetDatablockOptimize on
   
  -  !insertmacro MUI_INTERFACE "modern.exe" "adni18-installer-C-no48xp.ico" 
"adni18-uninstall-C-no48xp.ico" "modern.bmp" "smooth" "$9"
  +  !insertmacro MUI_INTERFACE
  +  !insertmacro MUI_INSTALLOPTIONS "$7" "$8"
   
 ;License dialog
 LicenseData INSTALLLICENSE
  @@ -49,6 +55,9 @@
 ; Main registry key
 InstallDirRegKey HKLM "SOFTWARE\Apache Group\Tomcat\5.0" ""
   
  +  ReserveFile "${NSISDIR}\Plugins\InstallOptions.dll"
  +  ReserveFile "config.ini"
  +
   SubSection "Tomcat" SecTomcat
   
   Section "Core" SecTomcatCore
  @@ -77,6 +86,8 @@
 CopyFiles "$2\lib\tools.jar" "$INSTDIR\common\lib" 4500
 BringToFront
   
  +  Call configure
  +
   SectionEnd
   
   Section "Service" SecTomcatService
  @@ -110,15 +121,6 @@
 SetOutPath $INSTDIR\webapps
 File /r webapps\tomcat-docs
   
  -  IfFileExists "$SMPROGRAMS\Apache Tomcat 5.0" 0 NoLinks
  -
  -  SetOutPath "$SMPROGRAMS\Apache Tomcat 5.0"
  -
  -  CreateShortCut "$SMPROGRAMS\Apache Tomcat 5.0\Tomcat Documentation.lnk" \
  - "$INSTDIR\webapps\tomcat-docs\index.html"
  -
  - NoLinks:
  -
   SectionEnd
   
   SubSectionEnd
  @@ -135,6 +137,19 @@
 CreateShortCut "$SMPROGRAMS\Apache Tomcat 5.0\Tomcat Home Page.lnk" \
"http://jakarta.apache.org/tomcat";
   
  +  CreateShortCut "$SMPROGRAMS\Apache Tomcat 5.0\Welcome.lnk" \
  + "http://127.0.0.1:$R0/";
  +
  +  CreateShortCut "$SMPROGRAMS\Apache Tomcat 5.0\Tomcat Administration.lnk" \
  + "http://127.0.0.1:$R0/admin/";
  +
  +  IfFileExists "$INSTDIR\webapps\webapps\tomcat-docs" 0 NoDocumentaion
  +
  +  CreateShortCut "$SMPROGRAMS\Apache Tomcat 5.0\Tomcat Documentation.lnk" \
  + "$INSTDIR\webapps\tomcat-docs\index.html"
  +
  +NoDocumentaion:
  +
 CreateShortCut "$SMPROGRAMS\Apache Tomcat 5.0\Uninstall Tomcat 5.0.lnk" \
"$INSTDIR\Uninstall.exe"
   
  @@ -164,9 +179,14 @@
   
   SectionEnd
   
  -Section -post
  +Section ""
  +
  +  ;Invisible section to display the Finish header
  +  !insertmacro MUI_FINISHHEADER
   
  -  !insertmacro MUI_FINISHHEADER SetPage
  +SectionEnd
  +
  +Section -post
   
 WriteUninstaller "$INSTDIR\Uninstall.exe"
   
  @@ -186,6 +206,8 @@
   
   Function .onInit
   
  +  !insertmacro MUI_INSTALLOPTIONS_EXTRACT "config.ini"
  +
 ClearErrors
   
 Call findJavaPath
  @@ -225,13 +247,15 @@
   
   Function .onNextPage
   
  -  !insertmacro MUI_NEXTPAGE SetPage
  +  !insertmacro MUI_INSTALLOPTIONS_NEXTPAGE
  +  !insertmacro MUI_NEXTPAGE
   
   FunctionEnd
   
   Function .onPrevPage
   
  -  !insertmacro MUI_PREVPAGE SetPage
  +  !insertmacro MUI_INSTALLOPTIONS_PREVPAGE
  +  !insertmacro MUI_PREVPAGE
   
   FunctionEnd
   
  @@ -252,12 +276,18 @@
  !insertmacro MUI_PAGE_STOP 3
   
   !insertmacro MUI_PAGE_START 4
  -  !insertmacro MUI_HEADER_TEXT $(MUI_TEXT_INSTALLING_TITLE) 
$(MU

cvs commit: jakarta-tomcat-5 build.xml tomcat.nsi

[remm]

remm2002/10/08 02:36:39

  Modified:.build.xml tomcat.nsi
  Log:
  - Update to NSIS CVS.
  
  Revision  ChangesPath
  1.37  +0 -2  jakarta-tomcat-5/build.xml
  
  Index: build.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
  retrieving revision 1.36
  retrieving revision 1.37
  diff -u -r1.36 -r1.37
  --- build.xml 29 Sep 2002 15:08:22 -  1.36
  +++ build.xml 8 Oct 2002 09:36:39 -   1.37
  @@ -403,8 +403,6 @@
 
   
   
  -
   
   
   mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: 

cvs commit: jakarta-tomcat-5 build.xml tomcat.nsi

[remm]

remm2002/09/29 08:08:22

  Modified:.build.xml tomcat.nsi
  Log:
  - Beautify and cleanups.
  
  Revision  ChangesPath
  1.36  +2 -1  jakarta-tomcat-5/build.xml
  
  Index: build.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
  retrieving revision 1.35
  retrieving revision 1.36
  diff -u -r1.35 -r1.36
  --- build.xml 28 Sep 2002 13:47:43 -  1.35
  +++ build.xml 29 Sep 2002 15:08:22 -  1.36
  @@ -403,13 +403,14 @@
 
   
   
  -
   
   
   
   
  +  
 
   
   http://jakarta.apache.org/tomcat";
   
 CreateShortCut "$SMPROGRAMS\Apache Tomcat 5.0\Uninstall Tomcat 5.0.lnk" \
  - "$INSTDIR\uninst-tomcat4.exe"
  + "$INSTDIR\Uninstall.exe"
   
 CreateShortCut "$SMPROGRAMS\Apache Tomcat 5.0\Tomcat 5.0 Program Directory.lnk" \
"$INSTDIR"
  @@ -127,24 +150,7 @@
   
   SectionEnd
   
  -Section "Tomcat Documentation"
  -
  -  SectionIn 1 3
  -  SetOutPath $INSTDIR\webapps
  -  File /r webapps\tomcat-docs
  -
  -  IfFileExists "$SMPROGRAMS\Apache Tomcat 5.0" 0 NoLinks
  -
  -  SetOutPath "$SMPROGRAMS\Apache Tomcat 5.0"
  -
  -  CreateShortCut "$SMPROGRAMS\Apache Tomcat 5.0\Tomcat Documentation.lnk" \
  - "$INSTDIR\webapps\tomcat-docs\index.html"
  -
  - NoLinks:
  -
  -SectionEnd
  -
  -Section "Example Web Applications"
  +Section "Examples" SecExamples
   
 SectionIn 1 3
   
  @@ -155,15 +161,11 @@
   
   SectionEnd
   
  -Section "Tomcat Source Code"
  +Section -post
   
  -  SectionIn 3
  -  SetOutPath $INSTDIR
  -  File /r src
  +  !insertmacro MUI_FINISHHEADER SetPage
   
  -SectionEnd
  -
  -Section -post
  +  WriteUninstaller "$INSTDIR\Uninstall.exe"
   
 SetOverwrite off
 SetOutPath $INSTDIR
  @@ -171,15 +173,13 @@
   
 SetOverwrite on
   
  -  Call configure
  -
 Call startService
   
 WriteRegStr HKLM "SOFTWARE\Apache Group\Tomcat\5.0" "" $INSTDIR
 WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Apache 
Tomcat 5.0" \
  "DisplayName" "Apache Tomcat 5.0 (remove only)"
 WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Apache 
Tomcat 5.0" \
  -   "UninstallString" '"$INSTDIR\uninst-tomcat4.exe"'
  +   "UninstallString" '"$INSTDIR\Uninstall.exe"'
   
 Sleep 500
 BringToFront
  @@ -205,6 +205,96 @@
   FunctionEnd
   
   
  +Function .onInitDialog
  +
  +  !insertmacro MUI_INNERDIALOG_INIT
  +
  +!insertmacro MUI_INNERDIALOG_START 1
  +  !insertmacro MUI_INNERDIALOG_TEXT 1033 1040 "If you accept all the terms of 
the agreement, choose I Agree to continue. If you choose Cancel, Setup will close. You 
must accept the agreement to install ${NAME}."
  +!insertmacro MUI_INNERDIALOG_STOP 1
  +
  +!insertmacro MUI_INNERDIALOG_START 2
  +  !insertmacro MUI_INNERDIALOG_TEXT 1033 1042 "Description"
  +  !insertmacro MUI_INNERDIALOG_TEXT 1033 1043 "Hover your mouse over a 
component to see it's description."
  +!insertmacro MUI_INNERDIALOG_STOP 2
  +
  +!insertmacro MUI_INNERDIALOG_START 3
  +  !insertmacro MUI_INNERDIALOG_TEXT 1033 1041 "Destination Folder"
  +  !insertmacro MUI_INNERDIALOG_STOP 3
  +
  +  !insertmacro MUI_INNERDIALOG_END
  +
  +FunctionEnd
  +
  +Function .onNextPage
  +
  +  !insertmacro MUI_NEXTPAGE SetPage
  +
  +FunctionEnd
  +
  +Function .onPrevPage
  +
  +  !insertmacro MUI_PREVPAGE SetPage
  +
  +FunctionEnd
  +
  +Function SetPage
  +
  +  !insertmacro MUI_PAGE_INIT
  +
  +!insertmacro MUI_PAGE_START 1
  +   !insertmacro MUI_HEADER_TEXT 1033 "License Agreement" "Please review the 
license terms before installing ${NAME}."
  +!insertmacro MUI_PAGE_STOP 1
  +
  +!insertmacro MUI_PAGE_START 2
  +  !insertmacro MUI_HEADER_TEXT 1033 "Choose Components" "Choose the components 
you want to install."
  +!insertmacro MUI_PAGE_STOP 2
  +
  +!insertmacro MUI_PAGE_START 3
  +  !insertmacro MUI_HEADER_TEXT 1033 "Choose Install Location" "Choose the 
folder in which to install ${NAME}."
  +!insertmacro MUI_PAGE_STOP 3
  +
  +!insertmacro MUI_PAGE_START 4
  +  !insertmacro MUI_HEADER_TEXT 1033 "Installing" "Please wait while ${NAME} is 
being installed."
  +!insertmacro MUI_PAGE_STOP 4
  +
  +!insertmacro MUI_PAGE_START 5
  +  !insertmacro MUI_HEADER_TEXT 1033 "Configuration" "Tomcat basic 
configuration."
  +   Call configure
  +!insertmacro MUI_PAGE_STOP 5
  +
  +!insertmacro MUI_PAGE_START 6
  +  !insertmacro MUI_HEADER_TEXT 1033 "Finished" "Setup was completed 
successfully."
  +!insertmacro MUI_PAGE_STOP 6
  +
  +  !insertmacro MUI_PAGE_END
  +
  +FunctionEnd
  +
  +Function .onMouseOverSection
  +
  +  !insertmacro MUI_DESCRIPTION_INIT
  +
  +!insertmacro MUI_DESCRIPTION_TEXT 1033 ${SecTomcat} "Install 

cvs commit: jakarta-tomcat-5 build.xml tomcat.nsi

[remm]

remm2002/09/28 06:47:43

  Modified:.build.xml tomcat.nsi
  Log:
  - Fix and unify source package.
  - Update installer script.
  
  Revision  ChangesPath
  1.35  +70 -65jakarta-tomcat-5/build.xml
  
  Index: build.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
  retrieving revision 1.34
  retrieving revision 1.35
  diff -u -r1.34 -r1.35
  --- build.xml 18 Sep 2002 13:03:36 -  1.34
  +++ build.xml 28 Sep 2002 13:47:43 -  1.35
  @@ -16,19 +16,25 @@
 
 
 
  +
  +  
  +  
  +  
  +  
 
  -  
  -  
  +  
   
 
 
  -  
  +   value="${basedir}/../${api.project}"/>
  +  
 
  +   value="${basedir}/../${jasper.project}/jasper2"/>
 
  +   value="${basedir}/../${jtc.project}"/>
  +  
   
 
 
  @@ -322,31 +328,60 @@
   
 
 
  +
   
  -
  +
  +
  +
  +
  +
  +
  +
  +
  +
 
   
   
  -
   
 
   
  -
  -
  -  
  -
  -
  -
  -  
  +
  +
  +
  +  
  +
  +
  +
  +
  +
  +  
  +
  +
  +
  +
  +  
  +
  +
  +  
   
  -
  -
  +
  +
  +
  +  
  +
  +
  +  
  +
  +
  +
  +
 
   
   
   
   
  -
  +
  +
   
 
   
  @@ -487,11 +522,6 @@
   
 
   
  -
  -
  -  
  -
 
   
 
  @@ -505,55 +535,30 @@
   
   
  +  
  +
  +
  +
  +
  +
  +
  +
  +  
 
   
  +
  +
  +
  +
  +
  +
  +
 
   
   
   
   
  -
  -
  -
  -  
  -
  -  
  -
  -
  -
  -
  -  
  -
  -
  -
  -
  -
  -
  -
  -
  -
  -
  -  
  -  
  -
  -
  -
  -
  -
  -
  -
  -
  -
  -
  -
  -  
  -
  -
  -
  -
 
   
 
  
  
  
  1.6   +8 -13 jakarta-tomcat-5/tomcat.nsi
  
  Index: tomcat.nsi
  ===
  RCS file: /home/cvs/jakarta-tomcat-5/tomcat.nsi,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- tomcat.nsi18 Sep 2002 13:03:36 -  1.5
  +++ tomcat.nsi28 Sep 2002 13:47:43 -  1.6
  @@ -148,13 +148,10 @@
   
 SectionIn 1 3
   
  -  SetOverwrite off
  -  SetOutPath $INSTDIR\conf
  -  File conf\server.xml
 SetOverwrite on
 SetOutPath $INSTDIR\webapps
  -;*** TEMP
  -;  File /r webapps\examples
  +  File webapps\jsp-examples.war
  +  File webapps\servlets-examples.war
   
   SectionEnd
   
  @@ -163,15 +160,12 @@
 SectionIn 3
 SetOutPath $INSTDIR
 File /r src
  -  File /r jtc-src
   
   SectionEnd
   
   Section -post
   
 SetOverwrite off
  -  SetOutPath $INSTDIR\conf
  -  File /oname=server.xml conf\server-noexamples.xml.config
 SetOutPath $INSTDIR
 File /r conf
   
  @@ -471,16 +465,17 @@
 RMDir /r "$INSTDIR\shared"
 RMDir "$INSTDIR\logs"
 RMDir /r "$INSTDIR\server"
  -  RMDir "$INSTDIR\webapps\*.xml"
  +  Delete "$INSTDIR\webapps\*.xml"
 RMDir /r "$INSTDIR\webapps\ROOT"
 RMDir /r "$INSTDIR\webapps\tomcat-docs"
  -  RMDir /r "$INSTDIR\webapps\examples"
  -  RMDir /r "$INSTDIR\webapps\webdav"
  +  RMDir /r "$INSTDIR\webapps\servlets-examples"
  +  RMDir /r "$INSTDIR\webapps\jsp-examples"
  +  Delete "$INSTDIR\webapps\servlets-examples.war"
  +  Delete "$INSTDIR\webapps\jsp-examples.war"
 RMDir "$INSTDIR\webapps"
 RMDir /r "$INSTDIR\work"
 RMDir /r "$INSTDIR\temp"
 RMDir /r "$INSTDIR\src"
  -  RMDir /r "$INSTDIR\jtc-src"
 RMDir "$INSTDIR"
   
 ; if $INSTDIR was removed, skip these next ones
  
  
  

--
To unsubscribe, e-mail:   
For additional commands, e-mail: 

cvs commit: jakarta-tomcat-5 build.xml tomcat.nsi

[remm]

remm2002/09/18 06:03:37

  Modified:.build.xml tomcat.nsi
  Log:
  - Make the installer look more modern. More will be done, but the functionality
will likely change before NSIS 2 final.
  
  Revision  ChangesPath
  1.34  +2 -0  jakarta-tomcat-5/build.xml
  
  Index: build.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
  retrieving revision 1.33
  retrieving revision 1.34
  diff -u -r1.33 -r1.34
  --- build.xml 27 Aug 2002 13:20:49 -  1.33
  +++ build.xml 18 Sep 2002 13:03:36 -  1.34
  @@ -368,6 +368,8 @@
 
   
   
  +
   
   
   mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: