From 5caf50eacde82e8ef83c87d1a45aa1ece03702c8 Mon Sep 17 00:00:00 2001
From: kkolinko <kkolinko@13f79535-47bb-0310-9956-ffa450edef68>
Date: Thu, 11 Jun 2009 21:53:34 +0000
Subject: [PATCH] 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
---
 dist.xml       | 4 ----
 res/tomcat.nsi | 4 ++--
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/dist.xml b/dist.xml
index d32113da8..421043591 100644
--- 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 38ad307be..cb6c5841b 100644
--- 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
-- 
2.11.0