Author: mturk
Date: Tue Jun 23 09:47:13 2009
New Revision: 787608
URL: http://svn.apache.org/viewvc?rev=787608&view=rev
Log:
Use correct CPU names
Modified:
tomcat/trunk/res/tomcat.nsi
Modified: tomcat/trunk/res/tomcat.nsi
URL:
http://svn.apache.org/viewvc/tomcat/trunk/res/tomcat.nsi?rev=787608&r1=787607&r2=787608&view=diff
==============================================================================
--- tomcat/trunk/res/tomcat.nsi (original)
+++ tomcat/trunk/res/tomcat.nsi Tue Jun 23 09:47:13 2009
@@ -228,9 +228,9 @@
StrCmp $0 "x86" 0 +2
File bin\tcnative-1.dll
- StrCmp $0 "x86_64" 0 +2
+ StrCmp $0 "x64" 0 +2
File /oname=tcnative-1.dll bin\x64\tcnative-1.dll
- StrCmp $0 "ia64" 0 +2
+ StrCmp $0 "i64" 0 +2
File /oname=tcnative-1.dll bin\i64\tcnative-1.dll
ClearErrors
@@ -377,7 +377,7 @@
StrCpy $1 "x86"
ExpandEnvStrings $0 "%PROCESSOR_ARCHITEW6432%"
StrCmp $0 "%PROCESSOR_ARCHITEW6432%" 0 +5
- StrCmp $0 "IA64" 0 +3
+ StrCmp $0 "IA64" 0 +3
StrCpy $1 "i64"
Goto FoundCpu
StrCpy $1 "x64"
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]