tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r428588 - in /tomcat/container/branches/tc4.1.x: RELEASE-NOTES-4.1.txt tomcat.nsi
Date Fri, 04 Aug 2006 01:45:04 GMT
Author: markt
Date: Thu Aug  3 18:45:04 2006
New Revision: 428588

URL: http://svn.apache.org/viewvc?rev=428588&view=rev
Log:
Fix 40171. Silent installation fails to install all files in the conf dir and doesn't add
Tomcat to add/remove programs.

Modified:
    tomcat/container/branches/tc4.1.x/RELEASE-NOTES-4.1.txt
    tomcat/container/branches/tc4.1.x/tomcat.nsi

Modified: tomcat/container/branches/tc4.1.x/RELEASE-NOTES-4.1.txt
URL: http://svn.apache.org/viewvc/tomcat/container/branches/tc4.1.x/RELEASE-NOTES-4.1.txt?rev=428588&r1=428587&r2=428588&view=diff
==============================================================================
--- tomcat/container/branches/tc4.1.x/RELEASE-NOTES-4.1.txt (original)
+++ tomcat/container/branches/tc4.1.x/RELEASE-NOTES-4.1.txt Thu Aug  3 18:45:04 2006
@@ -598,6 +598,10 @@
          Clarify thay Verisign has different CAs for commercial and trial
          certificates
 
+[4.1.33] #40171
+         Windows Installer
+         Fix various issues with silent installation
+
 
 ------------------
 Catalina Bug Fixes:

Modified: tomcat/container/branches/tc4.1.x/tomcat.nsi
URL: http://svn.apache.org/viewvc/tomcat/container/branches/tc4.1.x/tomcat.nsi?rev=428588&r1=428587&r2=428588&view=diff
==============================================================================
--- tomcat/container/branches/tc4.1.x/tomcat.nsi (original)
+++ tomcat/container/branches/tc4.1.x/tomcat.nsi Thu Aug  3 18:45:04 2006
@@ -59,6 +59,7 @@
     File LICENSE
     File /r /x *.exe bin
     File /r common
+    File /r conf
     File /nonfatal /r shared
     File /nonfatal /r logs
     File /r server
@@ -74,6 +75,11 @@
     CopyFiles "$2\lib\tools.jar" "$INSTDIR\common\lib" 4500
 
     WriteUninstaller "$INSTDIR\uninst-tomcat4.exe"
+    WriteRegStr HKLM "SOFTWARE\Apache Software Foundation\Tomcat\4.1" "" $INSTDIR
+    WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Apache Tomcat 4.1"
\
+                     "DisplayName" "Apache Tomcat 4.1 (remove only)"
+    WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Apache Tomcat 4.1"
\
+                     "UninstallString" '"$INSTDIR\uninst-tomcat4.exe"'
 
   SectionEnd
 
@@ -88,7 +94,7 @@
     File /oname=tomcat4.exe bin\tomcat4.exe
     File /oname=tomcat4w.exe bin\tomcat4w.exe
 
-    ExecWait '"$INSTDIR\bin\tomcat4.exe" //IS//Tomcat4 --DisplayName "Apache Tomcat" --Description
"Apache Tomcat @VERSION@ Server - http://tomcat.apache.org/" --LogPath "$INSTDIR\logs" --Install
"$INSTDIR\bin\tomcat4.exe" --Jvm "$2" --StartPath "$INSTDIR" --StopPath "$INSTDIR"'
+    ExecWait '"$INSTDIR\bin\tomcat4.exe" //IS//Tomcat4 --DisplayName "Apache Tomcat 4.1"
--Description "Apache Tomcat @VERSION@ Server - http://tomcat.apache.org/" --LogPath "$INSTDIR\logs"
--Install "$INSTDIR\bin\tomcat4.exe" --Jvm "$2" --StartPath "$INSTDIR" --StopPath "$INSTDIR"'
 
     ExecWait '"$INSTDIR\bin\tomcat4.exe" //US//Tomcat4 --Startup auto'
 
@@ -222,7 +228,7 @@
 
   Call findJavaPath
   Pop $1
-  MessageBox MB_OK "Using Java Development Kit found in $1"
+  MessageBox MB_OK "Using Java Development Kit found in $1" /SD IDOK
   
   InitPluginsDir
   File /oname=$PLUGINSDIR\config.ini config.ini
@@ -231,7 +237,7 @@
 
 
 Function .onInstSuccess
-
+  IfSilent +2
   ExecShell open '$SMPROGRAMS\Apache Tomcat 4.1'
 
 FunctionEnd
@@ -330,12 +336,6 @@
 ; and build the configuration files
 ;
 Function configure
-  SetOverwrite off
-  SetOutPath $INSTDIR\conf
-  File /oname=server.xml conf\server-noexamples.xml.config
-  SetOutPath $INSTDIR
-  File /r conf
-
   ; Output files needed for the configuration dialog
   SetOverwrite on
 
@@ -400,12 +400,6 @@
   RMDir /r "$TEMP\confinstall"
 
   Call startService
-
-  WriteRegStr HKLM "SOFTWARE\Apache Software Foundation\Tomcat\4.1" "" $INSTDIR
-  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Apache Tomcat 4.1"
\
-                   "DisplayName" "Apache Tomcat 4.1 (remove only)"
-  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Apache Tomcat 4.1"
\
-                   "UninstallString" '"$INSTDIR\uninst-tomcat4.exe"'
 
   Sleep 500
   BringToFront



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


Mime
View raw message