From: mturk Date: Tue, 16 Jun 2009 14:51:50 +0000 (+0000) Subject: Fix tomcat installer script by using the correct files and new locations. X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=d9cefa9a291e249e98ef82d4347cda471b58e56c;p=tomcat7.0 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 git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@785239 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/res/tomcat.nsi b/res/tomcat.nsi index 3ec3dee68..fbae5af9b 100644 --- a/res/tomcat.nsi +++ b/res/tomcat.nsi @@ -169,19 +169,18 @@ Section "Core" SecTomcatCore DetailPrint "Using Jvm: $2" SetOutPath $INSTDIR\bin + File bin\tomcat@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=tomcat@VERSION_MAJOR@.exe bin\tomcat@VERSION_MAJOR@.exe - File /oname=tomcat@VERSION_MAJOR@w.exe bin\tomcat@VERSION_MAJOR@w.exe - StrCmp $0 "AMD64" 0 +3 - File /oname=tomcat@VERSION_MAJOR@.exe bin\procrun\amd64\tomcat@VERSION_MAJOR@.exe - File /oname=tomcat@VERSION_MAJOR@w.exe bin\tomcat@VERSION_MAJOR@w.exe - StrCmp $0 "IA64" 0 +3 - File /oname=tomcat@VERSION_MAJOR@.exe bin\procrun\ia64\tomcat@VERSION_MAJOR@.exe - File /oname=tomcat@VERSION_MAJOR@w.exe bin\tomcat@VERSION_MAJOR@w.exe + StrCmp $0 "AMD64" 0 +2 + File /oname=tomcat@VERSION_MAJOR@.exe bin\x86_64\tomcat@VERSION_MAJOR@.exe + StrCmp $0 "IA64" 0 +2 + File /oname=tomcat@VERSION_MAJOR@.exe bin\ia64\tomcat@VERSION_MAJOR@.exe InstallRetry: ClearErrors @@ -225,7 +224,15 @@ Section "Native" SecTomcatNative 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