Author: kkolinko Date: Thu Jun 11 21:53:34 2009 New Revision: 783934 URL: http://svn.apache.org/viewvc?rev=783934&view=rev Log: There are no 64-bit GUI binaries. (see rev.779927,-28,-30) The 32-bit version can manage both 32 and 64 bit tomcat(X).exe Updating the build scripts accordingly.
Modified: tomcat/trunk/dist.xml tomcat/trunk/res/tomcat.nsi Modified: tomcat/trunk/dist.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/dist.xml?rev=783934&r1=783933&r2=783934&view=diff ============================================================================== --- tomcat/trunk/dist.xml (original) +++ tomcat/trunk/dist.xml Thu Jun 11 21:53:34 2009 @@ -361,13 +361,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/trunk/res/tomcat.nsi URL: http://svn.apache.org/viewvc/tomcat/trunk/res/tomcat.nsi?rev=783934&r1=783933&r2=783934&view=diff ============================================================================== --- tomcat/trunk/res/tomcat.nsi (original) +++ tomcat/trunk/res/tomcat.nsi Thu Jun 11 21:53:34 2009 @@ -178,10 +178,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