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.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@783934 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/dist.xml b/dist.xml
index d32113d..4210435 100644 (file)
--- a/dist.xml
+++ b/dist.xml
@@ -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" />

diff --git a/res/tomcat.nsi b/res/tomcat.nsi
index 38ad307..cb6c584 100644 (file)
--- a/res/tomcat.nsi
+++ b/res/tomcat.nsi
@@ -178,10 +178,10 @@ Section "Core" SecTomcatCore
   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
+  File /oname=tomcat@VERSION_MAJOR@w.exe bin\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
+  File /oname=tomcat@VERSION_MAJOR@w.exe bin\tomcat@VERSION_MAJOR@w.exe
 
   InstallRetry:
   ClearErrors