Author: markt
Date: Wed Jul 1 14:34:31 2009
New Revision: 790184
URL: http://svn.apache.org/viewvc?rev=790184&view=rev
Log:
Make 64-bit binaries available in the binary distribution and get windows
installer to automatically choose the correct one.
Port of r777624 and r783934
Modified:
tomcat/build/tc5.5.x/build.xml
tomcat/build/tc5.5.x/resources/jvm.ini
tomcat/build/tc5.5.x/tomcat.nsi
tomcat/container/tc5.5.x/webapps/docs/changelog.xml
Modified: tomcat/build/tc5.5.x/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/build/tc5.5.x/build.xml?rev=790184&r1=790183&r2=790184&view=diff
==============================================================================
--- tomcat/build/tc5.5.x/build.xml (original)
+++ tomcat/build/tc5.5.x/build.xml Wed Jul 1 14:34:31 2009
@@ -37,6 +37,7 @@
<property name="version.patch" value="0" />
<property name="version" value="5.5.0-dev" />
<property name="version.number"
value="${version.major}.${version.minor}.${version.build}.${version.patch}" />
+ <property name="version.major.minor"
value="${version.major}.${version.minor}" />
<property name="project" value="apache-tomcat" />
<property name="final.name" value="${project}-${version}" />
@@ -1485,13 +1486,22 @@
<copy file="${nsis.installoptions.dll}" todir="${tomcat.dist}" />
<copy file="${nsis.nsexec.dll}" todir="${tomcat.dist}" />
<copy file="${nsis.nsisdl.dll}" todir="${tomcat.dist}" />
- <copy file="${jtc.home}/procrun/bin/tomcat5.exe"
- tofile="${tomcat.dist}/bin/tomcat5.exe" />
- <copy file="${jtc.home}/procrun/bin/tomcat5w.exe"
- tofile="${tomcat.dist}/bin/tomcat5w.exe" />
+ <!-- 32 bit -->
+ <copy file="${jtc.home}/procrun/bin/tomcat${version.major}.exe"
+ tofile="${tomcat.dist}/bin/tomcat${version.major}.exe" />
+ <copy file="${jtc.home}/procrun/bin/tomcat${version.major}w.exe"
+ tofile="${tomcat.dist}/bin/tomcat${version.major}w.exe" />
+ <!-- 64 bit amd -->
+ <copy file="${jtc.home}/procrun/bin/amd64/tomcat${version.major}.exe"
+
tofile="${tomcat.dist}/bin/procrun/amd64/tomcat${version.major}.exe" />
+ <!-- 64 bit ia -->
+ <copy file="${jtc.home}/procrun/bin/ia64/tomcat${version.major}.exe"
+
tofile="${tomcat.dist}/bin/procrun/ia64/tomcat${version.major}.exe" />
<filter token="VERSION" value="${version}"/>
<filter token="VERSION_NUMBER" value="${version.number}"/>
+ <filter token="VERSION_MAJOR" value="${version.major}"/>
+ <filter token="VERSION_MAJOR_MINOR" value="${version.major.minor}"/>
<copy file="tomcat.nsi" tofile="${tomcat.dist}/tomcat.nsi"
filtering="true"/>
<exec dir="${tomcat.dist}" executable="${nsis.exe}">
Modified: tomcat/build/tc5.5.x/resources/jvm.ini
URL:
http://svn.apache.org/viewvc/tomcat/build/tc5.5.x/resources/jvm.ini?rev=790184&r1=790183&r2=790184&view=diff
==============================================================================
--- tomcat/build/tc5.5.x/resources/jvm.ini (original)
+++ tomcat/build/tc5.5.x/resources/jvm.ini Wed Jul 1 14:34:31 2009
@@ -3,11 +3,11 @@
[Field 1]
Type=Label
-Text=Please select the path of a J2SE 5.0 JRE installed on your system:
+Text=Text=Please select the path of a J2SE 5.0 or later JRE installed on your
system. Note that if you have a 64-bit operating system, you must specify a
64-bit JRE:
left=0
right=300
top=5
-bottom=20
+bottom=30
[Field 2]
Type=DirRequest
Modified: tomcat/build/tc5.5.x/tomcat.nsi
URL:
http://svn.apache.org/viewvc/tomcat/build/tc5.5.x/tomcat.nsi?rev=790184&r1=790183&r2=790184&view=diff
==============================================================================
--- tomcat/build/tc5.5.x/tomcat.nsi (original)
+++ tomcat/build/tc5.5.x/tomcat.nsi Wed Jul 1 14:34:31 2009
@@ -27,7 +27,7 @@
;Product information
VIAddVersionKey ProductName "Apache Tomcat"
VIAddVersionKey CompanyName "Apache Software Foundation"
- VIAddVersionKey LegalCopyright "Copyright (c) 1999-2005 The Apache Software
Foundation"
+ VIAddVersionKey LegalCopyright "Copyright (c) 1999-2009 The Apache Software
Foundation"
VIAddVersionKey FileDescription "Apache Tomcat Installer"
VIAddVersionKey FileVersion "2.0"
VIAddVersionKey ProductVersion "@VERSION@"
@@ -154,7 +154,6 @@
File bin\bootstrap.jar
File bin\commons-logging-api-1.1.1.jar
File bin\tomcat-juli.jar
- File bin\*.exe
SetOutPath $INSTDIR\conf
File conf\*.*
SetOutPath $INSTDIR\server\lib
@@ -184,6 +183,21 @@
DetailPrint "Using Jvm: $2"
+ SetOutPath $INSTDIR\bin
+ ; 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
+ 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
+
InstallRetry:
ClearErrors
nsExec::ExecToLog '"$INSTDIR\bin\tomcat5.exe" //IS//Tomcat5 --DisplayName
"Apache Tomcat" --Description "Apache Tomcat @VERSION@ Server -
http://tomcat.apache.org/"; --LogPath "$INSTDIR\logs" --Install
"$INSTDIR\bin\tomcat5.exe" --Jvm "$2" --StartPath "$INSTDIR" --StopPath
"$INSTDIR"'
@@ -365,6 +379,10 @@
SectionEnd
Function .onInit
+ ;Reset install dir for 64-bit
+ ExpandEnvStrings $0 "%PROGRAMW6432%"
+ StrCmp $0 "%PROGRAMW6432%" +2 0
+ StrCpy $INSTDIR "$0\Apache Software Foundation\Tomcat @VERSION_MAJOR_MINOR@"
;Extract Install Options INI Files
!insertmacro MUI_INSTALLOPTIONS_EXTRACT "config.ini"
@@ -455,6 +473,11 @@
ClearErrors
+ ; Use the 64-bit registry on 64-bit machines
+ ExpandEnvStrings $0 "%PROGRAMW6432%"
+ StrCmp $0 "%PROGRAMW6432%" +2 0
+ SetRegView 64
+
ReadRegStr $2 HKLM "SOFTWARE\JavaSoft\Java Runtime Environment"
"CurrentVersion"
ReadRegStr $1 HKLM "SOFTWARE\JavaSoft\Java Runtime Environment\$2" "JavaHome"
ReadRegStr $3 HKLM "SOFTWARE\JavaSoft\Java Runtime Environment\$2"
"RuntimeLib"
Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/changelog.xml?rev=790184&r1=790183&r2=790184&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original)
+++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Wed Jul 1 14:34:31 2009
@@ -47,6 +47,11 @@
${jasper-compiler-jdt.home} in tomcat-deps. Fix download task
checks for commons-pool and commons-dbcp. (kkolinko)
</update>
+ <add>
+ Add the 64-bit windows service binaries to the distribution and get the
+ Windows installer to automatically select the correct one for the
+ current platform. (markt/kkolinko)
+ </add>
</changelog>
</subsection>
<subsection name="Catalina">
@@ -98,7 +103,8 @@
</fix>
<fix>
<bug>43343</bug>: Correctly handle requesting a session we are in the
- middle of persisting. Based on a suggestion by Wade Chandler. (markt)
+ middle of persisting. Based on a suggestion by Wade Chandler.
+ (markt/kkolinko)
</fix>
<add>
<bug>44382</bug>: Add support for using httpOnly for session cookies.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
