Author: kkolinko
Date: Thu Jul 2 16:32:19 2009
New Revision: 790657
URL: http://svn.apache.org/viewvc?rev=790657&view=rev
Log:
Update the build scripts, because there are no 64-bit GUI binaries.
Fixes release build failure caused by rev.779930
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/tomcat.nsi
Propchange: tomcat/tc6.0.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jul 2 16:32:19 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,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,770809,770876,776921,776924,776935,776945,777464,77
7466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985
+/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,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,770809,770876,776921,776924,776935,776945,777464,77
7466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=790657&r1=790656&r2=790657&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Jul 2 16:32:19 2009
@@ -94,18 +94,6 @@
+1: markt - would 0 make more sense rather than -1? Happy with either
-1:
-* Update the build scripts, because there are no 64-bit GUI binaries.
- (Fixes release build failure caused by
- http://svn.apache.org/viewvc?view=rev&revision=779930
- )
- Discussion: http://markmail.org/message/nhkrskh6bwyirwru
- http://svn.apache.org/viewvc?rev=783934&view=rev
- +1: kkolinko, markt, fhanik, rjung
- -1:
- kkolinko: We have +1 votes here, but I am not applying it, because
- mturk's one (tomcat6-package-winzip-2.patch) also fixes this issue
- and provides more value.
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47369.
http://svn.apache.org/viewvc?rev=784879&view=rev
+1: fhanik, markt, mturk, rjung
Modified: tomcat/tc6.0.x/trunk/dist.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/dist.xml?rev=790657&r1=790656&r2=790657&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/dist.xml (original)
+++ tomcat/tc6.0.x/trunk/dist.xml Thu Jul 2 16:32:19 2009
@@ -351,13 +351,9 @@
<!-- 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" />
Modified: tomcat/tc6.0.x/trunk/res/tomcat.nsi
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/res/tomcat.nsi?rev=790657&r1=790656&r2=790657&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/res/tomcat.nsi (original)
+++ tomcat/tc6.0.x/trunk/res/tomcat.nsi Thu Jul 2 16:32:19 2009
@@ -180,10 +180,10 @@
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\procrun\amd64\tom...@version_major@w.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\procrun\ia64\tom...@version_major@w.exe
+ File /oname=tom...@version_major@w.exe bin\tom...@version_major@w.exe
InstallRetry:
ClearErrors
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
