Author: mturk
Date: Tue Jun 16 14:51:50 2009
New Revision: 785239
URL: http://svn.apache.org/viewvc?rev=785239&view=rev
Log:
Fix tomcat installer script by using the correct files and new locations.
Also decide which version of tcnative-1.dll to install according to the CPU
architecture
Modified:
tomcat/trunk/res/tomcat.nsi
Modified: tomcat/trunk/res/tomcat.nsi
URL:
http://svn.apache.org/viewvc/tomcat/trunk/res/tomcat.nsi?rev=785239&r1=785238&r2=785239&view=diff
==============================================================================
--- tomcat/trunk/res/tomcat.nsi (original)
+++ tomcat/trunk/res/tomcat.nsi Tue Jun 16 14:51:50 2009
@@ -169,19 +169,18 @@
DetailPrint "Using Jvm: $2"
SetOutPath $INSTDIR\bin
+ File bin\tom...@version_major@w.exe
+
; Get the current platform x86 / AMD64 / IA64
ExpandEnvStrings $0 "%PROCESSOR_ARCHITEW6432%"
StrCmp $0 "%PROCESSOR_ARCHITEW6432%" 0 +2
ExpandEnvStrings $0 "%PROCESSOR_ARCHITECTURE%"
- StrCmp $0 "x86" 0 +3
+ StrCmp $0 "x86" 0 +2
File /oname=tom...@version_major@.exe bin\tom...@version_major@.exe
- File /oname=tom...@version_major@w.exe bin\tom...@version_major@w.exe
- StrCmp $0 "AMD64" 0 +3
- File /oname=tom...@version_major@.exe
bin\procrun\amd64\tom...@version_major@.exe
- File /oname=tom...@version_major@w.exe bin\tom...@version_major@w.exe
- StrCmp $0 "IA64" 0 +3
- File /oname=tom...@version_major@.exe
bin\procrun\ia64\tom...@version_major@.exe
- File /oname=tom...@version_major@w.exe bin\tom...@version_major@w.exe
+ StrCmp $0 "AMD64" 0 +2
+ File /oname=tom...@version_major@.exe bin\x86_64\tom...@version_major@.exe
+ StrCmp $0 "IA64" 0 +2
+ File /oname=tom...@version_major@.exe bin\ia64\tom...@version_major@.exe
InstallRetry:
ClearErrors
@@ -225,7 +224,15 @@
SectionIn 3
SetOutPath $INSTDIR\bin
+ ExpandEnvStrings $0 "%PROCESSOR_ARCHITEW6432%"
+ StrCmp $0 "%PROCESSOR_ARCHITEW6432%" 0 +2
+ ExpandEnvStrings $0 "%PROCESSOR_ARCHITECTURE%"
+ StrCmp $0 "x86" 0 +2
File bin\tcnative-1.dll
+ StrCmp $0 "AMD64" 0 +2
+ File /oname=tcnative-1.dll bin\x86_64\tcnative-1.dll
+ StrCmp $0 "IA64" 0 +2
+ File /oname=tcnative-1.dll bin\ia64\tcnative-1.dll
ClearErrors
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
