Implement new windows-[cpu].zip ditribution packages

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

diff --git a/dist.xml b/dist.xml
index a316f49..9693dce 100644 (file)
--- a/dist.xml
+++ b/dist.xml
@@ -342,65 +342,6 @@
 
   </target>
 
-  <!-- Create Windows Platfrom native packages -->
-  <target name="package-natives"
-   description="Create Windows native packages" unless="skip.installer">
-    <!-- windows-ia32.zip -->
-    <zip zipfile="${tomcat.release}/v${version}/bin/${final.name}-win32-x86-native.zip">
-      <zipfileset dir="${tomcat.dist}" prefix="${final.name}">
-        <include name="bin/tcnative-1.dll"/>
-        <include name="bin/tomcat*.exe"/>
-        <include name="bin/service.bat"/>
-        <include name="LICENSE"/>
-        <include name="NOTICE"/>
-        <include name="README.txt"/>
-        <include name="RELEASE-NOTES"/>
-      </zipfileset>
-    </zip>
-    <checksum file="${tomcat.release}/v${version}/bin/${final.name}-win32-x86-native.zip"
-              forceOverwrite="yes" fileext=".md5" />
-    <echo     file="${tomcat.release}/v${version}/bin/${final.name}.zip.md5"
-                      message="${md5sum.binary-prefix}${final.name}-win32-x86-native.zip.zip${line.separator}" append="true" />
-    <!-- windows-x86_64.zip -->
-    <zip zipfile="${tomcat.release}/v${version}/bin/${final.name}-win64-x86_64-native.zip">
-      <zipfileset dir="${tomcat.dist}/bin/x86_64" prefix="${final.name}/bin">
-        <include name="tcnative-1.dll"/>
-        <include name="tomcat*.exe"/>
-      </zipfileset>
-      <zipfileset dir="${tomcat.dist}" prefix="${final.name}">
-        <include name="bin/tomcat${version.major}w.exe"/>
-        <include name="bin/service.bat"/>
-        <include name="LICENSE"/>
-        <include name="NOTICE"/>
-        <include name="README.txt"/>
-        <include name="RELEASE-NOTES"/>
-      </zipfileset>
-    </zip>
-    <checksum file="${tomcat.release}/v${version}/bin/${final.name}-win64-x86_64-native.zip"
-              forceOverwrite="yes" fileext=".md5" />
-    <echo     file="${tomcat.release}/v${version}/bin/${final.name}.zip.md5"
-                      message="${md5sum.binary-prefix}${final.name}-win64-x86_64-native.zip${line.separator}" append="true" />
-    <!-- windows-ia64.zip -->
-    <zip zipfile="${tomcat.release}/v${version}/bin/${final.name}-win64-ia64-native.zip">
-      <zipfileset dir="${tomcat.dist}/bin/ia64" prefix="${final.name}/bin">
-        <include name="tcnative-1.dll"/>
-        <include name="tomcat*.exe"/>
-      </zipfileset>
-      <zipfileset dir="${tomcat.dist}" prefix="${final.name}">
-        <include name="bin/tomcat${version.major}w.exe"/>
-        <include name="bin/service.bat"/>
-        <include name="LICENSE"/>
-        <include name="NOTICE"/>
-        <include name="README.txt"/>
-        <include name="RELEASE-NOTES"/>
-      </zipfileset>
-    </zip>
-    <checksum file="${tomcat.release}/v${version}/bin/${final.name}-win64-ia64-native.zip"
-              forceOverwrite="yes" fileext=".md5" />
-    <echo     file="${tomcat.release}/v${version}/bin/${final.name}.zip.md5"
-                      message="${md5sum.binary-prefix}${final.name}-win64-ia64-native.zip${line.separator}" append="true" />
-  </target>
-
   <!-- ================= DIST: Create Windows Installer =================== -->
   <target name="installer"
    description="Create Windows installer" unless="skip.installer">
@@ -418,24 +359,24 @@
         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/x86_64/tomcat${version.major}.exe" />
+        tofile="${tomcat.dist}/bin/x64/tomcat${version.major}.exe" />
        <!-- 64 bit ia -->
     <copy file="res/procrun/ia64/tomcat${version.major}.exe"
-        tofile="${tomcat.dist}/bin/ia64/tomcat${version.major}.exe" />
+        tofile="${tomcat.dist}/bin/i64/tomcat${version.major}.exe" />
        <!-- tc native -->
     <copy file="${tomcat-native.home}/tcnative-1.dll.x86"
         tofile="${tomcat.dist}/bin/tcnative-1.dll" />
        <!-- tc native 64 bit for amd/emt -->
     <copy file="${tomcat-native.home}/tcnative-1.dll.x64"
