cvs commit: jakarta-tomcat-5 tomcat.nsi
yoavs 2005/09/23 06:40:26 Modified:.tomcat.nsi Log: ${catalina.base} is not recognized by NSIS, $INSTDIR seems like the right fix. Revision ChangesPath 1.84 +2 -2 jakarta-tomcat-5/tomcat.nsi Index: tomcat.nsi === RCS file: /home/cvs/jakarta-tomcat-5/tomcat.nsi,v retrieving revision 1.83 retrieving revision 1.84 diff -u -r1.83 -r1.84 --- tomcat.nsi31 Aug 2005 16:30:48 - 1.83 +++ tomcat.nsi23 Sep 2005 13:40:26 - 1.84 @@ -327,7 +327,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#-Dcatalina.base=$INSTDIR#-Djava.endorsed.dirs=$INSTDIR\common\endorsed#-Djava.io.tmpdir=$INSTDIR\temp#-Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager#-Djava.util.logging.config.file=${catalina.base}\conf\logging.properties --StdOutput auto --StdError auto' + nsExec::ExecToLog '$INSTDIR\bin\tomcat5.exe //US//Tomcat5 --JvmOptions -Dcatalina.home=$INSTDIR#-Dcatalina.base=$INSTDIR#-Djava.endorsed.dirs=$INSTDIR\common\endorsed#-Djava.io.tmpdir=$INSTDIR\temp#-Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager#-Djava.util.logging.config.file=$INSTDIR\conf\logging.properties --StdOutput auto --StdError auto' WriteUninstaller $INSTDIR\Uninstall.exe - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-5 tomcat.nsi
mturk 2005/08/03 23:52:35 Modified:.tomcat.nsi Log: Use tomcat vhost from heanet. Revision ChangesPath 1.82 +3 -3 jakarta-tomcat-5/tomcat.nsi Index: tomcat.nsi === RCS file: /home/cvs/jakarta-tomcat-5/tomcat.nsi,v retrieving revision 1.81 retrieving revision 1.82 diff -u -r1.81 -r1.82 --- tomcat.nsi3 Aug 2005 08:22:39 - 1.81 +++ tomcat.nsi4 Aug 2005 06:52:35 - 1.82 @@ -203,11 +203,11 @@ SectionIn 3 - NSISdl::download /TIMEOUT=3 http://ftp.heanet.ie/pub/tomcat/native/1.1.0/binaries/win32/tcnative-1.dll $INSTDIR\bin\tcnative-1.dll + NSISdl::download /TIMEOUT=3 http://tomcat.heanet.ie/native/1.1.0/binaries/win32/tcnative-1.dll $INSTDIR\bin\tcnative-1.dll Pop $0 StrCmp $0 success success SetDetailsView show -DetailPrint download failed from http://ftp.heanet.ie/pub/tomcat/native/1.1.0/binaries/win32/tcnative-1.dll: $0 +DetailPrint download failed from http://tomcat.heanet.ie/native/1.1.0/binaries/win32/tcnative-1.dll: $0 success: ClearErrors - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-5 tomcat.nsi
remm2005/08/03 01:22:39 Modified:.tomcat.nsi Log: - Update locations for native .dll. Revision ChangesPath 1.81 +3 -3 jakarta-tomcat-5/tomcat.nsi Index: tomcat.nsi === RCS file: /home/cvs/jakarta-tomcat-5/tomcat.nsi,v retrieving revision 1.80 retrieving revision 1.81 diff -u -r1.80 -r1.81 --- tomcat.nsi2 Aug 2005 19:08:07 - 1.80 +++ tomcat.nsi3 Aug 2005 08:22:39 - 1.81 @@ -203,11 +203,11 @@ SectionIn 3 - NSISdl::download /TIMEOUT=3 http://blabla/tcnative-1-1.1.0.dll $INSTDIR\bin\tcnative-1.dll + NSISdl::download /TIMEOUT=3 http://ftp.heanet.ie/pub/tomcat/native/1.1.0/binaries/win32/tcnative-1.dll $INSTDIR\bin\tcnative-1.dll Pop $0 StrCmp $0 success success SetDetailsView show -DetailPrint download failed from http://blabla/tcnative-1-1.1.0.dll: $0 +DetailPrint download failed from http://ftp.heanet.ie/pub/tomcat/native/1.1.0/binaries/win32/tcnative-1.dll: $0 success: ClearErrors - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-5 tomcat.nsi
yoavs 2005/08/02 11:35:15 Modified:.tomcat.nsi Log: Corrected EOL characters. Revision ChangesPath 1.79 +683 -683 jakarta-tomcat-5/tomcat.nsi Index: tomcat.nsi === RCS file: /home/cvs/jakarta-tomcat-5/tomcat.nsi,v retrieving revision 1.78 retrieving revision 1.79 diff -u -r1.78 -r1.79 --- tomcat.nsi2 Aug 2005 18:12:05 - 1.78 +++ tomcat.nsi2 Aug 2005 18:35:15 - 1.79 @@ -1,683 +1,683 @@ - -; Tomcat script for Nullsoft Installer -; $Id$ - - ;Compression options - CRCCheck on - SetCompress force - SetCompressor lzma - SetDatablockOptimize on - - Name Apache Tomcat - - ;Product information - VIAddVersionKey ProductName Apache Tomcat - VIAddVersionKey CompanyName Apache Software Foundation - VIAddVersionKey LegalCopyright Copyright (c) 1999-2005 The Apache Software Foundation - VIAddVersionKey FileDescription Apache Tomcat Installer - VIAddVersionKey FileVersion 2.0 - VIAddVersionKey ProductVersion @VERSION@ - VIAddVersionKey Comments jakarta.apache.org/tomcat - VIAddVersionKey InternalName [EMAIL PROTECTED]@.exe - VIProductVersion @VERSION_NUMBER@ - -!include MUI.nsh -!include StrFunc.nsh -${StrRep} - Var JavaHome - - - -; -;Configuration - - !define MUI_HEADERIMAGE - !define MUI_HEADERIMAGE_RIGHT - !define MUI_HEADERIMAGE_BITMAP header.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 //MR//Tomcat5 - !define MUI_FINISHPAGE_NOREBOOTSUPPORT - - !define MUI_ABORTWARNING - - !define TEMP1 $R0 - !define TEMP2 $R1 - - !define MUI_ICON tomcat.ico - !define MUI_UNICON tomcat.ico - - ;General - OutFile tomcat-installer.exe - - ;Install Options pages - LangString TEXT_JVM_TITLE ${LANG_ENGLISH} Java Virtual Machine - LangString TEXT_JVM_SUBTITLE ${LANG_ENGLISH} Java Virtual Machine path selection. - LangString TEXT_JVM_PAGETITLE ${LANG_ENGLISH} : Java Virtual Machine path selection - - LangString TEXT_CONF_TITLE ${LANG_ENGLISH} Configuration - LangString TEXT_CONF_SUBTITLE ${LANG_ENGLISH} Tomcat basic configuration. - LangString TEXT_CONF_PAGETITLE ${LANG_ENGLISH} : Configuration Options - - ;Install Page order - !insertmacro MUI_PAGE_WELCOME - !insertmacro MUI_PAGE_LICENSE INSTALLLICENSE - !insertmacro MUI_PAGE_COMPONENTS - !insertmacro MUI_PAGE_DIRECTORY - Page custom SetConfiguration Void $(TEXT_CONF_PAGETITLE) - Page custom SetChooseJVM Void $(TEXT_JVM_PAGETITLE) - !insertmacro MUI_PAGE_INSTFILES - Page custom CheckUserType - !insertmacro MUI_PAGE_FINISH - - ;Uninstall Page order - !insertmacro MUI_UNPAGE_CONFIRM - !insertmacro MUI_UNPAGE_INSTFILES - - ;License dialog - LicenseData License.rtf - - ;Component-selection page -;Descriptions -LangString DESC_SecTomcat ${LANG_ENGLISH} Install the Tomcat Servlet container. -LangString DESC_SecTomcatCore ${LANG_ENGLISH} Install the Tomcat Servlet container core. -LangString DESC_SecTomcatService ${LANG_ENGLISH} Automatically start Tomcat when the computer is started. This requires Windows NT 4.0, Windows 2000 or Windows XP. -;LangString DESC_SecTomcatSource ${LANG_ENGLISH} Install the Tomcat source code. -LangString DESC_SecMenu ${LANG_ENGLISH} Create a Start Menu program group for Tomcat. -LangString DESC_SecDocs ${LANG_ENGLISH} Install the Tomcat documentation bundle. This include documentation on the servlet container and its configuration options, on the Jasper JSP page compiler, as well as on the native webserver connectors. -LangString DESC_SecExamples ${LANG_ENGLISH} Installs some examples web applications. -LangString DESC_SecAdmin ${LANG_ENGLISH} Installs the administration web application.; -;LangString DESC_SecWebapps ${LANG_ENGLISH} Installs other utility web applications (WebDAV, balancer, etc). -;LangString DESC_SecCompat ${LANG_ENGLISH} Installs Java2 compatibility package. This release of Apache Tomcat was packaged to run on J2SE 5.0 or later. It can be run on earlier JVMs by installng this package. - - ;Language - !insertmacro MUI_LANGUAGE English - - ;Folder-select dialog - InstallDir $PROGRAMFILES\Apache Software Foundation\Tomcat 5.5 - - ;Install types - InstType Normal - InstType Minimum - InstType Full - - ; Main registry key - InstallDirRegKey HKLM SOFTWARE\Apache Software Foundation\Tomcat\5.5 - - !insertmacro
cvs commit: jakarta-tomcat-5 tomcat.nsi
remm2005/07/29 08:35:48 Modified:juli/src/java/org/apache/juli ClassLoaderLogManager.java .tomcat.nsi Log: - The current logging configuration depends on catalina.base, which is defined after bootstrap. - Improve a bit so that a non existent configuration file doesn't crash (I didn't test fallback that well yet, however). Revision ChangesPath 1.11 +17 -7 jakarta-tomcat-connectors/juli/src/java/org/apache/juli/ClassLoaderLogManager.java Index: ClassLoaderLogManager.java === RCS file: /home/cvs/jakarta-tomcat-connectors/juli/src/java/org/apache/juli/ClassLoaderLogManager.java,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- ClassLoaderLogManager.java27 Apr 2005 21:54:01 - 1.10 +++ ClassLoaderLogManager.java29 Jul 2005 15:35:48 - 1.11 @@ -299,13 +299,23 @@ is = classLoader.getResourceAsStream(logging.properties); } if ((is == null) (classLoader == ClassLoader.getSystemClassLoader())) { -String configFile = System.getProperty(java.util.logging.config.file, -(new File(new File(System.getProperty(java.home), lib), -logging.properties).getAbsolutePath())); -try { -is = new FileInputStream(replace(configFile)); -} catch (IOException e) { -// Ignore +String configFileStr = System.getProperty(java.util.logging.config.file); +if (configFileStr != null) { +try { +is = new FileInputStream(replace(configFileStr)); +} catch (IOException e) { +// Ignore +} +} +// Try the default JVM configuration +if (is == null) { +File defaultFile = new File(new File(System.getProperty(java.home), lib), +logging.properties); +try { +is = new FileInputStream(defaultFile); +} catch (IOException e) { +// Critical problem, do something ... +} } } 1.77 +2 -2 jakarta-tomcat-5/tomcat.nsi Index: tomcat.nsi === RCS file: /home/cvs/jakarta-tomcat-5/tomcat.nsi,v retrieving revision 1.76 retrieving revision 1.77 diff -u -r1.76 -r1.77 --- tomcat.nsi28 Jul 2005 14:17:51 - 1.76 +++ tomcat.nsi29 Jul 2005 15:35:48 - 1.77 @@ -310,7 +310,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#-Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager#-Djava.util.logging.config.file=${catalina.base}\conf\logging.properties --StdOutput auto --StdError auto' + nsExec::ExecToLog '$INSTDIR\bin\tomcat5.exe //US//Tomcat5 --JvmOptions -Dcatalina.home=$INSTDIR#-Dcatalina.base=$INSTDIR#-Djava.endorsed.dirs=$INSTDIR\common\endorsed#-Djava.io.tmpdir=$INSTDIR\temp#-Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager#-Djava.util.logging.config.file=${catalina.base}\conf\logging.properties --StdOutput auto --StdError auto' WriteUninstaller $INSTDIR\Uninstall.exe - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-5 tomcat.nsi
remm2005/07/28 07:17:51 Modified:.tomcat.nsi Log: - Add missing space. Revision ChangesPath 1.76 +2 -2 jakarta-tomcat-5/tomcat.nsi Index: tomcat.nsi === RCS file: /home/cvs/jakarta-tomcat-5/tomcat.nsi,v retrieving revision 1.75 retrieving revision 1.76 diff -u -r1.75 -r1.76 --- tomcat.nsi28 Jul 2005 14:01:49 - 1.75 +++ tomcat.nsi28 Jul 2005 14:17:51 - 1.76 @@ -162,7 +162,7 @@ InstallRetry: ClearErrors - 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--StartPath $INSTDIR --StopPath $INSTDIR' + 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 --StartPath $INSTDIR --StopPath $INSTDIR' Pop $0 StrCmp $0 0 InstallOk MessageBox MB_ABORTRETRYIGNORE|MB_ICONSTOP \ - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-5 tomcat.nsi
remm2005/03/28 09:06:00 Modified:.tomcat.nsi Log: - Small tweak: include the host-manager in the Windows .exe. Revision ChangesPath 1.73 +3 -1 jakarta-tomcat-5/tomcat.nsi Index: tomcat.nsi === RCS file: /home/cvs/jakarta-tomcat-5/tomcat.nsi,v retrieving revision 1.72 retrieving revision 1.73 diff -u -r1.72 -r1.73 --- tomcat.nsi4 Mar 2005 15:00:18 - 1.72 +++ tomcat.nsi28 Mar 2005 17:06:00 - 1.73 @@ -140,10 +140,12 @@ File /nonfatal /r server\classes SetOutPath $INSTDIR\server\webapps File /r server\webapps\manager + File /r server\webapps\host-manager SetOutPath $INSTDIR\webapps File /r webapps\ROOT SetOutPath $INSTDIR\conf\Catalina\localhost File conf\Catalina\localhost\manager.xml + File conf\Catalina\localhost\host-manager.xml Call configure Call findJavaPath - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-5 tomcat.nsi
remm2005/03/04 06:28:59 Modified:.tomcat.nsi Log: - Using JULI with procrun makes the service startup silently fail, without any logging information. All other ways to run it work properly, including java -Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager -jar bin/bootstrap.jar. - I am starting to be tired about JNI magic problems ... Revision ChangesPath 1.71 +2 -2 jakarta-tomcat-5/tomcat.nsi Index: tomcat.nsi === RCS file: /home/cvs/jakarta-tomcat-5/tomcat.nsi,v retrieving revision 1.70 retrieving revision 1.71 diff -u -r1.70 -r1.71 --- tomcat.nsi3 Mar 2005 15:13:39 - 1.70 +++ tomcat.nsi4 Mar 2005 14:28:59 - 1.71 @@ -308,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#-Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager --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 --StdOutput auto --StdError auto' WriteUninstaller $INSTDIR\Uninstall.exe - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-5 tomcat.nsi
remm2005/03/04 07:00:18 Modified:.tomcat.nsi Log: - Add back JVM option. Revision ChangesPath 1.72 +2 -2 jakarta-tomcat-5/tomcat.nsi Index: tomcat.nsi === RCS file: /home/cvs/jakarta-tomcat-5/tomcat.nsi,v retrieving revision 1.71 retrieving revision 1.72 diff -u -r1.71 -r1.72 --- tomcat.nsi4 Mar 2005 14:28:59 - 1.71 +++ tomcat.nsi4 Mar 2005 15:00:18 - 1.72 @@ -308,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]
cvs commit: jakarta-tomcat-5 tomcat.nsi
remm2005/02/02 04:01:44 Modified:.tomcat.nsi Log: - Fix silent uninstallation (bug 33351). Revision ChangesPath 1.68 +3 -1 jakarta-tomcat-5/tomcat.nsi Index: tomcat.nsi === RCS file: /home/cvs/jakarta-tomcat-5/tomcat.nsi,v retrieving revision 1.67 retrieving revision 1.68 diff -u -r1.67 -r1.68 --- tomcat.nsi22 Nov 2004 15:04:58 - 1.67 +++ tomcat.nsi2 Feb 2005 12:01:43 - 1.68 @@ -626,6 +626,8 @@ RMDir /r $INSTDIR\src RMDir $INSTDIR + IfSilent Removed 0 + ; if $INSTDIR was removed, skip these next ones IfFileExists $INSTDIR 0 Removed MessageBox MB_YESNO|MB_ICONQUESTION \ - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-5 tomcat.nsi
mturk 2004/11/13 10:57:05 Modified:.tomcat.nsi Log: Use auto option for StdError and StdOutput. Revision ChangesPath 1.66 +2 -2 jakarta-tomcat-5/tomcat.nsi Index: tomcat.nsi === RCS file: /home/cvs/jakarta-tomcat-5/tomcat.nsi,v retrieving revision 1.65 retrieving revision 1.66 diff -u -r1.65 -r1.66 --- tomcat.nsi6 Oct 2004 10:07:55 - 1.65 +++ tomcat.nsi13 Nov 2004 18:57:05 - 1.66 @@ -307,7 +307,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 $INSTDIR\logs\stdout.log --StdError $INSTDIR\logs\stderr.log' + 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' WriteUninstaller $INSTDIR\Uninstall.exe - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-5 tomcat.nsi
mturk 2004/10/06 03:07:55 Modified:.tomcat.nsi Log: Fix typo removing LangString for SecWebapps. Revision ChangesPath 1.65 +2 -2 jakarta-tomcat-5/tomcat.nsi Index: tomcat.nsi === RCS file: /home/cvs/jakarta-tomcat-5/tomcat.nsi,v retrieving revision 1.64 retrieving revision 1.65 diff -u -r1.64 -r1.65 --- tomcat.nsi18 Sep 2004 19:29:34 - 1.64 +++ tomcat.nsi6 Oct 2004 10:07:55 - 1.65 @@ -86,7 +86,7 @@ LangString DESC_SecMenu ${LANG_ENGLISH} Create a Start Menu program group for Tomcat. LangString DESC_SecDocs ${LANG_ENGLISH} Install the Tomcat documentation bundle. This include documentation on the servlet container and its configuration options, on the Jasper JSP page compiler, as well as on the native webserver connectors. LangString DESC_SecExamples ${LANG_ENGLISH} Installs some examples web applications. -LangString DESC_SecAdmin ${LANG_ENGLISH} Installs the administration web application.;LangString DESC_SecWebapps ${LANG_ENGLISH} Installs other utility web applications (WebDAV, balancer, etc). +LangString DESC_SecAdmin ${LANG_ENGLISH} Installs the administration web application.; ;LangString DESC_SecWebapps ${LANG_ENGLISH} Installs other utility web applications (WebDAV, balancer, etc). ;LangString DESC_SecCompat ${LANG_ENGLISH} Installs Java2 compatibility package. This release of Apache Tomcat was packaged to run on J2SE 5.0 or later. It can be run on earlier JVMs by installng this package. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-5 tomcat.nsi
mturk 2004/09/18 07:49:58 Modified:.tomcat.nsi Log: Add compatibility option to the installer for pre Java5 jvm's. Also do not add Administation link if admin package is not installed. Also some minor display change on JVM not found. Revision ChangesPath 1.62 +25 -4 jakarta-tomcat-5/tomcat.nsi Index: tomcat.nsi === RCS file: /home/cvs/jakarta-tomcat-5/tomcat.nsi,v retrieving revision 1.61 retrieving revision 1.62 diff -u -r1.61 -r1.62 --- tomcat.nsi14 Sep 2004 07:59:41 - 1.61 +++ tomcat.nsi18 Sep 2004 14:49:58 - 1.62 @@ -88,6 +88,7 @@ LangString DESC_SecExamples ${LANG_ENGLISH} Installs some examples web applications. LangString DESC_SecAdmin ${LANG_ENGLISH} Installs the administration web application. LangString DESC_SecWebapps ${LANG_ENGLISH} Installs other utility web applications (WebDAV, balancer, etc). +LangString DESC_SecCompat ${LANG_ENGLISH} Installs Java2 compatibility package. This release of Apache Tomcat was packaged to run on J2SE 5.0 or later. It can be run on earlier JVMs by installng this package. ;Language !insertmacro MUI_LANGUAGE English @@ -114,7 +115,7 @@ Section Core SecTomcatCore - SectionIn 1 2 3 + SectionIn 1 2 3 RO IfSilent +2 0 Call checkJvm @@ -215,8 +216,18 @@ CreateShortCut $SMPROGRAMS\Apache Tomcat 5.5\Welcome.lnk \ http://127.0.0.1:$R0/; + IfFileExists $INSTDIR\server\webapps\admin 0 NoAdminApp + CreateShortCut $SMPROGRAMS\Apache Tomcat 5.5\Tomcat Administration.lnk \ http://127.0.0.1:$R0/admin/; +NoAdminApp: + + IfFileExists $INSTDIR\server\webapps\manager 0 NoManagerApp + + CreateShortCut $SMPROGRAMS\Apache Tomcat 5.5\Tomcat Manager.lnk \ + http://127.0.0.1:$R0/manager/html; + +NoManagerApp: IfFileExists $INSTDIR\webapps\webapps\tomcat-docs 0 NoDocumentaion @@ -283,6 +294,15 @@ SectionEnd +Section Compatibility SecCompat + + SetOutPath $INSTDIR + File /oname=bin\jmx.jar ..\compat\bin\jmx.jar + File /oname=common\endorsed\xercesImpl.jar ..\compat\common\endorsed\xercesImpl.jar + File /oname=common\endorsed\xml-apis.jar ..\compat\common\endorsed\xml-apis.jar + +SectionEnd + 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 $INSTDIR\logs\stdout.log --StdError $INSTDIR\logs\stderr.log' @@ -330,6 +350,7 @@ !insertmacro MUI_DESCRIPTION_TEXT ${SecTomcatCore} $(DESC_SecTomcatCore) !insertmacro MUI_DESCRIPTION_TEXT ${SecTomcatService} $(DESC_SecTomcatService) !insertmacro MUI_DESCRIPTION_TEXT ${SecTomcatSource} $(DESC_SecTomcatSource) + !insertmacro MUI_DESCRIPTION_TEXT ${SecCompat} $(DESC_SecCompat) !insertmacro MUI_DESCRIPTION_TEXT ${SecMenu} $(DESC_SecMenu) !insertmacro MUI_DESCRIPTION_TEXT ${SecDocs} $(DESC_SecDocs) !insertmacro MUI_DESCRIPTION_TEXT ${SecExamples} $(DESC_SecExamples) @@ -437,14 +458,14 @@ !insertmacro MUI_INSTALLOPTIONS_READ $3 jvm.ini Field 2 State IfFileExists $3\bin\java.exe NoErrors1 - MessageBox MB_OK No Java Virtual Machine found. + MessageBox MB_OK|MB_ICONSTOP No Java Virtual Machine found in folder:$\r$\n$3 Quit NoErrors1: StrCpy $JavaHome $3 Call findJVMPath Pop $4 StrCmp $4 0 NoErrors2 - MessageBox MB_OK No Java Virtual Machine found. + MessageBox MB_OK|MB_ICONSTOP No Java Virtual Machine found in folder:$\r$\n$3 Quit NoErrors2: - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: cvs commit: jakarta-tomcat-5 tomcat.nsi
[EMAIL PROTECTED] wrote: mturk 2004/09/18 07:49:58 Modified:.tomcat.nsi Log: Add compatibility option to the installer for pre Java5 jvm's. Also do not add Administation link if admin package is not installed. Also some minor display change on JVM not found. I'll have to -1 this: it reintroduces all the bloat in the installer (which is already too big: we should instead be getting rid of the Tomcat source). Rémy - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-5 tomcat.nsi
mturk 2004/09/18 10:43:34 Modified:.tomcat.nsi Log: Comment out all packages that are not present in the standard .tar.gz or .zip distribution. Revision ChangesPath 1.63 +38 -38jakarta-tomcat-5/tomcat.nsi Index: tomcat.nsi === RCS file: /home/cvs/jakarta-tomcat-5/tomcat.nsi,v retrieving revision 1.62 retrieving revision 1.63 diff -u -r1.62 -r1.63 --- tomcat.nsi18 Sep 2004 14:49:58 - 1.62 +++ tomcat.nsi18 Sep 2004 17:43:34 - 1.63 @@ -82,13 +82,13 @@ LangString DESC_SecTomcat ${LANG_ENGLISH} Install the Tomcat Servlet container. LangString DESC_SecTomcatCore ${LANG_ENGLISH} Install the Tomcat Servlet container core. LangString DESC_SecTomcatService ${LANG_ENGLISH} Automatically start Tomcat when the computer is started. This requires Windows NT 4.0, Windows 2000 or Windows XP. -LangString DESC_SecTomcatSource ${LANG_ENGLISH} Install the Tomcat source code. +;LangString DESC_SecTomcatSource ${LANG_ENGLISH} Install the Tomcat source code. LangString DESC_SecMenu ${LANG_ENGLISH} Create a Start Menu program group for Tomcat. LangString DESC_SecDocs ${LANG_ENGLISH} Install the Tomcat documentation bundle. This include documentation on the servlet container and its configuration options, on the Jasper JSP page compiler, as well as on the native webserver connectors. LangString DESC_SecExamples ${LANG_ENGLISH} Installs some examples web applications. -LangString DESC_SecAdmin ${LANG_ENGLISH} Installs the administration web application. -LangString DESC_SecWebapps ${LANG_ENGLISH} Installs other utility web applications (WebDAV, balancer, etc). -LangString DESC_SecCompat ${LANG_ENGLISH} Installs Java2 compatibility package. This release of Apache Tomcat was packaged to run on J2SE 5.0 or later. It can be run on earlier JVMs by installng this package. +LangString DESC_SecAdmin ${LANG_ENGLISH} Installs the administration web application.;LangString DESC_SecWebapps ${LANG_ENGLISH} Installs other utility web applications (WebDAV, balancer, etc). +;LangString DESC_SecWebapps ${LANG_ENGLISH} Installs other utility web applications (WebDAV, balancer, etc). +;LangString DESC_SecCompat ${LANG_ENGLISH} Installs Java2 compatibility package. This release of Apache Tomcat was packaged to run on J2SE 5.0 or later. It can be run on earlier JVMs by installng this package. ;Language !insertmacro MUI_LANGUAGE English @@ -192,13 +192,13 @@ SectionEnd -Section Source Code SecTomcatSource - - SectionIn 3 - SetOutPath $INSTDIR - File /r src - -SectionEnd +;Section Source Code SecTomcatSource +; +; SectionIn 3 +; SetOutPath $INSTDIR +; File /r src +; +;SectionEnd SubSectionEnd @@ -216,11 +216,11 @@ CreateShortCut $SMPROGRAMS\Apache Tomcat 5.5\Welcome.lnk \ http://127.0.0.1:$R0/; - IfFileExists $INSTDIR\server\webapps\admin 0 NoAdminApp - - CreateShortCut $SMPROGRAMS\Apache Tomcat 5.5\Tomcat Administration.lnk \ - http://127.0.0.1:$R0/admin/; -NoAdminApp: +; IfFileExists $INSTDIR\server\webapps\admin 0 NoAdminApp +; +; CreateShortCut $SMPROGRAMS\Apache Tomcat 5.5\Tomcat Administration.lnk \ +; http://127.0.0.1:$R0/admin/; +;NoAdminApp: IfFileExists $INSTDIR\server\webapps\manager 0 NoManagerApp @@ -273,16 +273,16 @@ SectionEnd -Section Administration SecAdmin - - SectionIn 3 - - SetOutPath $INSTDIR\server\webapps - File /r server\webapps\admin - SetOutPath $INSTDIR\conf\Catalina\localhost - File conf\Catalina\localhost\admin.xml - -SectionEnd +;Section Administration SecAdmin +; +; SectionIn 3 +; +; SetOutPath $INSTDIR\server\webapps +; File /r server\webapps\admin +; SetOutPath $INSTDIR\conf\Catalina\localhost +; File conf\Catalina\localhost\admin.xml +; +;SectionEnd Section Webapps SecWebapps @@ -294,14 +294,14 @@ SectionEnd -Section Compatibility SecCompat - - SetOutPath $INSTDIR - File /oname=bin\jmx.jar ..\compat\bin\jmx.jar - File /oname=common\endorsed\xercesImpl.jar ..\compat\common\endorsed\xercesImpl.jar - File /oname=common\endorsed\xml-apis.jar ..\compat\common\endorsed\xml-apis.jar - -SectionEnd +;Section Compatibility SecCompat +; +; SetOutPath $INSTDIR +; File /oname=bin\jmx.jar ..\compat\bin\jmx.jar +; File /oname=common\endorsed\xercesImpl.jar ..\compat\common\endorsed\xercesImpl.jar +; File /oname=common\endorsed\xml-apis.jar ..\compat\common\endorsed\xml-apis.jar +; +;SectionEnd Section -post nsExec::ExecToLog '$INSTDIR\bin\tomcat5.exe //US//Tomcat5 --Classpath $INSTDIR\bin\bootstrap.jar --StartClass
Re: cvs commit: jakarta-tomcat-5 tomcat.nsi
Remy Maucherat wrote: Add compatibility option to the installer for pre Java5 jvm's. Also do not add Administation link if admin package is not installed. Also some minor display change on JVM not found. I'll have to -1 this: it reintroduces all the bloat in the installer (which is already too big: we should instead be getting rid of the Tomcat source). I've commented out (can be deleted all together) all packages that are not present in the standard distribution (removed Source and Admin), cause they exist as separate packages. I also don't like that link on the final page ('Start Tomcat'). It's name confuses cause the Tomcat is not actually started, but rather the monitor is put into the try. MT. smime.p7s Description: S/MIME Cryptographic Signature
cvs commit: jakarta-tomcat-5 tomcat.nsi
mturk 2004/09/18 12:29:34 Modified:.tomcat.nsi Log: Use new MR option to run the service if the user selects that. Use new MQ option to shutdown the monitor application on uninstall. Revision ChangesPath 1.64 +7 -2 jakarta-tomcat-5/tomcat.nsi Index: tomcat.nsi === RCS file: /home/cvs/jakarta-tomcat-5/tomcat.nsi,v retrieving revision 1.63 retrieving revision 1.64 diff -u -r1.63 -r1.64 --- tomcat.nsi18 Sep 2004 17:43:34 - 1.63 +++ tomcat.nsi18 Sep 2004 19:29:34 - 1.64 @@ -37,7 +37,7 @@ !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 + !define MUI_FINISHPAGE_RUN_PARAMETERS //MR//Tomcat5 !define MUI_FINISHPAGE_NOREBOOTSUPPORT !define MUI_ABORTWARNING @@ -187,6 +187,8 @@ Pop $2 nsExec::ExecToLog '$INSTDIR\bin\tomcat5.exe //US//Tomcat5 --Startup auto' + ; Bahave like Apache Httpd (put the icon in try on login) + WriteRegStr HKLM Software\Microsoft\Windows\CurrentVersion\Run ApacheTomcatMonitor '$INSTDIR\bin\tomcat5w.exe //MS//Tomcat5' ClearErrors @@ -595,6 +597,8 @@ Delete $INSTDIR\modern.exe Delete $INSTDIR\Uninstall.exe + ; Stop Tomcat service monitor if running + nsExec::ExecToLog '$INSTDIR\bin\tomcat5w.exe //MQ//Tomcat5' ; Delete Tomcat service nsExec::ExecToLog '$INSTDIR\bin\tomcat5.exe //DS//Tomcat5' ClearErrors @@ -602,6 +606,7 @@ DeleteRegKey HKCR JSPFile DeleteRegKey HKLM Software\Microsoft\Windows\CurrentVersion\Uninstall\Apache Tomcat 5.5 DeleteRegKey HKLM SOFTWARE\Apache Software Foundation\Tomcat\5.5 + DeleteRegValue HKLM Software\Microsoft\Windows\CurrentVersion\Run ApacheTomcatMonitor RMDir /r $SMPROGRAMS\Apache Tomcat 5.5 Delete $INSTDIR\tomcat.ico Delete $INSTDIR\LICENSE - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-5 tomcat.nsi
mturk 2004/09/14 00:59:41 Modified:.tomcat.nsi Log: Fix function findJVMPath. It failed to set the custom jre path if the path was not JDK path. Now that we can use only JRE, enable that. The JRE paths does not have 'jre\bin\', but just 'bin\' prefix. Also add checking for client (Not sure if we still need the hotspot and classic). Think they've been used on older JVM's we cannot use anyhow. Revision ChangesPath 1.61 +29 -27jakarta-tomcat-5/tomcat.nsi Index: tomcat.nsi === RCS file: /home/cvs/jakarta-tomcat-5/tomcat.nsi,v retrieving revision 1.60 retrieving revision 1.61 diff -u -r1.60 -r1.61 --- tomcat.nsi13 Sep 2004 19:11:41 - 1.60 +++ tomcat.nsi14 Sep 2004 07:59:41 - 1.61 @@ -151,7 +151,6 @@ !insertmacro MUI_INSTALLOPTIONS_READ $2 jvm.ini Field 2 State StrCpy $JavaHome $2 - Push $2 Call findJVMPath Pop $2 @@ -183,7 +182,6 @@ !insertmacro MUI_INSTALLOPTIONS_READ $2 jvm.ini Field 2 State StrCpy $JavaHome $2 - Push $2 Call findJVMPath Pop $2 @@ -387,37 +385,42 @@ ; Function findJVMPath - Pop $1 - - IfFileExists $1\jre\bin\hotspot\jvm.dll 0 TryJDK14 -StrCpy $2 $1\jre\bin\hotspot\jvm.dll -Goto EndIfFileExists - TryJDK14: - IfFileExists $1\jre\bin\server\jvm.dll 0 TryClassic -StrCpy $2 $1\jre\bin\server\jvm.dll -Goto EndIfFileExists - TryClassic: - IfFileExists $1\jre\bin\classic\jvm.dll 0 JDKNotFound -StrCpy $2 $1\jre\bin\classic\jvm.dll -Goto EndIfFileExists - JDKNotFound: -SetErrors - EndIfFileExists: + ClearErrors + + ;Step one: Is this a JRE path (Program Files\Java\XXX) + StrCpy $1 $JavaHome + + StrCpy $2 $1\bin\hotspot\jvm.dll + IfFileExists $2 FoundJvmDll + StrCpy $2 $1\bin\server\jvm.dll + IfFileExists $2 FoundJvmDll + StrCpy $2 $1\bin\client\jvm.dll + IfFileExists $2 FoundJvmDll + StrCpy $2 $1\bin\classic\jvm.dll + IfFileExists $2 FoundJvmDll - IfErrors 0 FoundJVMPath + ;Step two: Is this a JDK path (Program Files\XXX\jre) + StrCpy $1 $JavaHome\jre + + StrCpy $2 $1\bin\hotspot\jvm.dll + IfFileExists $2 FoundJvmDll + StrCpy $2 $1\bin\server\jvm.dll + IfFileExists $2 FoundJvmDll + StrCpy $2 $1\bin\client\jvm.dll + IfFileExists $2 FoundJvmDll + StrCpy $2 $1\bin\classic\jvm.dll + IfFileExists $2 FoundJvmDll ClearErrors - + ;Step tree: Read defaults from registry + ReadRegStr $1 HKLM SOFTWARE\JavaSoft\Java Runtime Environment CurrentVersion ReadRegStr $2 HKLM SOFTWARE\JavaSoft\Java Runtime Environment\$1 RuntimeLib - FoundJVMPath: - - IfErrors 0 NoErrors + IfErrors 0 FoundJvmDll StrCpy $2 -NoErrors: - + FoundJvmDll: ClearErrors ; Put the result in the stack @@ -438,7 +441,6 @@ Quit NoErrors1: StrCpy $JavaHome $3 - Push $3 Call findJVMPath Pop $4 StrCmp $4 0 NoErrors2 - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-5 tomcat.nsi
mturk 2004/09/13 12:11:41 Modified:.tomcat.nsi Log: Check the return value from service install and give user a chance to fix the problems, ignore or abort installation. The problems can be either the lack of admin permission or the service Tomcat5 already installed. Revision ChangesPath 1.60 +11 -2 jakarta-tomcat-5/tomcat.nsi Index: tomcat.nsi === RCS file: /home/cvs/jakarta-tomcat-5/tomcat.nsi,v retrieving revision 1.59 retrieving revision 1.60 diff -u -r1.59 -r1.60 --- tomcat.nsi9 Sep 2004 21:51:20 - 1.59 +++ tomcat.nsi13 Sep 2004 19:11:41 - 1.60 @@ -157,7 +157,16 @@ DetailPrint Using Jvm: $2 + InstallRetry: + ClearErrors 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' + Pop $0 + StrCmp $0 0 InstallOk +MessageBox MB_ABORTRETRYIGNORE|MB_ICONSTOP \ + Failed to install Tomcat5 service.$\r$\nCheck your settings and permissions$\r$\nIgnore and continue anyway (not recommended)? \ + /SD IDIGNORE IDIGNORE InstallOk IDRETRY InstallRetry + Quit + InstallOk: ClearErrors SectionEnd @@ -353,7 +362,7 @@ ReadRegStr $1 HKLM SOFTWARE\JavaSoft\Java Runtime Environment\$2 JavaHome ReadRegStr $3 HKLM SOFTWARE\JavaSoft\Java Runtime Environment\$2 RuntimeLib - FoundJDK: + ;FoundJDK: IfErrors 0 NoErrors StrCpy $1 - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-5 tomcat.nsi
remm2004/09/09 14:51:21 Modified:.tomcat.nsi Log: - Comment the code which looks at JAVA_HOME, as we're trying to find the system's JRE. Revision ChangesPath 1.59 +4 -4 jakarta-tomcat-5/tomcat.nsi Index: tomcat.nsi === RCS file: /home/cvs/jakarta-tomcat-5/tomcat.nsi,v retrieving revision 1.58 retrieving revision 1.59 diff -u -r1.58 -r1.59 --- tomcat.nsi5 Sep 2004 10:29:22 - 1.58 +++ tomcat.nsi9 Sep 2004 21:51:20 - 1.59 @@ -341,11 +341,11 @@ ; Function findJavaPath - ClearErrors + ;ClearErrors - ReadEnvStr $1 JAVA_HOME + ;ReadEnvStr $1 JAVA_HOME - IfErrors 0 FoundJDK + ;IfErrors 0 FoundJDK ClearErrors - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-5 tomcat.nsi
mturk 2004/09/05 02:58:51 Modified:.tomcat.nsi Log: Update installer artwork :). Revision ChangesPath 1.57 +6 -1 jakarta-tomcat-5/tomcat.nsi Index: tomcat.nsi === RCS file: /home/cvs/jakarta-tomcat-5/tomcat.nsi,v retrieving revision 1.56 retrieving revision 1.57 diff -u -r1.56 -r1.57 --- tomcat.nsi4 Sep 2004 18:03:40 - 1.56 +++ tomcat.nsi5 Sep 2004 09:58:51 - 1.57 @@ -26,9 +26,14 @@ ${StrRep} Var JavaHome + + ; ;Configuration + !define MUI_HEADERIMAGE + !define MUI_HEADERIMAGE_RIGHT + !define MUI_HEADERIMAGE_BITMAP header.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 - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-5 tomcat.nsi
remm2004/09/05 03:29:23 Modified:.tomcat.nsi Log: - Another typo (that one is harmless). Revision ChangesPath 1.58 +3 -3 jakarta-tomcat-5/tomcat.nsi Index: tomcat.nsi === RCS file: /home/cvs/jakarta-tomcat-5/tomcat.nsi,v retrieving revision 1.57 retrieving revision 1.58 diff -u -r1.57 -r1.58 --- tomcat.nsi5 Sep 2004 09:58:51 - 1.57 +++ tomcat.nsi5 Sep 2004 10:29:22 - 1.58 @@ -33,7 +33,7 @@ !define MUI_HEADERIMAGE !define MUI_HEADERIMAGE_RIGHT - !define MUI_HEADERIMAGE_BITMAP header.bmp + !define MUI_HEADERIMAGE_BITMAP header.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 @@ -277,7 +277,7 @@ SectionEnd 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 --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 - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-5 tomcat.nsi
mturk 2004/09/04 11:03:40 Modified:.tomcat.nsi Log: Rename DOTTEDVER to VERSION_NUMBER. This is what build.xml now sets. Revision ChangesPath 1.56 +2 -2 jakarta-tomcat-5/tomcat.nsi Index: tomcat.nsi === RCS file: /home/cvs/jakarta-tomcat-5/tomcat.nsi,v retrieving revision 1.55 retrieving revision 1.56 diff -u -r1.55 -r1.56 --- tomcat.nsi3 Sep 2004 08:18:15 - 1.55 +++ tomcat.nsi4 Sep 2004 18:03:40 - 1.56 @@ -19,7 +19,7 @@ VIAddVersionKey ProductVersion @VERSION@ VIAddVersionKey Comments jakarta.apache.org/tomcat VIAddVersionKey InternalName [EMAIL PROTECTED]@.exe - VIProductVersion @DOTTEDVER@ + VIProductVersion @VERSION_NUMBER@ !include MUI.nsh !include StrFunc.nsh - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-5 tomcat.nsi build.xml
mturk 2004/09/03 01:18:16 Modified:.tomcat.nsi build.xml Log: Added dotted version for the installer. This enables strange versions like 5.5-rc1, etc... The dotted version has to be a four numbers separated with dots. Revision ChangesPath 1.55 +2 -2 jakarta-tomcat-5/tomcat.nsi Index: tomcat.nsi === RCS file: /home/cvs/jakarta-tomcat-5/tomcat.nsi,v retrieving revision 1.54 retrieving revision 1.55 diff -u -r1.54 -r1.55 --- tomcat.nsi2 Sep 2004 13:16:52 - 1.54 +++ tomcat.nsi3 Sep 2004 08:18:15 - 1.55 @@ -19,7 +19,7 @@ VIAddVersionKey ProductVersion @VERSION@ VIAddVersionKey Comments jakarta.apache.org/tomcat VIAddVersionKey InternalName [EMAIL PROTECTED]@.exe - VIProductVersion @[EMAIL PROTECTED] + VIProductVersion @DOTTEDVER@ !include MUI.nsh !include StrFunc.nsh 1.208 +2 -0 jakarta-tomcat-5/build.xml Index: build.xml === RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v retrieving revision 1.207 retrieving revision 1.208 diff -u -r1.207 -r1.208 --- build.xml 2 Sep 2004 13:16:52 - 1.207 +++ build.xml 3 Sep 2004 08:18:15 - 1.208 @@ -14,6 +14,7 @@ property name=name value=Apache Tomcat / property name=year value=2004 / property name=version value=5.5-dev / + property name=dottedver value=5.5.0.1 / property name=project value=jakarta-tomcat / property name=final.namevalue=${project}-${version} / property name=final-src.namevalue=${project}-${version}-src / @@ -1507,6 +1508,7 @@ copy file=${jtc.home}/procrun/bin/tomcat5w.exe tofile=${tomcat.dist}/bin/tomcat5w.exe / filter token=VERSION value=${version}/ +filter token=DOTTEDVER value=${dottedver}/ copy file=tomcat.nsi tofile=${tomcat.dist}/tomcat.nsi filtering=true/ exec dir=${tomcat.dist} executable=${nsis.exe} - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-5 tomcat.nsi
mturk 2004/09/02 03:02:05 Modified:.Tag: TOMCAT_5_0 tomcat.nsi Log: Fix setting tmpdir. Add new side image and rtf license. Add tools.jar to classpath and do not copy tools.jar from SDK Revision ChangesPath No revision No revision 1.45.2.1 +12 -6 jakarta-tomcat-5/tomcat.nsi Index: tomcat.nsi === RCS file: /home/cvs/jakarta-tomcat-5/tomcat.nsi,v retrieving revision 1.45 retrieving revision 1.45.2.1 diff -u -r1.45 -r1.45.2.1 --- tomcat.nsi22 May 2004 20:43:35 - 1.45 +++ tomcat.nsi2 Sep 2004 10:02:05 - 1.45.2.1 @@ -19,15 +19,18 @@ VIAddVersionKey ProductVersion @VERSION@ VIAddVersionKey Comments jakarta.apache.org/tomcat VIAddVersionKey InternalName [EMAIL PROTECTED]@.exe - VIProductVersion @[EMAIL PROTECTED] + VIProductVersion @[EMAIL PROTECTED] !include MUI.nsh !include StrFunc.nsh + Var JavaHome + ${StrRep} ; ;Configuration + !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 @@ -68,7 +71,7 @@ !insertmacro MUI_UNPAGE_INSTFILES ;License dialog - LicenseData INSTALLLICENSE + LicenseData License.rtf ;Component-selection page ;Descriptions @@ -132,7 +135,7 @@ IfSilent +2 0 !insertmacro MUI_INSTALLOPTIONS_READ $2 jvm.ini Field 2 State - CopyFiles /SILENT $2\lib\tools.jar $INSTDIR\common\lib 4500 +; CopyFiles /SILENT $2\lib\tools.jar $INSTDIR\common\lib 4500 ClearErrors Call configure @@ -142,6 +145,7 @@ IfSilent +2 0 !insertmacro MUI_INSTALLOPTIONS_READ $2 jvm.ini Field 2 State + StrCpy $JavaHome $2 Push $2 Call findJVMPath Pop $2 @@ -164,6 +168,7 @@ IfSilent +2 0 !insertmacro MUI_INSTALLOPTIONS_READ $2 jvm.ini Field 2 State + StrCpy $JavaHome $2 Push $2 Call findJVMPath Pop $2 @@ -247,8 +252,8 @@ SectionEnd 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 --StdOutput $INSTDIR\logs\stdout.log --StdError $INSTDIR\logs\stderr.log' + 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' WriteUninstaller $INSTDIR\Uninstall.exe @@ -396,6 +401,7 @@ MessageBox MB_OK No Java Virtual Machine found. Quit NoErrors1: + 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 tomcat.nsi
mturk 2004/09/02 03:07:02 Modified:.tomcat.nsi Log: Fix setting tmpdir. Add new side image and rtf license. Add tools.jar to classpath. Revision ChangesPath 1.53 +10 -5 jakarta-tomcat-5/tomcat.nsi Index: tomcat.nsi === RCS file: /home/cvs/jakarta-tomcat-5/tomcat.nsi,v retrieving revision 1.52 retrieving revision 1.53 diff -u -r1.52 -r1.53 --- tomcat.nsi1 Sep 2004 23:45:41 - 1.52 +++ tomcat.nsi2 Sep 2004 10:07:02 - 1.53 @@ -19,15 +19,17 @@ VIAddVersionKey ProductVersion @VERSION@ VIAddVersionKey Comments jakarta.apache.org/tomcat VIAddVersionKey InternalName [EMAIL PROTECTED]@.exe - VIProductVersion @[EMAIL PROTECTED] + VIProductVersion @[EMAIL PROTECTED] !include MUI.nsh !include StrFunc.nsh ${StrRep} + Var JavaHome ; ;Configuration + !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 @@ -68,7 +70,7 @@ !insertmacro MUI_UNPAGE_INSTFILES ;License dialog - LicenseData INSTALLLICENSE + LicenseData License.rtf ;Component-selection page ;Descriptions @@ -153,6 +155,7 @@ IfSilent +2 0 !insertmacro MUI_INSTALLOPTIONS_READ $2 jvm.ini Field 2 State + StrCpy $JavaHome $2 Push $2 Call findJVMPath Pop $2 @@ -175,6 +178,7 @@ IfSilent +2 0 !insertmacro MUI_INSTALLOPTIONS_READ $2 jvm.ini Field 2 State + StrCpy $JavaHome $2 Push $2 Call findJVMPath Pop $2 @@ -278,8 +282,8 @@ SectionEnd 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 $INSTDIR\logs\stdout.log --StdError $INSTDIR\logs\stderr.log' + 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' WriteUninstaller $INSTDIR\Uninstall.exe @@ -429,6 +433,7 @@ MessageBox MB_OK No Java Virtual Machine found. Quit NoErrors1: + StrCpy $JavaHome $3 Push $3 Call findJVMPath Pop $4 - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
RE: cvs commit: jakarta-tomcat-5 tomcat.nsi
Hi, Yeah, search/replace. But I grep'ped the file before and didn't think I saw any 5.0's that were unsafe to change. My mistake, I'll change it back right now -- sorry about that ;) Yoav Shapira Millennium Research Informatics -Original Message- From: Mladen Turk [mailto:[EMAIL PROTECTED] Sent: Wednesday, September 01, 2004 1:12 AM To: Tomcat Developers List Subject: Re: cvs commit: jakarta-tomcat-5 tomcat.nsi [EMAIL PROTECTED] wrote: -; CopyFiles /SILENT $2\lib\tools.jar $INSTDIR\common\lib 4500 +; CopyFiles /SILENT $2\lib\tools.jar $INSTDIR\common\lib 45.5 Looks like search-replace? MT. This e-mail, including any attachments, is a confidential business communication, and may contain information that is confidential, proprietary and/or privileged. This e-mail is intended only for the individual(s) to whom it is addressed, and may not be saved, copied, printed, disclosed or used by anyone else. If you are not the(an) intended recipient, please immediately delete this e-mail from your computer system and notify the sender. Thank you. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-5 tomcat.nsi
yoavs 2004/09/01 06:03:46 Modified:.tomcat.nsi Log: Undid unintentional change as pointed out by Mladen Turk. I think the line is commented out in the script anyways, so this doesn't matter, but it's good to undo. Revision ChangesPath 1.50 +2 -2 jakarta-tomcat-5/tomcat.nsi Index: tomcat.nsi === RCS file: /home/cvs/jakarta-tomcat-5/tomcat.nsi,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- tomcat.nsi31 Aug 2004 19:51:22 - 1.49 +++ tomcat.nsi1 Sep 2004 13:03:46 - 1.50 @@ -143,7 +143,7 @@ IfSilent +2 0 !insertmacro MUI_INSTALLOPTIONS_READ $2 jvm.ini Field 2 State -; CopyFiles /SILENT $2\lib\tools.jar $INSTDIR\common\lib 45.5 +; CopyFiles /SILENT $2\lib\tools.jar $INSTDIR\common\lib 4500 ClearErrors Call configure - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-5 tomcat.nsi
mturk 2004/09/01 11:25:59 Modified:.tomcat.nsi Log: Another search-replace from 5.0 to 5.5 :) Revision ChangesPath 1.51 +2 -2 jakarta-tomcat-5/tomcat.nsi Index: tomcat.nsi === RCS file: /home/cvs/jakarta-tomcat-5/tomcat.nsi,v retrieving revision 1.50 retrieving revision 1.51 diff -u -r1.50 -r1.51 --- tomcat.nsi1 Sep 2004 13:03:46 - 1.50 +++ tomcat.nsi1 Sep 2004 18:25:59 - 1.51 @@ -596,7 +596,7 @@ you created that you want to keep, click No) IDNO Removed Delete $INSTDIR\*.* ; this would be skipped if the user hits no RMDir /r $INSTDIR -Sleep 5.5 +Sleep 500 IfFileExists $INSTDIR 0 Removed MessageBox MB_OK|MB_ICONEXCLAMATION \ Note: $INSTDIR could not be removed. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-5 tomcat.nsi
yoavs 2004/08/31 12:51:22 Modified:.tomcat.nsi Log: Replaced 5.0 with 5.5 to reflect Tomcat branch. Revision ChangesPath 1.49 +23 -23jakarta-tomcat-5/tomcat.nsi Index: tomcat.nsi === RCS file: /home/cvs/jakarta-tomcat-5/tomcat.nsi,v retrieving revision 1.48 retrieving revision 1.49 diff -u -r1.48 -r1.49 --- tomcat.nsi26 Aug 2004 17:03:34 - 1.48 +++ tomcat.nsi31 Aug 2004 19:51:22 - 1.49 @@ -86,7 +86,7 @@ !insertmacro MUI_LANGUAGE English ;Folder-select dialog - InstallDir $PROGRAMFILES\Apache Software Foundation\Tomcat 5.0 + InstallDir $PROGRAMFILES\Apache Software Foundation\Tomcat 5.5 ;Install types InstType Normal @@ -94,7 +94,7 @@ InstType Full ; Main registry key - InstallDirRegKey HKLM SOFTWARE\Apache Software Foundation\Tomcat\5.0 + InstallDirRegKey HKLM SOFTWARE\Apache Software Foundation\Tomcat\5.5 !insertmacro MUI_RESERVEFILE_INSTALLOPTIONS ReserveFile jvm.ini @@ -143,7 +143,7 @@ IfSilent +2 0 !insertmacro MUI_INSTALLOPTIONS_READ $2 jvm.ini Field 2 State -; CopyFiles /SILENT $2\lib\tools.jar $INSTDIR\common\lib 4500 +; CopyFiles /SILENT $2\lib\tools.jar $INSTDIR\common\lib 45.5 ClearErrors Call configure @@ -201,36 +201,36 @@ !insertmacro MUI_INSTALLOPTIONS_READ $2 jvm.ini Field 2 State - SetOutPath $SMPROGRAMS\Apache Tomcat 5.0 + SetOutPath $SMPROGRAMS\Apache Tomcat 5.5 - CreateShortCut $SMPROGRAMS\Apache Tomcat 5.0\Tomcat Home Page.lnk \ + CreateShortCut $SMPROGRAMS\Apache Tomcat 5.5\Tomcat Home Page.lnk \ http://jakarta.apache.org/tomcat; - CreateShortCut $SMPROGRAMS\Apache Tomcat 5.0\Welcome.lnk \ + CreateShortCut $SMPROGRAMS\Apache Tomcat 5.5\Welcome.lnk \ http://127.0.0.1:$R0/; - CreateShortCut $SMPROGRAMS\Apache Tomcat 5.0\Tomcat Administration.lnk \ + CreateShortCut $SMPROGRAMS\Apache Tomcat 5.5\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 \ + CreateShortCut $SMPROGRAMS\Apache Tomcat 5.5\Tomcat Documentation.lnk \ $INSTDIR\webapps\tomcat-docs\index.html NoDocumentaion: - CreateShortCut $SMPROGRAMS\Apache Tomcat 5.0\Uninstall Tomcat 5.0.lnk \ + CreateShortCut $SMPROGRAMS\Apache Tomcat 5.5\Uninstall Tomcat 5.5.lnk \ $INSTDIR\Uninstall.exe - CreateShortCut $SMPROGRAMS\Apache Tomcat 5.0\Tomcat 5.0 Program Directory.lnk \ + CreateShortCut $SMPROGRAMS\Apache Tomcat 5.5\Tomcat 5.5 Program Directory.lnk \ $INSTDIR - CreateShortCut $SMPROGRAMS\Apache Tomcat 5.0\Monitor Tomcat.lnk \ + CreateShortCut $SMPROGRAMS\Apache Tomcat 5.5\Monitor Tomcat.lnk \ $INSTDIR\bin\tomcat5w.exe \ '//MS//Tomcat5' \ $INSTDIR\tomcat.ico 0 SW_SHOWNORMAL - CreateShortCut $SMPROGRAMS\Apache Tomcat 5.0\Configure Tomcat.lnk \ + CreateShortCut $SMPROGRAMS\Apache Tomcat 5.5\Configure Tomcat.lnk \ $INSTDIR\bin\tomcat5w.exe \ '//ES//Tomcat5' \ $INSTDIR\tomcat.ico 0 SW_SHOWNORMAL @@ -283,11 +283,11 @@ WriteUninstaller $INSTDIR\Uninstall.exe - WriteRegStr HKLM SOFTWARE\Apache Software Foundation\Tomcat\5.0 InstallPath $INSTDIR - WriteRegStr HKLM SOFTWARE\Apache Software Foundation\Tomcat\5.0 Version @VERSION@ - 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 \ + WriteRegStr HKLM SOFTWARE\Apache Software Foundation\Tomcat\5.5 InstallPath $INSTDIR + WriteRegStr HKLM SOFTWARE\Apache Software Foundation\Tomcat\5.5 Version @VERSION@ + WriteRegStr HKLM Software\Microsoft\Windows\CurrentVersion\Uninstall\Apache Tomcat 5.5 \ + DisplayName Apache Tomcat 5.5 (remove only) + WriteRegStr HKLM Software\Microsoft\Windows\CurrentVersion\Uninstall\Apache Tomcat 5.5 \ UninstallString '$INSTDIR\Uninstall.exe' SectionEnd @@ -566,9 +566,9 @@ ClearErrors DeleteRegKey HKCR JSPFile - DeleteRegKey HKLM Software\Microsoft\Windows\CurrentVersion\Uninstall\Apache Tomcat 5.0 - DeleteRegKey HKLM SOFTWARE\Apache Software Foundation\Tomcat\5.0 - RMDir /r $SMPROGRAMS\Apache Tomcat 5.0 + DeleteRegKey HKLM Software\Microsoft\Windows\CurrentVersion\Uninstall\Apache Tomcat 5.5 + DeleteRegKey HKLM SOFTWARE\Apache Software Foundation\Tomcat\5.5 + RMDir /r $SMPROGRAMS\Apache Tomcat
Re: cvs commit: jakarta-tomcat-5 tomcat.nsi
[EMAIL PROTECTED] wrote: -; CopyFiles /SILENT $2\lib\tools.jar $INSTDIR\common\lib 4500 +; CopyFiles /SILENT $2\lib\tools.jar $INSTDIR\common\lib 45.5 Looks like search-replace? MT. smime.p7s Description: S/MIME Cryptographic Signature
cvs commit: jakarta-tomcat-5 tomcat.nsi
mturk 2004/08/21 08:31:53 Modified:.tomcat.nsi Log: Fix bug #30359 setting tmpdir to INSTDIR\temp Revision ChangesPath 1.47 +2 -2 jakarta-tomcat-5/tomcat.nsi Index: tomcat.nsi === RCS file: /home/cvs/jakarta-tomcat-5/tomcat.nsi,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- tomcat.nsi16 Aug 2004 23:52:11 - 1.46 +++ tomcat.nsi21 Aug 2004 15:31:53 - 1.47 @@ -248,7 +248,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 --StdOutput $INSTDIR\logs\stdout.log --StdError $INSTDIR\logs\stderr.log' + 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 - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-5 tomcat.nsi
markt 2004/05/22 13:43:35 Modified:.tomcat.nsi Log: Fix bug 15798. Install fails if '' appears in admin user name or password. Ported from TC4. Revision ChangesPath 1.45 +25 -2 jakarta-tomcat-5/tomcat.nsi Index: tomcat.nsi === RCS file: /home/cvs/jakarta-tomcat-5/tomcat.nsi,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- tomcat.nsi25 Apr 2004 12:35:55 - 1.44 +++ tomcat.nsi22 May 2004 20:43:35 - 1.45 @@ -22,6 +22,8 @@ VIProductVersion @[EMAIL PROTECTED] !include MUI.nsh +!include StrFunc.nsh +${StrRep} ; ;Configuration @@ -426,9 +428,19 @@ IfSilent 0 +2 StrCpy $R5 '' - IfSilent +2 0 + IfSilent Silent 0 + + ; Escape XML + Push $R1 + Call xmlEscape + Pop $R1 + Push $R2 + Call xmlEscape + Pop $R2 + StrCpy $R5 'user name=$R1 password=$R2 roles=admin,manager /' +Silent: DetailPrint 'HTTP/1.1 Connector configured on port $R0' DetailPrint 'Admin user added: $R1' @@ -450,6 +462,7 @@ DetailPrint server.xml written ; Build final tomcat-users.xml + Delete $INSTDIR\conf\tomcat-users.xml FileOpen $R9 $INSTDIR\conf\tomcat-users.xml w @@ -465,6 +478,16 @@ RMDir /r $TEMP\confinstall +FunctionEnd + + +Function xmlEscape + Pop $0 + ${StrRep} $0 $0 amp; + ${StrRep} $0 $0 $\ quot; + ${StrRep} $0 $0 lt; + ${StrRep} $0 $0 gt; + Push $0 FunctionEnd - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-5 tomcat.nsi
remm2004/04/25 05:35:55 Modified:.tomcat.nsi Log: - Add apparently missing read, so that the service uses the same JVM path as the rest (in case the user manually selects a different VM). Revision ChangesPath 1.44 +7 -1 jakarta-tomcat-5/tomcat.nsi Index: tomcat.nsi === RCS file: /home/cvs/jakarta-tomcat-5/tomcat.nsi,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- tomcat.nsi7 Apr 2004 11:33:40 - 1.43 +++ tomcat.nsi25 Apr 2004 12:35:55 - 1.44 @@ -135,6 +135,12 @@ Call configure Call findJavaPath + Pop $2 + + IfSilent +2 0 + !insertmacro MUI_INSTALLOPTIONS_READ $2 jvm.ini Field 2 State + + Push $2 Call findJVMPath Pop $2 - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-5 tomcat.nsi build.xml
mturk 2004/04/07 04:33:40 Modified:.tomcat.nsi build.xml Log: Use the new Procrun 2.0 Revision ChangesPath 1.43 +20 -14jakarta-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.nsi11 Feb 2004 12:54:30 - 1.42 +++ tomcat.nsi7 Apr 2004 11:33:40 - 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 - 1.182 +++ build.xml 7 Apr 2004 11:33:40 - 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 +
Re: cvs commit: jakarta-tomcat-5 tomcat.nsi build.xml
[EMAIL PROTECTED] wrote: mturk 2004/04/07 04:33:40 Modified:.tomcat.nsi build.xml Log: Use the new Procrun 2.0 The new procrun looks professional. It seems really good quality overall (I do have a bad feeling about Win9x). The log viewer is gone though. Rémy - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
RE: cvs commit: jakarta-tomcat-5 tomcat.nsi build.xml
-Original Message- From: Remy Maucherat The new procrun looks professional. It's been cooking for over a year and I've tried to do my best :) It seems really good quality overall (I do have a bad feeling about Win9x). The log viewer is gone though. Win9x is not supported (lack of interest and test platform). Since procrun now consist of two parts (lib and applications) it wouldn't be a problem to support that. But I'm +0 on supporting Win9x cause it's a NT kind of a application. Log viewer is gone, cause it was not local language independent, and it required additional sources in j-t-c. Now there is only monitor (like ApacheMonitor), that can be used to monitor the service. Perhaps like in Apache2 it should be run at startup. The major change is in configuration GUI that now supports all the configurable options, and in the fact that the java.exe is not needed any more. There are two additional apps (apsvcmgr for monitoring all the services with the options to filter particular services) and jar2exe that can make an .exe from .jar file. I was able to run the entire Tomcat from single .exe (although the usability of such application is questionable :). Few things remains (mostly cosmetic) open, like shutting down monitor when the service is deleted (for uninstall purposes) etc. Also I've changed the installation to use the jvm from detected JAVA_HOME (not the default one set in registry) so it should finally act the same way as started from startup.bat Further more the binaries now reflects the service name, so just double clicking on the application will call the default action (running in debug mode and configuration editing). MT. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-5 tomcat.nsi
remm2004/02/11 04:54:30 Modified:.tomcat.nsi Log: - Add support for silent installations. Revision ChangesPath 1.42 +23 -1 jakarta-tomcat-5/tomcat.nsi Index: tomcat.nsi === RCS file: /home/cvs/jakarta-tomcat-5/tomcat.nsi,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- tomcat.nsi1 Feb 2004 18:27:28 - 1.41 +++ tomcat.nsi11 Feb 2004 12:54:30 - 1.42 @@ -105,6 +105,7 @@ SectionIn 1 2 3 + IfSilent +2 0 Call checkJvm SetOutPath $INSTDIR @@ -122,7 +123,13 @@ File /r webapps\balancer File /r webapps\ROOT + 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 @@ -136,7 +143,13 @@ SectionIn 3 + IfSilent 0 +3 + Call findJavaPath + Pop $2 + + IfSilent +2 0 !insertmacro MUI_INSTALLOPTIONS_READ $2 jvm.ini Field 2 State + Push $2 Call findJVMPath Pop $2 @@ -392,7 +405,16 @@ !insertmacro MUI_INSTALLOPTIONS_READ $R1 config.ini Field 5 State !insertmacro MUI_INSTALLOPTIONS_READ $R2 config.ini Field 7 State + IfSilent 0 +2 + StrCpy $R4 'port=8080' + + IfSilent +2 0 StrCpy $R4 'port=$R0' + + IfSilent 0 +2 + StrCpy $R5 '' + + IfSilent +2 0 StrCpy $R5 'user name=$R1 password=$R2 roles=admin,manager /' DetailPrint 'HTTP/1.1 Connector configured on port $R0' - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-5 tomcat.nsi
remm2003/12/27 09:32:23 Modified:.tomcat.nsi Log: - Add some metadata to the .exe. Revision ChangesPath 1.40 +14 -3 jakarta-tomcat-5/tomcat.nsi Index: tomcat.nsi === RCS file: /home/cvs/jakarta-tomcat-5/tomcat.nsi,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- tomcat.nsi26 Dec 2003 17:31:54 - 1.39 +++ tomcat.nsi27 Dec 2003 17:32:23 - 1.40 @@ -8,9 +8,20 @@ SetCompressor lzma SetDatablockOptimize on -!include MUI.nsh + Name Apache Tomcat + + ;Product information + VIAddVersionKey ProductName Apache Tomcat + VIAddVersionKey CompanyName Apache Software Foundation + VIAddVersionKey LegalCopyright Copyright (c) 1999-2004 The Apache Software Foundation + VIAddVersionKey FileDescription Apache Tomcat Installer + VIAddVersionKey FileVersion 2.0 + VIAddVersionKey ProductVersion @VERSION@ + VIAddVersionKey Comments jakarta.apache.org/tomcat + VIAddVersionKey InternalName [EMAIL PROTECTED]@.exe + VIProductVersion @[EMAIL PROTECTED] -Name Apache Tomcat +!include MUI.nsh ; ;Configuration - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-5 tomcat.nsi
remm2003/11/25 06:16:53 Modified:.tomcat.nsi Log: - Include the balancer webapp. Revision ChangesPath 1.38 +3 -1 jakarta-tomcat-5/tomcat.nsi Index: tomcat.nsi === RCS file: /home/cvs/jakarta-tomcat-5/tomcat.nsi,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- tomcat.nsi5 Nov 2003 11:40:04 - 1.37 +++ tomcat.nsi25 Nov 2003 14:16:52 - 1.38 @@ -122,6 +122,7 @@ File /r work File /r temp SetOutPath $INSTDIR\webapps + File /r webapps\balancer File /r webapps\ROOT !insertmacro MUI_INSTALLOPTIONS_READ $2 jvm.ini Field 2 State @@ -487,6 +488,7 @@ RMDir /r $INSTDIR\shared RMDir $INSTDIR\logs RMDir /r $INSTDIR\server + RMDir /r $INSTDIR\webapps\balancer RMDir /r $INSTDIR\webapps\ROOT RMDir /r $INSTDIR\webapps\tomcat-docs RMDir /r $INSTDIR\webapps\servlets-examples - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-5 tomcat.nsi
remm2003/11/05 03:40:04 Modified:.tomcat.nsi Log: - Remove useCanonCaches (the JDK behavior should be ok by default now). Revision ChangesPath 1.37 +2 -2 jakarta-tomcat-5/tomcat.nsi Index: tomcat.nsi === RCS file: /home/cvs/jakarta-tomcat-5/tomcat.nsi,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- tomcat.nsi29 Sep 2003 13:16:08 - 1.36 +++ tomcat.nsi5 Nov 2003 11:40:04 - 1.37 @@ -222,7 +222,7 @@ Section -post - ExecWait '$INSTDIR\bin\tomcatw.exe //US//Tomcat5 --JavaOptions -Dcatalina.home=\$INSTDIR\#-Djava.endorsed.dirs=\$INSTDIR\common\endorsed\#-Dsun.io.useCanonCaches=false#-Xrs --StdOutputFile $INSTDIR\logs\stdout.log --StdErrorFile $INSTDIR\logs\stderr.log --WorkingPath $INSTDIR' + 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' WriteUninstaller $INSTDIR\Uninstall.exe - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-5 tomcat.nsi
remm2003/09/29 06:16:08 Modified:.tomcat.nsi Log: - Group should actually not be used. I misunderstood Mladen's instructions. Revision ChangesPath 1.36 +2 -2 jakarta-tomcat-5/tomcat.nsi Index: tomcat.nsi === RCS file: /home/cvs/jakarta-tomcat-5/tomcat.nsi,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- tomcat.nsi29 Sep 2003 10:27:40 - 1.35 +++ tomcat.nsi29 Sep 2003 13:16:08 - 1.36 @@ -130,7 +130,7 @@ Call configure - ExecWait '$INSTDIR\bin\tomcatw.exe //IS//Tomcat5 --Group Tomcat --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' + 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' SectionEnd - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-5 tomcat.nsi
remm2003/06/16 14:15:41 Modified:.tomcat.nsi Log: - The XML desriptors have moved. Revision ChangesPath 1.34 +1 -3 jakarta-tomcat-5/tomcat.nsi Index: tomcat.nsi === RCS file: /home/cvs/jakarta-tomcat-5/tomcat.nsi,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- tomcat.nsi8 Jun 2003 10:21:11 - 1.33 +++ tomcat.nsi16 Jun 2003 21:15:40 - 1.34 @@ -122,7 +122,6 @@ File /r work File /r temp SetOutPath $INSTDIR\webapps - File webapps\*.xml File /r webapps\ROOT !insertmacro MUI_INSTALLOPTIONS_READ $2 jvm.ini Field 2 State @@ -488,7 +487,6 @@ RMDir /r $INSTDIR\shared RMDir $INSTDIR\logs RMDir /r $INSTDIR\server - Delete $INSTDIR\webapps\*.xml RMDir /r $INSTDIR\webapps\ROOT RMDir /r $INSTDIR\webapps\tomcat-docs RMDir /r $INSTDIR\webapps\servlets-examples - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-5 tomcat.nsi
remm2003/06/08 03:21:12 Modified:.tomcat.nsi Log: - Procrun only behaves well if -Xrs is used. Thanks to Mladen for finding this out. See bug 20263. - Use a non versioned display name for the service name. Revision ChangesPath 1.33 +3 -3 jakarta-tomcat-5/tomcat.nsi Index: tomcat.nsi === RCS file: /home/cvs/jakarta-tomcat-5/tomcat.nsi,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- tomcat.nsi3 May 2003 16:26:53 - 1.32 +++ tomcat.nsi8 Jun 2003 10:21:11 - 1.33 @@ -131,7 +131,7 @@ Call configure - ExecWait '$INSTDIR\bin\tomcatw.exe //IS//Tomcat5 --DisplayName Apache Tomcat @VERSION@ --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 --Startup manual' + 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' SectionEnd @@ -223,7 +223,7 @@ Section -post - ExecWait '$INSTDIR\bin\tomcatw.exe //US//Tomcat5 --JavaOptions -Dcatalina.home=\$INSTDIR\#-Djava.endorsed.dirs=\$INSTDIR\common\endorsed\ --StdOutputFile $INSTDIR\logs\stdout.log --StdErrorFile $INSTDIR\logs\stderr.log --WorkingPath $INSTDIR' + 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' WriteUninstaller $INSTDIR\Uninstall.exe - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-5 tomcat.nsi
remm2003/03/26 04:14:34 Modified:.tomcat.nsi Log: - Update to NSIS 2.0 b3. Revision ChangesPath 1.29 +7 -7 jakarta-tomcat-5/tomcat.nsi Index: tomcat.nsi === RCS file: /home/cvs/jakarta-tomcat-5/tomcat.nsi,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- tomcat.nsi13 Mar 2003 16:01:53 - 1.28 +++ tomcat.nsi26 Mar 2003 12:14:34 - 1.29 @@ -2,6 +2,12 @@ ; Tomcat script for Nullsoft Installer ; $Id$ + ;Compression options + CRCCheck on + SetCompress force + SetCompressor bzip2 + SetDatablockOptimize on + !include MUI.nsh !define MUI_PRODUCT Apache Tomcat @@ -39,12 +45,6 @@ ;General OutFile tomcat-installer.exe - - ;Compression options - CRCCheck on - SetCompress force - SetCompressor bzip2 - SetDatablockOptimize on ;Install Options pages LangString TEXT_JVM_TITLE ${LANG_ENGLISH} Java Virtual Machine - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-5 tomcat.nsi
remm2003/03/13 08:01:53 Modified:.tomcat.nsi Log: - Remove the call to net stop. - Remove all dead service code (now all useless because procrun is good :-) ). Revision ChangesPath 1.28 +2 -40 jakarta-tomcat-5/tomcat.nsi Index: tomcat.nsi === RCS file: /home/cvs/jakarta-tomcat-5/tomcat.nsi,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- tomcat.nsi3 Mar 2003 22:38:54 - 1.27 +++ tomcat.nsi13 Mar 2003 16:01:53 - 1.28 @@ -466,41 +466,6 @@ FunctionEnd -; = -; StartService Function -; = -; -; Start Tomcat NT Service -; -Function startService - - IfFileExists $INSTDIR\bin\tomcat.exe 0 NoService - ExecWait 'net start Tomcat5' - BringToFront - - NoService: - -FunctionEnd - - -; = -; StopService Function -; = -; -; Stop Tomcat NT Service -; -Function un.stopService - - IfFileExists $INSTDIR\bin\tomcat.exe 0 NoService - ExecWait 'net stop Tomcat5' - Sleep 1000 - BringToFront - - NoService: - -FunctionEnd - - ; ;Uninstaller Section @@ -509,10 +474,7 @@ Delete $INSTDIR\modern.exe Delete $INSTDIR\Uninstall.exe - ; Stopping NT service (if in use) - Call un.stopService - - ;ExecWait '$INSTDIR\bin\tomcat.exe -uninstall Apache Tomcat 5.0' + ; Delete Tomcat service ExecWait '$INSTDIR\bin\tomcatw.exe //DS//Tomcat5' ClearErrors - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-5 tomcat.nsi
remm2003/03/03 14:38:54 Modified:.tomcat.nsi Log: - Work around an apparent bug in procrun. Revision ChangesPath 1.27 +3 -3 jakarta-tomcat-5/tomcat.nsi Index: tomcat.nsi === RCS file: /home/cvs/jakarta-tomcat-5/tomcat.nsi,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- tomcat.nsi28 Feb 2003 22:11:40 - 1.26 +++ tomcat.nsi3 Mar 2003 22:38:54 - 1.27 @@ -134,8 +134,6 @@ ExecWait '$INSTDIR\bin\tomcatw.exe //IS//Tomcat5 --DisplayName Apache Tomcat @VERSION@ --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 --Startup manual' - ExecWait '$INSTDIR\bin\tomcatw.exe //US//Tomcat5 --JavaOptions -Dcatalina.home=\$INSTDIR\#-Djava.endorsed.dirs=\$INSTDIR\common\endorsed\ --StdOutputFile $INSTDIR\logs\stdout.log --StdErrorFile $INSTDIR\logs\stderr.log --WorkingPath $INSTDIR' - SectionEnd Section Service SecTomcatService @@ -221,6 +219,8 @@ SectionEnd Section -post + + ExecWait '$INSTDIR\bin\tomcatw.exe //US//Tomcat5 --JavaOptions -Dcatalina.home=\$INSTDIR\#-Djava.endorsed.dirs=\$INSTDIR\common\endorsed\ --StdOutputFile $INSTDIR\logs\stdout.log --StdErrorFile $INSTDIR\logs\stderr.log --WorkingPath $INSTDIR' SetOutPath $INSTDIR File ${NSISDIR}\Contrib\UIs\modern.exe - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-5 tomcat.nsi
remm2003/02/28 14:11:40 Modified:.tomcat.nsi Log: - Removed old laucher based link. Revision ChangesPath 1.26 +1 -6 jakarta-tomcat-5/tomcat.nsi Index: tomcat.nsi === RCS file: /home/cvs/jakarta-tomcat-5/tomcat.nsi,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- tomcat.nsi19 Feb 2003 07:59:19 - 1.25 +++ tomcat.nsi28 Feb 2003 22:11:40 - 1.26 @@ -207,11 +207,6 @@ '//GT//Tomcat5' \ $INSTDIR\tomcat.ico 0 SW_SHOWNORMAL - CreateShortCut $SMPROGRAMS\Apache Tomcat 5.0\Start Tomcat (old).lnk \ - $2\bin\java.exe \ - '-Duser.dir=$INSTDIR\bin LauncherBootstrap -launchfile catalina.xml catalina start' \ - $INSTDIR\tomcat.ico 0 SW_SHOWNORMAL - SectionEnd Section Examples SecExamples - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-5 tomcat.nsi
remm2003/02/18 23:59:20 Modified:.tomcat.nsi Log: - Further tweaks. Revision ChangesPath 1.25 +7 -7 jakarta-tomcat-5/tomcat.nsi Index: tomcat.nsi === RCS file: /home/cvs/jakarta-tomcat-5/tomcat.nsi,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- tomcat.nsi17 Feb 2003 13:05:11 - 1.24 +++ tomcat.nsi19 Feb 2003 07:59:19 - 1.25 @@ -72,7 +72,7 @@ ;Descriptions LangString DESC_SecTomcat ${LANG_ENGLISH} Install the Tomcat Servlet container. LangString DESC_SecTomcatCore ${LANG_ENGLISH} Install the Tomcat Servlet container core. -LangString DESC_SecTomcatService ${LANG_ENGLISH} Install the Tomcat service, used to automatically start Tomcat in the background when the computer is started. This requires Windows NT 4.0, Windows 2000 or Windows XP. +LangString DESC_SecTomcatService ${LANG_ENGLISH} Automatically start Tomcat when the computer is started. This requires Windows NT 4.0, Windows 2000 or Windows XP. LangString DESC_SecTomcatSource ${LANG_ENGLISH} Install the Tomcat source code. LangString DESC_SecTomcatDocs ${LANG_ENGLISH} Install the Tomcat documentation bundle. This include documentation on the servlet container and its configuration options, on the Jasper JSP page compiler, as well as on the native webserver connectors. LangString DESC_SecMenu ${LANG_ENGLISH} Create a Start Menu program group for Tomcat. @@ -202,14 +202,14 @@ CreateShortCut $SMPROGRAMS\Apache Tomcat 5.0\Tomcat 5.0 Program Directory.lnk \ $INSTDIR - CreateShortCut $SMPROGRAMS\Apache Tomcat 5.0\Start Tomcat (old).lnk \ - $2\bin\java.exe \ - '-Duser.dir=$INSTDIR\bin LauncherBootstrap -launchfile catalina.xml catalina start' \ - $INSTDIR\tomcat.ico 0 SW_SHOWNORMAL - CreateShortCut $SMPROGRAMS\Apache Tomcat 5.0\Start Tomcat.lnk \ $INSTDIR\bin\tomcatw.exe \ '//GT//Tomcat5' \ + $INSTDIR\tomcat.ico 0 SW_SHOWNORMAL + + CreateShortCut $SMPROGRAMS\Apache Tomcat 5.0\Start Tomcat (old).lnk \ + $2\bin\java.exe \ + '-Duser.dir=$INSTDIR\bin LauncherBootstrap -launchfile catalina.xml catalina start' \ $INSTDIR\tomcat.ico 0 SW_SHOWNORMAL SectionEnd - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-5 tomcat.nsi
remm2003/02/17 05:05:11 Modified:.tomcat.nsi Log: - Makes procrun work. - There's some unknown problem with Jasper, though (it apparently fails to find the compiler). Revision ChangesPath 1.24 +14 -7 jakarta-tomcat-5/tomcat.nsi Index: tomcat.nsi === RCS file: /home/cvs/jakarta-tomcat-5/tomcat.nsi,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- tomcat.nsi17 Feb 2003 07:43:42 - 1.23 +++ tomcat.nsi17 Feb 2003 13:05:11 - 1.24 @@ -13,6 +13,9 @@ !define MUI_WELCOMEPAGE !define MUI_FINISHPAGE !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_NOREBOOTSUPPORT !define MUI_LICENSEPAGE @@ -129,6 +132,10 @@ Call configure + ExecWait '$INSTDIR\bin\tomcatw.exe //IS//Tomcat5 --DisplayName Apache Tomcat @VERSION@ --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 --Startup manual' + + ExecWait '$INSTDIR\bin\tomcatw.exe //US//Tomcat5 --JavaOptions -Dcatalina.home=\$INSTDIR\#-Djava.endorsed.dirs=\$INSTDIR\common\endorsed\ --StdOutputFile $INSTDIR\logs\stdout.log --StdErrorFile $INSTDIR\logs\stderr.log --WorkingPath $INSTDIR' + SectionEnd Section Service SecTomcatService @@ -140,7 +147,7 @@ Call findJVMPath Pop $2 - ExecWait '$INSTDIR\bin\tomcat.exe //IS//Tomcat5 --DisplayName Apache Tomcat @VERSION@ --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 auto --JavaOptions -Djava.endorsed.dirs=$INSTDIR\common\endorsed#-Dcatalina.home=$INSTDIR --StdOutputFile $INSTDIR\logs\stdout.log --StdErrorFile $INSTDIR\logs\stderr.log --WorkingPath $INSTDIR' + ExecWait '$INSTDIR\bin\tomcatw.exe //US//Tomcat5 --Startup auto' BringToFront ClearErrors @@ -195,15 +202,15 @@ CreateShortCut $SMPROGRAMS\Apache Tomcat 5.0\Tomcat 5.0 Program Directory.lnk \ $INSTDIR - CreateShortCut $SMPROGRAMS\Apache Tomcat 5.0\Start Tomcat.lnk \ + CreateShortCut $SMPROGRAMS\Apache Tomcat 5.0\Start Tomcat (old).lnk \ $2\bin\java.exe \ '-Duser.dir=$INSTDIR\bin LauncherBootstrap -launchfile catalina.xml catalina start' \ $INSTDIR\tomcat.ico 0 SW_SHOWNORMAL - CreateShortCut $SMPROGRAMS\Apache Tomcat 5.0\Stop Tomcat.lnk \ - $2\bin\java.exe \ - '-Duser.dir=$INSTDIR\bin LauncherBootstrap -launchfile catalina.xml catalina stop' \ - $INSTDIR\tomcat.ico 0 SW_SHOWMINIMIZED + CreateShortCut $SMPROGRAMS\Apache Tomcat 5.0\Start Tomcat.lnk \ + $INSTDIR\bin\tomcatw.exe \ + '//GT//Tomcat5' \ + $INSTDIR\tomcat.ico 0 SW_SHOWNORMAL SectionEnd - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-5 tomcat.nsi
remm2003/02/16 23:43:42 Modified:.tomcat.nsi Log: - Small update. The command lines used seem correct. - However, neither JavaOptions nor WorkingPath seem to have any effect, which causes the service to fail on startup. Revision ChangesPath 1.23 +7 -10 jakarta-tomcat-5/tomcat.nsi Index: tomcat.nsi === RCS file: /home/cvs/jakarta-tomcat-5/tomcat.nsi,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- tomcat.nsi16 Feb 2003 18:28:48 - 1.22 +++ tomcat.nsi17 Feb 2003 07:43:42 - 1.23 @@ -76,7 +76,7 @@ LangString DESC_SecExamples ${LANG_ENGLISH} Installs some examples web applications. ;Folder-select dialog - InstallDir $PROGRAMFILES\Apache Group\Tomcat 5.0 + InstallDir $PROGRAMFILES\Apache Software Foundation\Tomcat 5.0 ;Install types InstType Normal @@ -84,7 +84,7 @@ InstType Full ; Main registry key - InstallDirRegKey HKLM SOFTWARE\Apache Group\Tomcat\5.0 + InstallDirRegKey HKLM SOFTWARE\Apache Software Foundation\Tomcat\5.0 !insertmacro MUI_RESERVEFILE_WELCOMEFINISHPAGE !insertmacro MUI_RESERVEFILE_INSTALLOPTIONS @@ -140,11 +140,7 @@ Call findJVMPath Pop $2 - ExecWait '$INSTDIR\bin\tomcatw.exe //IS//Tomcat5 --DisplayName Apache Tomcat @VERSION@ --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 auto --JavaOptions -Djava.endorsed.dirs=$INSTDIR\common\endorsed#-Dcatalina.home=$INSTDIR --StdOutputFile $INSTDIR\logs\stdout.log --StdErrorFile $INSTDIR\logs\stderr.log --WorkingPath $INSTDIR' - - ;ExecWait '$INSTDIR\bin\tomcatw.exe //US//Tomcat5 --ImagePath $INSTDIR\bin\bootstrap.jar --StartupClass org.apache.catalina.startup.Bootstrap;main;start --ShutdownClass org.apache.catalina.startup.Bootstrap;main;stop --Java auto --StdOutputFile $INSTDIR\logs\stdout.log --StdErrorFile $INSTDIR\logs\stderr.log --WorkingPath $INSTDIR' - -;--JavaOptions -Djava.endorsed.dirs=$INSTDIR\common\endorsed#-Dcatalina.home=$INSTDIR + ExecWait '$INSTDIR\bin\tomcat.exe //IS//Tomcat5 --DisplayName Apache Tomcat @VERSION@ --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 auto --JavaOptions -Djava.endorsed.dirs=$INSTDIR\common\endorsed#-Dcatalina.home=$INSTDIR --StdOutputFile $INSTDIR\logs\stdout.log --StdErrorFile $INSTDIR\logs\stderr.log --WorkingPath $INSTDIR' BringToFront ClearErrors @@ -229,7 +225,8 @@ WriteUninstaller $INSTDIR\Uninstall.exe - WriteRegStr HKLM SOFTWARE\Apache Group\Tomcat\5.0 $INSTDIR + WriteRegStr HKLM SOFTWARE\Apache Software Foundation\Tomcat\5.0 InstallPath $INSTDIR + WriteRegStr HKLM SOFTWARE\Apache Software Foundation\Tomcat\5.0 Version @VERSION@ 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 \ @@ -519,7 +516,7 @@ DeleteRegKey HKCR JSPFile DeleteRegKey HKLM Software\Microsoft\Windows\CurrentVersion\Uninstall\Apache Tomcat 5.0 - DeleteRegKey HKLM SOFTWARE\Apache Group\Tomcat\5.0 + DeleteRegKey HKLM SOFTWARE\Apache Software Foundation\Tomcat\5.0 RMDir /r $SMPROGRAMS\Apache Tomcat 5.0 Delete $INSTDIR\tomcat.ico Delete $INSTDIR\LICENSE - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-5 tomcat.nsi
remm2003/02/13 06:45:44 Modified:.tomcat.nsi Log: - Changes to NSIS 2.0 Beta 1. I got off easy this time, apparently, they decided to keep the macro set stable now. Revision ChangesPath 1.21 +7 -7 jakarta-tomcat-5/tomcat.nsi Index: tomcat.nsi === RCS file: /home/cvs/jakarta-tomcat-5/tomcat.nsi,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- tomcat.nsi10 Dec 2002 19:40:08 - 1.20 +++ tomcat.nsi13 Feb 2003 14:45:44 - 1.21 @@ -2,13 +2,11 @@ ; Tomcat script for Nullsoft Installer ; $Id$ +!include MUI.nsh + !define MUI_PRODUCT Apache Tomcat !define MUI_VERSION @VERSION@ -!define MUI_NAME ${MUI_PRODUCT} ${MUI_VERSION} - -!include ${NSISDIR}\Contrib\Modern UI\System.nsh - ; ;Configuration @@ -30,6 +28,9 @@ !define TEMP1 $R0 !define TEMP2 $R1 + !define MUI_ICON tomcat.ico + !define MUI_UNICON tomcat.ico + ;Language !insertmacro MUI_LANGUAGE English @@ -85,9 +86,8 @@ ; Main registry key InstallDirRegKey HKLM SOFTWARE\Apache Group\Tomcat\5.0 + !insertmacro MUI_RESERVEFILE_WELCOMEFINISHPAGE !insertmacro MUI_RESERVEFILE_INSTALLOPTIONS - !insertmacro MUI_RESERVEFILE_SPECIALINI - !insertmacro MUI_RESERVEFILE_SPECIALBITMAP ReserveFile jvm.ini ReserveFile config.ini - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-5 tomcat.nsi
remm2002/12/10 11:40:08 Modified:.tomcat.nsi Log: - Fix uninstaller logic. Revision ChangesPath 1.20 +2 -6 jakarta-tomcat-5/tomcat.nsi Index: tomcat.nsi === RCS file: /home/cvs/jakarta-tomcat-5/tomcat.nsi,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- tomcat.nsi6 Dec 2002 09:17:07 - 1.19 +++ tomcat.nsi10 Dec 2002 19:40:08 - 1.20 @@ -25,6 +25,7 @@ !define MUI_CUSTOMPAGECOMMANDS !define MUI_UNINSTALLER + !define MUI_UNCONFIRMPAGE !define TEMP1 $R0 !define TEMP2 $R1 @@ -83,11 +84,6 @@ ; Main registry key InstallDirRegKey HKLM SOFTWARE\Apache Group\Tomcat\5.0 - - ;Uninstaller - !define MUI_UNCUSTOMPAGECOMMANDS - !insertmacro MUI_UNPAGECOMMAND_CONFIRM - !insertmacro MUI_UNPAGECOMMAND_INSTFILES !insertmacro MUI_RESERVEFILE_INSTALLOPTIONS !insertmacro MUI_RESERVEFILE_SPECIALINI -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-5 tomcat.nsi
remm2002/12/05 09:59:38 Modified:.tomcat.nsi Log: - Add cute welcome and finish pages. - This really looks like MSI, except it's a lot faster :) Revision ChangesPath 1.18 +15 -5 jakarta-tomcat-5/tomcat.nsi Index: tomcat.nsi === RCS file: /home/cvs/jakarta-tomcat-5/tomcat.nsi,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- tomcat.nsi15 Nov 2002 20:39:21 - 1.17 +++ tomcat.nsi5 Dec 2002 17:59:38 - 1.18 @@ -12,15 +12,20 @@ ; ;Configuration + !define MUI_WELCOMEPAGE + !define MUI_FINISHPAGE + !define MUI_FINISHPAGE_SHOWREADME $INSTDIR\webapps\ROOT\RELEASE-NOTES.txt + !define MUI_FINISHPAGE_NOREBOOTSUPPORT + !define MUI_LICENSEPAGE !define MUI_COMPONENTSPAGE !define MUI_DIRECTORYPAGE + !define MUI_ABORTWARNING + !define MUI_CUSTOMPAGECOMMANDS !define MUI_UNINSTALLER - !define MUI_CUSTOMPAGECOMMANDS - !define TEMP1 $R0 !define TEMP2 $R1 @@ -46,12 +51,14 @@ LangString TEXT_CONF_PAGETITLE ${LANG_ENGLISH} : Configuration Options ;Page order + !insertmacro MUI_PAGECOMMAND_WELCOME !insertmacro MUI_PAGECOMMAND_LICENSE !insertmacro MUI_PAGECOMMAND_COMPONENTS !insertmacro MUI_PAGECOMMAND_DIRECTORY Page custom SetConfiguration $(TEXT_CONF_PAGETITLE) Page custom SetChooseJVM $(TEXT_JVM_PAGETITLE) !insertmacro MUI_PAGECOMMAND_INSTFILES + !insertmacro MUI_PAGECOMMAND_FINISH ;License dialog LicenseData INSTALLLICENSE @@ -83,6 +90,8 @@ !insertmacro MUI_UNPAGECOMMAND_INSTFILES !insertmacro MUI_RESERVEFILE_INSTALLOPTIONS + !insertmacro MUI_RESERVEFILE_SPECIALINI + !insertmacro MUI_RESERVEFILE_SPECIALBITMAP ReserveFile jvm.ini ReserveFile config.ini @@ -216,9 +225,10 @@ SectionEnd -!insertmacro MUI_SECTIONS_FINISHHEADER - Section -post + + SetOutPath $INSTDIR + File ${NSISDIR}\Contrib\UIs\modern.exe WriteUninstaller $INSTDIR\Uninstall.exe -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-5 tomcat.nsi
remm2002/11/15 12:39:21 Modified:.tomcat.nsi Log: - Daily NSIS update. Revision ChangesPath 1.17 +2 -3 jakarta-tomcat-5/tomcat.nsi Index: tomcat.nsi === RCS file: /home/cvs/jakarta-tomcat-5/tomcat.nsi,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- tomcat.nsi14 Nov 2002 10:36:39 - 1.16 +++ tomcat.nsi15 Nov 2002 20:39:21 - 1.17 -19,7 +19,6 !define MUI_UNINSTALLER - !define MUI_WINDOWTITLE !define MUI_CUSTOMPAGECOMMANDS !define TEMP1 $R0 -83,7 +82,7 !insertmacro MUI_UNPAGECOMMAND_CONFIRM !insertmacro MUI_UNPAGECOMMAND_INSTFILES - ReserveFile ${NSISDIR}\Plugins\InstallOptions.dll + !insertmacro MUI_RESERVEFILE_INSTALLOPTIONS ReserveFile jvm.ini ReserveFile config.ini -- To unsubscribe, e-mail: mailto:tomcat-dev-unsubscribe;jakarta.apache.org For additional commands, e-mail: mailto:tomcat-dev-help;jakarta.apache.org
cvs commit: jakarta-tomcat-5 tomcat.nsi
remm2002/11/14 02:36:39 Modified:.tomcat.nsi Log: - Update to nightly (again). On the plus side, the result is getting really polished now (and much faster than usual MSI based installers). Revision ChangesPath 1.16 +12 -24jakarta-tomcat-5/tomcat.nsi Index: tomcat.nsi === RCS file: /home/cvs/jakarta-tomcat-5/tomcat.nsi,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- tomcat.nsi12 Nov 2002 08:02:24 - 1.15 +++ tomcat.nsi14 Nov 2002 10:36:39 - 1.16 -37,12 +37,21 SetCompressor bzip2 SetDatablockOptimize on + ;Install Options pages + LangString TEXT_JVM_TITLE ${LANG_ENGLISH} Java Virtual Machine + LangString TEXT_JVM_SUBTITLE ${LANG_ENGLISH} Java Virtual Machine path selection. + LangString TEXT_JVM_PAGETITLE ${LANG_ENGLISH} : Java Virtual Machine path selection + + LangString TEXT_CONF_TITLE ${LANG_ENGLISH} Configuration + LangString TEXT_CONF_SUBTITLE ${LANG_ENGLISH} Tomcat basic configuration. + LangString TEXT_CONF_PAGETITLE ${LANG_ENGLISH} : Configuration Options + ;Page order !insertmacro MUI_PAGECOMMAND_LICENSE !insertmacro MUI_PAGECOMMAND_COMPONENTS !insertmacro MUI_PAGECOMMAND_DIRECTORY - Page custom SetConfiguration - Page custom SetChooseJVM + Page custom SetConfiguration $(TEXT_CONF_PAGETITLE) + Page custom SetChooseJVM $(TEXT_JVM_PAGETITLE) !insertmacro MUI_PAGECOMMAND_INSTFILES ;License dialog -61,15 +70,6 ;Folder-select dialog InstallDir $PROGRAMFILES\Apache Group\Tomcat 5.0 - ;Install Options pages - LangString TEXT_JVM_TITLE ${LANG_ENGLISH} Java Virtual Machine - LangString TEXT_JVM_SUBTITLE ${LANG_ENGLISH} Java Virtual Machine path selection. - LangString TEXT_JVM_PAGETITLE ${LANG_ENGLISH} Java Virtual Machine path selection - - LangString TEXT_CONF_TITLE ${LANG_ENGLISH} Configuration - LangString TEXT_CONF_SUBTITLE ${LANG_ENGLISH} Tomcat basic configuration. - LangString TEXT_CONF_PAGETITLE ${LANG_ENGLISH} Tomcat 5 Configuration Options - ;Install types InstType Normal InstType Minimum -231,22 +231,16 WriteRegStr HKLM Software\Microsoft\Windows\CurrentVersion\Uninstall\Apache Tomcat 5.0 \ UninstallString '$INSTDIR\Uninstall.exe' - Sleep 500 BringToFront SectionEnd - Function .onInit ;Extract Install Options INI Files !insertmacro MUI_INSTALLOPTIONS_EXTRACT config.ini !insertmacro MUI_INSTALLOPTIONS_EXTRACT jvm.ini - ;Titles for Install Options dialogs - !insertmacro MUI_INSTALLOPTIONS_WRITETITLE config.ini $(TEXT_CONF_PAGETITLE) - !insertmacro MUI_INSTALLOPTIONS_WRITETITLE jvm.ini $(TEXT_JVM_PAGETITLE) - FunctionEnd Function SetChooseJVM -260,12 +254,6 Function SetConfiguration !insertmacro MUI_HEADER_TEXT $(TEXT_CONF_TITLE) $(TEXT_CONF_SUBTITLE) !insertmacro MUI_INSTALLOPTIONS_DISPLAY config.ini -FunctionEnd - -Function .onInstSuccess - - ExecShell open '$SMPROGRAMS\Apache Tomcat 5.0' - FunctionEnd ; -- To unsubscribe, e-mail: mailto:tomcat-dev-unsubscribe;jakarta.apache.org For additional commands, e-mail: mailto:tomcat-dev-help;jakarta.apache.org
cvs commit: jakarta-tomcat-5 tomcat.nsi
remm2002/11/12 00:02:24 Modified:.tomcat.nsi Log: - Update to NSIS nightly. Revision ChangesPath 1.15 +8 -12 jakarta-tomcat-5/tomcat.nsi Index: tomcat.nsi === RCS file: /home/cvs/jakarta-tomcat-5/tomcat.nsi,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- tomcat.nsi7 Nov 2002 16:26:57 - 1.14 +++ tomcat.nsi12 Nov 2002 08:02:24 - 1.15 -12,14 +12,14 ; ;Configuration - !define MUI_INSTALLOPTIONS - !define MUI_LICENSEPAGE !define MUI_COMPONENTSPAGE !define MUI_DIRECTORYPAGE !define MUI_ABORTWARNING + !define MUI_UNINSTALLER + !define MUI_WINDOWTITLE !define MUI_CUSTOMPAGECOMMANDS !define TEMP1 $R0 -247,23 +247,19 !insertmacro MUI_INSTALLOPTIONS_WRITETITLE config.ini $(TEXT_CONF_PAGETITLE) !insertmacro MUI_INSTALLOPTIONS_WRITETITLE jvm.ini $(TEXT_JVM_PAGETITLE) - ;Abort warnings for Install Options dialogs - !insertmacro MUI_INSTALLOPTIONS_WRITEABORTWARNING config.ini - !insertmacro MUI_INSTALLOPTIONS_WRITEABORTWARNING jvm.ini - FunctionEnd Function SetChooseJVM - !insertmacro MUI_HEADER_TEXT $(TEXT_JVM_TITLE) $(TEXT_JVM_SUBTITLE) + !insertmacro MUI_HEADER_TEXT $(TEXT_JVM_TITLE) $(TEXT_JVM_SUBTITLE) Call findJavaPath Pop $3 !insertmacro MUI_INSTALLOPTIONS_WRITE jvm.ini Field 2 State $3 - !insertmacro MUI_INSTALLOPTIONS_SHOW jvm.ini + !insertmacro MUI_INSTALLOPTIONS_DISPLAY jvm.ini FunctionEnd Function SetConfiguration - !insertmacro MUI_HEADER_TEXT $(TEXT_CONF_TITLE) $(TEXT_CONF_SUBTITLE) - !insertmacro MUI_INSTALLOPTIONS_SHOW config.ini + !insertmacro MUI_HEADER_TEXT $(TEXT_CONF_TITLE) $(TEXT_CONF_SUBTITLE) + !insertmacro MUI_INSTALLOPTIONS_DISPLAY config.ini FunctionEnd Function .onInstSuccess -275,7 +271,7 ; ;Descriptions -!insertmacro MUI_FUNCTIONS_DESCRIPTION_START +!insertmacro MUI_FUNCTIONS_DESCRIPTION_BEGIN !insertmacro MUI_DESCRIPTION_TEXT ${SecTomcat} $(DESC_SecTomcat) !insertmacro MUI_DESCRIPTION_TEXT ${SecTomcatCore} $(DESC_SecTomcatCore) !insertmacro MUI_DESCRIPTION_TEXT ${SecTomcatService} $(DESC_SecTomcatService) -- To unsubscribe, e-mail: mailto:tomcat-dev-unsubscribe;jakarta.apache.org For additional commands, e-mail: mailto:tomcat-dev-help;jakarta.apache.org
cvs commit: jakarta-tomcat-5 tomcat.nsi
remm2002/11/07 06:40:54 Modified:.tomcat.nsi Log: - Upgrade to latest NSIS 2 nightly (arg, I'm sick of it). - Remove some hacks (the macros are getting less messy). Revision ChangesPath 1.13 +72 -128 jakarta-tomcat-5/tomcat.nsi Index: tomcat.nsi === RCS file: /home/cvs/jakarta-tomcat-5/tomcat.nsi,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- tomcat.nsi29 Oct 2002 11:22:49 - 1.12 +++ tomcat.nsi7 Nov 2002 14:40:54 - 1.13 -2,8 +2,10 ; Tomcat script for Nullsoft Installer ; $Id$ -!define NAME Apache Tomcat -!define VERSION VERSION +!define MUI_PRODUCT Apache Tomcat +!define MUI_VERSION VERSION + +!define MUI_NAME ${MUI_PRODUCT} ${MUI_VERSION} !include ${NSISDIR}\Contrib\Modern UI\System.nsh -13,24 +15,21 !define MUI_INSTALLOPTIONS !define MUI_LICENSEPAGE - !define MUI_COMPONENTPAGE - !define MUI_DIRSELECTPAGE - !define MUI_INSTALLBUTTONTEXT_NEXT + !define MUI_COMPONENTSPAGE + !define MUI_DIRECTORYPAGE !define MUI_ABORTWARNING !define MUI_UNINSTALLER - !define MUI_SETPAGE_FUNCTIONNAME SetPage - !define MUI_UNSETPAGE_FUNCTIONNAME un.SetPage + !define MUI_CUSTOMPAGECOMMANDS + + !define TEMP1 $R0 + !define TEMP2 $R1 ;Language -;English -LoadLanguageFile ${NSISDIR}\Contrib\Language files\English.nlf -!include ${NSISDIR}\Contrib\Modern UI\Language files\English.nsh + !insertmacro MUI_LANGUAGE English ;General - Name ${NAME} ${VERSION} OutFile tomcat-installer.exe - BrandingText ${NAME} ${VERSION} Installer ;Compression options CRCCheck on -38,15 +37,39 SetCompressor bzip2 SetDatablockOptimize on - !insertmacro MUI_INTERFACE - !insertmacro MUI_INSTALLOPTIONS $7 $8 + ;Page order + !insertmacro MUI_PAGECOMMAND_LICENSE + !insertmacro MUI_PAGECOMMAND_COMPONENTS + !insertmacro MUI_PAGECOMMAND_DIRECTORY + Page custom SetConfiguration + Page custom SetChooseJVM + !insertmacro MUI_PAGECOMMAND_INSTFILES ;License dialog LicenseData INSTALLLICENSE + ;Component-selection page +;Descriptions +LangString DESC_SecTomcat ${LANG_ENGLISH} Install the Tomcat Servlet container. +LangString DESC_SecTomcatCore ${LANG_ENGLISH} Install the Tomcat Servlet container core. +LangString DESC_SecTomcatService ${LANG_ENGLISH} Install the Tomcat service, used to automatically start Tomcat in the background when the computer is started. This requires Windows NT 4.0, Windows 2000 or Windows XP. +LangString DESC_SecTomcatSource ${LANG_ENGLISH} Install the Tomcat source code. +LangString DESC_SecTomcatDocs ${LANG_ENGLISH} Install the Tomcat documentation bundle. This include documentation on the servlet container and its configuration options, on the Jasper JSP page compiler, as well as on the native webserver connectors. +LangString DESC_SecMenu ${LANG_ENGLISH} Create a Start Menu program group for Tomcat. +LangString DESC_SecExamples ${LANG_ENGLISH} Installs some examples web applications. + ;Folder-select dialog InstallDir $PROGRAMFILES\Apache Group\Tomcat 5.0 + ;Install Options pages + LangString TEXT_JVM_TITLE ${LANG_ENGLISH} Java Virtual Machine + LangString TEXT_JVM_SUBTITLE ${LANG_ENGLISH} Java Virtual Machine path selection. + LangString TEXT_JVM_PAGETITLE ${LANG_ENGLISH} Java Virtual Machine path selection + + LangString TEXT_CONF_TITLE ${LANG_ENGLISH} Configuration + LangString TEXT_CONF_SUBTITLE ${LANG_ENGLISH} Tomcat basic configuration. + LangString TEXT_CONF_PAGETITLE ${LANG_ENGLISH} Tomcat 5 Configuration Options + ;Install types InstType Normal InstType Minimum -55,16 +78,31 ; Main registry key InstallDirRegKey HKLM SOFTWARE\Apache Group\Tomcat\5.0 + ;Uninstaller + !define MUI_UNCUSTOMPAGECOMMANDS + !insertmacro MUI_UNPAGECOMMAND_CONFIRM + !insertmacro MUI_UNPAGECOMMAND_INSTFILES + ReserveFile ${NSISDIR}\Plugins\InstallOptions.dll ReserveFile jvm.ini ReserveFile config.ini +; +;Modern UI System + +!insertmacro MUI_SYSTEM + +; +;Installer Sections + SubSection Tomcat SecTomcat Section Core SecTomcatCore SectionIn 1 2 3 + Call checkJvm + SetOutPath $INSTDIR File tomcat.ico File LICENSE -179,12 +217,7 SectionEnd -Section - - ;Invisible section to display the Finish header - !insertmacro MUI_FINISHHEADER - -SectionEnd +!insertmacro MUI_SECTIONS_FINISHHEADER Section -post -206,123 +239,39 Function .onInit + ;Extract Install Options INI Files !insertmacro
cvs commit: jakarta-tomcat-5 tomcat.nsi
remm2002/11/07 08:26:57 Modified:.tomcat.nsi Log: - Add back component descriptions. Revision ChangesPath 1.14 +14 -1 jakarta-tomcat-5/tomcat.nsi Index: tomcat.nsi === RCS file: /home/cvs/jakarta-tomcat-5/tomcat.nsi,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- tomcat.nsi7 Nov 2002 14:40:54 - 1.13 +++ tomcat.nsi7 Nov 2002 16:26:57 - 1.14 -272,6 +272,19 FunctionEnd +; +;Descriptions + +!insertmacro MUI_FUNCTIONS_DESCRIPTION_START + !insertmacro MUI_DESCRIPTION_TEXT ${SecTomcat} $(DESC_SecTomcat) + !insertmacro MUI_DESCRIPTION_TEXT ${SecTomcatCore} $(DESC_SecTomcatCore) + !insertmacro MUI_DESCRIPTION_TEXT ${SecTomcatService} $(DESC_SecTomcatService) + !insertmacro MUI_DESCRIPTION_TEXT ${SecTomcatSource} $(DESC_SecTomcatSource) + !insertmacro MUI_DESCRIPTION_TEXT ${SecTomcatDocs} $(DESC_SecTomcatDocs) + !insertmacro MUI_DESCRIPTION_TEXT ${SecMenu} $(DESC_SecMenu) + !insertmacro MUI_DESCRIPTION_TEXT ${SecExamples} $(DESC_SecExamples) +!insertmacro MUI_FUNCTIONS_DESCRIPTION_END + ; = ; FindJavaPath Function -- To unsubscribe, e-mail: mailto:tomcat-dev-unsubscribe;jakarta.apache.org For additional commands, e-mail: mailto:tomcat-dev-help;jakarta.apache.org
cvs commit: jakarta-tomcat-5 tomcat.nsi
remm2002/10/26 07:20:47 Modified:.tomcat.nsi Log: - Use Bootstrap class for NT service. Revision ChangesPath 1.10 +2 -2 jakarta-tomcat-5/tomcat.nsi Index: tomcat.nsi === RCS file: /home/cvs/jakarta-tomcat-5/tomcat.nsi,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- tomcat.nsi9 Oct 2002 12:20:40 - 1.9 +++ tomcat.nsi26 Oct 2002 14:20:47 - 1.10 -89,7 +89,7 SetOutPath $INSTDIR\bin File /oname=tomcat.exe bin\tomcat.exe - ExecWait '$INSTDIR\bin\tomcat.exe -install Apache Tomcat 5.0 $2 -Djava.class.path=$INSTDIR\bin\bootstrap.jar -Dcatalina.home=$INSTDIR -Djava.endorsed.dirs=$INSTDIR\common\endorsed -start org.apache.catalina.startup.BootstrapService -params start -stop org.apache.catalina.startup.BootstrapService -params stop -out $INSTDIR\logs\stdout.log -err $INSTDIR\logs\stderr.log' + ExecWait '$INSTDIR\bin\tomcat.exe -install Apache Tomcat 5.0 $2 -Djava.class.path=$INSTDIR\bin\bootstrap.jar -Dcatalina.home=$INSTDIR -Djava.endorsed.dirs=$INSTDIR\common\endorsed -start org.apache.catalina.startup.Bootstrap -params startd -stop org.apache.catalina.startup.Bootstrap -params stopd -out $INSTDIR\logs\stdout.log -err $INSTDIR\logs\stderr.log' BringToFront ClearErrors -- To unsubscribe, e-mail: mailto:tomcat-dev-unsubscribe;jakarta.apache.org For additional commands, e-mail: mailto:tomcat-dev-help;jakarta.apache.org
cvs commit: jakarta-tomcat-5 tomcat.nsi
remm2002/08/11 08:10:25 Modified:.tomcat.nsi Log: - Use bz2 option. Revision ChangesPath 1.4 +2 -1 jakarta-tomcat-5/tomcat.nsi Index: tomcat.nsi === RCS file: /home/cvs/jakarta-tomcat-5/tomcat.nsi,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- tomcat.nsi11 Aug 2002 13:50:54 - 1.3 +++ tomcat.nsi11 Aug 2002 15:10:25 - 1.4 @@ -6,6 +6,7 @@ OutFile tomcat-installer.exe CRCCheck on SetCompress force +SetCompressor bzip2 SetDatablockOptimize on BGGradient 00 80 FF -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]