Author: mturk
Date: Sat Oct 2 17:32:14 2010
New Revision: 1003840
URL: http://svn.apache.org/viewvc?rev=1003840&view=rev
Log:
Create service-install.log file during installation with params that were used
to invoke commons daemon
Modified:
tomcat/trunk/res/tomcat.nsi
Modified: tomcat/trunk/res/tomcat.nsi
URL:
http://svn.apache.org/viewvc/tomcat/trunk/res/tomcat.nsi?rev=1003840&r1=1003839&r2=1003840&view=diff
==============================================================================
--- tomcat/trunk/res/tomcat.nsi (original)
+++ tomcat/trunk/res/tomcat.nsi Sat Oct 2 17:32:14 2010
@@ -179,10 +179,16 @@ Section "Core" SecTomcatCore
File /oname=tom...@version_major@.exe bin\i64\tom...@version_major@.exe
InstallRetry:
+ FileOpen $R7 "$INSTDIR\logs\service-install.log" w
+ FileWrite $R7 '"$instdir\bin\tom...@version_major@.exe"
//IS//tom...@version_major@ --DisplayName "Apache Tomcat @VERSION_MAJOR@"
--Description "Apache Tomcat @VERSION@ Server - http://tomcat.apache.org/";
--LogPath "$INSTDIR\logs" --Install "$instdir\bin\tom...@version_major@.exe"
--Jvm "$2" --StartPath "$INSTDIR" --StopPath "$INSTDIR"'
+ FileWrite $R7 "$\r$\n"
+
ClearErrors
- nsExec::ExecToLog '"$instdir\bin\tom...@version_major@.exe"
//IS//tom...@version_major@ --DisplayName "Apache Tomcat @VERSION_MAJOR@"
--Description "Apache Tomcat @VERSION@ Server - http://tomcat.apache.org/";
--LogPath "$INSTDIR\logs" --Install "$instdir\bin\tom...@version_major@.exe"
--Jvm "$2" --StartPath "$INSTDIR" --StopPath "$INSTDIR"'
+ nsExec::ExecToStack '"$instdir\bin\tom...@version_major@.exe"
//IS//tom...@version_major@ --DisplayName "Apache Tomcat @VERSION_MAJOR@"
--Description "Apache Tomcat @VERSION@ Server - http://tomcat.apache.org/";
--LogPath "$INSTDIR\logs" --Install "$instdir\bin\tom...@version_major@.exe"
--Jvm "$2" --StartPath "$INSTDIR" --StopPath "$INSTDIR"'
Pop $0
+ Pop $1
StrCmp $0 "0" InstallOk
+ FileWrite $R7 "Install failed: $0 $1$\r$\n"
MessageBox MB_ABORTRETRYIGNORE|MB_ICONSTOP \
"Failed to install tom...@version_major@ service.$\r$\nCheck your
settings and permissions.$\r$\nIgnore and continue anyway (not recommended)?" \
/SD IDIGNORE IDIGNORE InstallOk IDRETRY InstallRetry
@@ -207,6 +213,8 @@ Section "Service" SecTomcatService
Call findJVMPath
Pop $2
+ FileWrite $R7 '"$instdir\bin\tom...@version_major@.exe"
//US//tom...@version_major@ --Startup auto'
+ FileWrite $R7 "$\r$\n"
nsExec::ExecToLog '"$instdir\bin\tom...@version_major@.exe"
//US//tom...@version_major@ --Startup auto'
; Behave like Apache Httpd (put the icon in tray on login)
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Run"
"apachetomcatmoni...@version_major_minor@"
'"$instdir\bin\tom...@version_major@w.exe" //MS//tom...@version_major@'
@@ -321,6 +329,14 @@ Section "Examples" SecExamples
SectionEnd
Section -post
+ FileWrite $R7 '"$instdir\bin\tom...@version_major@.exe"
//US//tom...@version_major@ --Classpath
"$INSTDIR\bin\bootstrap.jar;$INSTDIR\bin\tomcat-juli.jar" --StartClass
org.apache.catalina.startup.Bootstrap --StopClass
org.apache.catalina.startup.Bootstrap --StartParams start --StopParams stop
--StartMode jvm --StopMode jvm'
+ FileWrite $R7 "$\r$\n"
+ FileWrite $R7 '"$instdir\bin\tom...@version_major@.exe"
//US//tom...@version_major@ --JvmOptions
"-Dcatalina.home=$INSTDIR#-Dcatalina.base=$INSTDIR#-Djava.endorsed.dirs=$INSTDIR\endorsed#-Djava.io.tmpdir=$INSTDIR\temp#-Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager#-Djava.util.logging.config.file=$INSTDIR\conf\logging.properties"'
+ FileWrite $R7 "$\r$\n"
+ FileWrite $R7 '"$instdir\bin\tom...@version_major@.exe"
//US//tom...@version_major@ --StdOutput auto --StdError auto --PidFile
tom...@version_major@.pid'
+ FileWrite $R7 "$\r$\n"
+ FileClose $R7
+
nsExec::ExecToLog '"$instdir\bin\tom...@version_major@.exe"
//US//tom...@version_major@ --Classpath
"$INSTDIR\bin\bootstrap.jar;$INSTDIR\bin\tomcat-juli.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\tom...@version_major@.exe"
//US//tom...@version_major@ --JvmOptions
"-Dcatalina.home=$INSTDIR#-Dcatalina.base=$INSTDIR#-Djava.endorsed.dirs=$INSTDIR\endorsed#-Djava.io.tmpdir=$INSTDIR\temp#-Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager#-Djava.util.logging.config.file=$INSTDIR\conf\logging.properties"'
nsExec::ExecToLog '"$instdir\bin\tom...@version_major@.exe"
//US//tom...@version_major@ --StdOutput auto --StdError auto --PidFile
tom...@version_major@.pid'
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