-        tofile="${tomcat.dist}/bin/x86_64/tcnative-1.dll" />
+        tofile="${tomcat.dist}/bin/x64/tcnative-1.dll" />
        <!-- tc native 64 bit for ia -->
     <copy file="${tomcat-native.home}/tcnative-1.dll.i64"
-        tofile="${tomcat.dist}/bin/ia64/tcnative-1.dll" />
+        tofile="${tomcat.dist}/bin/i64/tcnative-1.dll" />
        <!-- platform README files -->
-       <echo append="false" file="${tomcat.dist}/bin/ia64/README">
+       <echo append="false" file="${tomcat.dist}/bin/i64/README">
 Apache Tomcat ${version} native binaries for Win64 IA64 platform.
        </echo>
-       <echo append="false" file="${tomcat.dist}/bin/x86_64/README">
+       <echo append="false" file="${tomcat.dist}/bin/x64/README">
 Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
        </echo>
 
@@ -462,7 +403,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
 
 
   <!-- ==================== RELEASE: Create Release ======================= -->
-  <target name="release" depends="clean,dist-static,dist-deployer,installer,package-zip,package-natives,package-tgz,package-deployer-zip,package-deployer-tgz,dist-source,dist-javadoc,package-docs-tgz,package-src-zip,package-src-tgz"
+  <target name="release" depends="clean,dist-static,dist-deployer,installer,package-zip,package-winzip,package-tgz,package-deployer-zip,package-deployer-tgz,dist-source,dist-javadoc,package-docs-tgz,package-src-zip,package-src-tgz"
    description="Create a Tomcat 7 packaged distribution">
 
     <copy file="KEYS"
@@ -510,8 +451,8 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
         <include name="RUNNING.txt"/>
         <include name="BENCHMARKS.txt"/>
         <exclude name="bin/service.bat"/>
-        <exclude name="bin/x86_64/"/>
-        <exclude name="bin/ia64/"/>
+        <exclude name="bin/x64/"/>
+        <exclude name="bin/i64/"/>
         <exclude name="bin/*.exe"/>
         <exclude name="bin/*.dll"/>
       </zipfileset>
@@ -523,6 +464,104 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
                       message="${md5sum.binary-prefix}${final.name}.zip${line.separator}" append="true" />
   </target>
 
+  <!-- Packages the core windows zip distros -->
+  <target name="package-winzip">
+    <!-- Windows x86 package -->
+    <zip zipfile="${tomcat.release}/v${version}/bin/${final.name}-windows-x86.zip">
+      <zipfileset dir="${tomcat.dist}" prefix="${final.name}">
+        <include name="bin/**"/>
+        <include name="conf/**"/>
+        <include name="logs/**"/>
+        <include name="lib/**"/>
+        <include name="webapps/**"/>
+        <include name="work/**"/>
+        <include name="temp/**"/>
+        <include name="LICENSE"/>
+        <include name="NOTICE"/>
+        <include name="README.txt"/>
+        <include name="RELEASE-NOTES"/>
+        <include name="RUNNING.txt"/>
+        <include name="BENCHMARKS.txt"/>
+        <exclude name="bin/x64/"/>
+        <exclude name="bin/i64/"/>
+        <exclude name="bin/*.dll"/>
+      </zipfileset>
+      <zipfileset dir="${tomcat.dist}/bin" prefix="${final.name}/bin">
+        <include name="*.dll"/>
+        <include name="*.exe"/>
+      </zipfileset>
+      
+    </zip>
+    <checksum file="${tomcat.release}/v${version}/bin/${final.name}-windows-x86.zip"
+              forceOverwrite="yes" fileext=".md5" />
+    <echo     file="${tomcat.release}/v${version}/bin/${final.name}.zip.md5"
+                      message="${md5sum.binary-prefix}${final.name}.-windows-x86.zip${line.separator}" append="true" />
+
+    <!-- Windows x64 package -->
+    <zip zipfile="${tomcat.release}/v${version}/bin/${final.name}-windows-x64.zip">
+      <zipfileset dir="${tomcat.dist}" prefix="${final.name}">
+        <include name="bin/**"/>
+        <include name="conf/**"/>
+        <include name="logs/**"/>
+        <include name="lib/**"/>
+        <include name="webapps/**"/>
+        <include name="work/**"/>
+        <include name="temp/**"/>
+        <include name="LICENSE"/>
+        <include name="NOTICE"/>
+        <include name="README.txt"/>
+        <include name="RELEASE-NOTES"/>
+        <include name="RUNNING.txt"/>
+        <include name="BENCHMARKS.txt"/>
+        <exclude name="bin/x64/"/>
+        <exclude name="bin/i64/"/>
+        <exclude name="bin/*.dll"/>        
+        <exclude name="bin/tomcat${version.major}.exe"/>
+      </zipfileset>
+      <zipfileset dir="${tomcat.dist}/bin/x64" prefix="${final.name}/bin">
+        <include name="*.dll"/>
+        <include name="*.exe"/>
+      </zipfileset>
+    </zip>
+    <checksum file="${tomcat.release}/v${version}/bin/${final.name}-windows-x64.zip"
+              forceOverwrite="yes" fileext=".md5" />
+    <echo     file="${tomcat.release}/v${version}/bin/${final.name}.zip.md5"
+                      message="${md5sum.binary-prefix}${final.name}.-windows-x64.zip${line.separator}" append="true" />
+
+    <!-- Windows i64 package -->
+    <zip zipfile="${tomcat.release}/v${version}/bin/${final.name}-windows-i64.zip">
+      <zipfileset dir="${tomcat.dist}" prefix="${final.name}">
+        <include name="bin/**"/>
+        <include name="conf/**"/>
+        <include name="logs/**"/>
+        <include name="lib/**"/>
+        <include name="webapps/**"/>
+        <include name="work/**"/>
+        <include name="temp/**"/>
+        <include name="LICENSE"/>
+        <include name="NOTICE"/>
+        <include name="README.txt"/>
+        <include name="RELEASE-NOTES"/>
+        <include name="RUNNING.txt"/>
+        <include name="BENCHMARKS.txt"/>
+        <exclude name="bin/x64/"/>
+        <exclude name="bin/i64/"/>
+        <exclude name="bin/*.dll"/>
+        <exclude name="bin/tomcat${version.major}.exe"/>
+      </zipfileset>
+      <zipfileset dir="${tomcat.dist}/bin/i64" prefix="${final.name}/bin">
+        <include name="*.dll"/>
+        <include name="*.exe"/>
+      </zipfileset>
+    </zip>
+
+    <checksum file="${tomcat.release}/v${version}/bin/${final.name}-windows-i64.zip"
+              forceOverwrite="yes" fileext=".md5" />
+    <echo     file="${tomcat.release}/v${version}/bin/${final.name}.zip.md5"
+                      message="${md5sum.binary-prefix}${final.name}.-windows-i64.zip${line.separator}" append="true" />
+
+  </target>
+
   <!-- Packages the deployer distribution in zip format -->
   <target name="package-deployer-zip">
     <zip zipfile="${tomcat.release}/v${version}/bin/${final.name}-deployer.zip">

