tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r777624 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt dist.xml res/jvm.ini res/tomcat.nsi webapps/docs/changelog.xml
Date Fri, 22 May 2009 17:21:43 GMT
Author: markt
Date: Fri May 22 17:21:43 2009
New Revision: 777624

URL: http://svn.apache.org/viewvc?rev=777624&view=rev
Log:
Include 64-bit service binaries in distro. Add 64-bit support to the installer.

Modified:
    tomcat/tc6.0.x/trunk/   (props changed)
    tomcat/tc6.0.x/trunk/STATUS.txt
    tomcat/tc6.0.x/trunk/dist.xml
    tomcat/tc6.0.x/trunk/res/jvm.ini
    tomcat/tc6.0.x/trunk/res/tomcat.nsi
    tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc6.0.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri May 22 17:21:43 2009
@@ -1 +1 @@
-/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,673796,673820,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,753039,757335,757774,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979
+/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,673796,673820,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,753039,757335,757774,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770876

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=777624&r1=777623&r2=777624&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Fri May 22 17:21:43 2009
@@ -121,13 +121,6 @@
   +1: markt, pero
   -1: 
 
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47086
-  Include 64-bit windows binaries in distributions
-  Update Windows installer to work automatically on 64-bit machines
-  http://svn.apache.org/viewvc?view=rev&revision=770876
-  +1: markt, pero, kkolinko
-  -1:
-
 * Fix Close Stream at WebappClassLoader after read error
   http://svn.apache.org/viewvc?rev=772872&view=rev 
   +1: pero

Modified: tomcat/tc6.0.x/trunk/dist.xml
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/dist.xml?rev=777624&r1=777623&r2=777624&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/dist.xml (original)
+++ tomcat/tc6.0.x/trunk/dist.xml Fri May 22 17:21:43 2009
@@ -36,6 +36,7 @@
   <property name="version.patch"         value="0" />
   <property name="version"               value="6.0.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}" />
@@ -341,15 +342,29 @@
     <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="res/procrun/tomcat6.exe"
-        tofile="${tomcat.dist}/bin/tomcat6.exe" />
-    <copy file="res/procrun/tomcat6w.exe"
-        tofile="${tomcat.dist}/bin/tomcat6w.exe" />
+  	<!-- 32 bit -->
+    <copy file="res/procrun/tomcat${version.major}.exe"
+        tofile="${tomcat.dist}/bin/tomcat${version.major}.exe" />
+    <copy file="res/procrun/tomcat${version.major}w.exe"
+        tofile="${tomcat.dist}/bin/tomcat${version.major}w.exe" />
+  	<!-- 64 bit amd -->
+    <copy file="res/procrun/amd64/tomcat${version.major}.exe"
+        tofile="${tomcat.dist}/bin/procrun/amd64/tomcat${version.major}.exe" />
+    <copy file="res/procrun/amd64/tomcat${version.major}w.exe"
+        tofile="${tomcat.dist}/bin/procrun/amd64/tomcat${version.major}w.exe" />
+  	<!-- 64 bit ia -->
+    <copy file="res/procrun/ia64/tomcat${version.major}.exe"
+        tofile="${tomcat.dist}/bin/procrun/ia64/tomcat${version.major}.exe" />
+    <copy file="res/procrun/ia64/tomcat${version.major}w.exe"
+        tofile="${tomcat.dist}/bin/procrun/ia64/tomcat${version.major}w.exe" />
+  	<!-- tc native -->
     <copy file="${tomcat-native.home}/tcnative-1.dll.x86"
         tofile="${tomcat.dist}/bin/tcnative-1.dll" />
 
     <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="res/tomcat.nsi" tofile="${tomcat.dist}/tomcat.nsi" filtering="true" overwrite="true"/>
     <exec dir="${tomcat.dist}" executable="${nsis.exe}" osfamily="windows">

Modified: tomcat/tc6.0.x/trunk/res/jvm.ini
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/res/jvm.ini?rev=777624&r1=777623&r2=777624&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/res/jvm.ini (original)
+++ tomcat/tc6.0.x/trunk/res/jvm.ini Fri May 22 17:21:43 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=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/tc6.0.x/trunk/res/tomcat.nsi
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/res/tomcat.nsi?rev=777624&r1=777623&r2=777624&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/res/tomcat.nsi (original)
+++ tomcat/tc6.0.x/trunk/res/tomcat.nsi Fri May 22 17:21:43 2009
@@ -148,7 +148,6 @@
   SetOutPath $INSTDIR\bin
   File bin\bootstrap.jar
   File bin\tomcat-juli.jar
-  File bin\*.exe
   SetOutPath $INSTDIR\conf
   File conf\*.*
   SetOutPath $INSTDIR\webapps\ROOT
@@ -171,6 +170,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=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\procrun\amd64\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\procrun\ia64\tomcat@VERSION_MAJOR@w.exe
+
   InstallRetry:
   ClearErrors
   nsExec::ExecToLog '"$INSTDIR\bin\tomcat6.exe" //IS//Tomcat6 --DisplayName "Apache Tomcat
6" --Description "Apache Tomcat @VERSION@ Server - http://tomcat.apache.org/" --LogPath "$INSTDIR\logs"
--Install "$INSTDIR\bin\tomcat6.exe" --Jvm "$2" --StartPath "$INSTDIR" --StopPath "$INSTDIR"'
@@ -345,6 +359,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"
@@ -435,6 +453,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/tc6.0.x/trunk/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=777624&r1=777623&r2=777624&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Fri May 22 17:21:43 2009
@@ -53,6 +53,15 @@
       </fix>
     </changelog>
   </subsection>
+  <subsection name="Other">
+    <changelog>
+      <fix>
+        <bug>40786</bug>: Include 64-bit Windows service wrapper in
+        distributions. Update the Windows installer to automatically use the
+        correct binary on 64-bit machines. (markt)
+      </fix>
+    </changelog>
+  </subsection>
 </section>
 
 <section name="Tomcat 6.0.20 (remm)">



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message