diff --git a/res/tomcat.nsi b/res/tomcat.nsi
index 0f810d1..3563f9a 100644 (file)
--- a/res/tomcat.nsi
+++ b/res/tomcat.nsi
@@ -177,9 +177,9 @@ Section "Core" SecTomcatCore
   StrCmp $0 "x86" 0 +2
   File /oname=tomcat@VERSION_MAJOR@.exe bin\tomcat@VERSION_MAJOR@.exe
   StrCmp $0 "x86_64" 0 +2
-  File /oname=tomcat@VERSION_MAJOR@.exe bin\x86_64\tomcat@VERSION_MAJOR@.exe
+  File /oname=tomcat@VERSION_MAJOR@.exe bin\x64\tomcat@VERSION_MAJOR@.exe
   StrCmp $0 "ia64" 0 +2
-  File /oname=tomcat@VERSION_MAJOR@.exe bin\ia64\tomcat@VERSION_MAJOR@.exe
+  File /oname=tomcat@VERSION_MAJOR@.exe bin\i64\tomcat@VERSION_MAJOR@.exe
 
   InstallRetry:
   ClearErrors
@@ -229,9 +229,9 @@ Section "Native" SecTomcatNative
   StrCmp $0 "x86" 0 +2
   File bin\tcnative-1.dll
   StrCmp $0 "x86_64" 0 +2
-  File /oname=tcnative-1.dll bin\x86_64\tcnative-1.dll
+  File /oname=tcnative-1.dll bin\x64\tcnative-1.dll
   StrCmp $0 "ia64" 0 +2
-  File /oname=tcnative-1.dll bin\ia64\tcnative-1.dll
+  File /oname=tcnative-1.dll bin\i64\tcnative-1.dll
 
   ClearErrors
 
@@ -378,9 +378,9 @@ Function FindCpuType
   ExpandEnvStrings $0 "%PROCESSOR_ARCHITEW6432%"
   StrCmp $0 "%PROCESSOR_ARCHITEW6432%" 0 +5
   StrCmp $0 "IA64" 0 +3        
-  StrCpy $1 "ia64"
+  StrCpy $1 "i64"
   Goto FoundCpu
-  StrCpy $1 "x86_64"
+  StrCpy $1 "x64"
 
 FoundCpu:
   ; Put the result in the stack