tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mt...@apache.org
Subject svn commit: r791699 - in /tomcat/tc6.0.x/trunk: STATUS.txt build.xml dist.xml res/tomcat.nsi
Date Tue, 07 Jul 2009 04:51:34 GMT
Author: mturk
Date: Tue Jul  7 04:51:34 2009
New Revision: 791699

URL: http://svn.apache.org/viewvc?rev=791699&view=rev
Log:
Backport the new dist patch from trunk

Modified:
    tomcat/tc6.0.x/trunk/STATUS.txt
    tomcat/tc6.0.x/trunk/build.xml
    tomcat/tc6.0.x/trunk/dist.xml
    tomcat/tc6.0.x/trunk/res/tomcat.nsi

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=791699&r1=791698&r2=791699&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Jul  7 04:51:34 2009
@@ -99,14 +99,6 @@
   +1: fhanik, markt, mturk, rjung
   -1: 
 
-* Update release process to include new windows package zip files
-  with .dll and .exe matching a target CPU. Patch also syncs
-  and fixes nsi installer script.
-  Patch for 6.0.x is available at:
-  http://people.apache.org/~mturk/tomcat/tomcat6-package-winzip-2.patch
-  +1: mturk, kkolinko, rjung
-  -1:
-
 * When throwing Non-serializable exception, mark which argument was
   non-serializable to help tracing the cause when developing.
   http://svn.apache.org/viewvc?rev=713953&view=rev

Modified: tomcat/tc6.0.x/trunk/build.xml
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/build.xml?rev=791699&r1=791698&r2=791699&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/build.xml (original)
+++ tomcat/tc6.0.x/trunk/build.xml Tue Jul  7 04:51:34 2009
@@ -662,6 +662,12 @@
       <param name="destdir" value="${tomcat-native.home}"/>
     </antcall>
 
+    <antcall target="downloadfile">
+      <param name="sourcefile" value="${tomcat-native.dll}/win64/ia64/tcnative-1.dll"/>
+      <param name="destfile" value="${tomcat-native.home}/tcnative-1.dll.i64"/>
+      <param name="destdir" value="${tomcat-native.home}"/>
+    </antcall>
+
     <antcall target="downloadgz">
       <param name="sourcefile" value="${commons-daemon.loc}"/>
       <param name="destfile" value="${commons-daemon.jar}"/>
@@ -755,4 +761,4 @@
     </jar>
   </target>
 
-</project>
\ No newline at end of file
+</project>

Modified: tomcat/tc6.0.x/trunk/dist.xml
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/dist.xml?rev=791699&r1=791698&r2=791699&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/dist.xml (original)
+++ tomcat/tc6.0.x/trunk/dist.xml Tue Jul  7 04:51:34 2009
@@ -350,13 +350,19 @@
         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/procrun/amd64/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/procrun/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/x64/tcnative-1.dll" />
+  	<!-- tc native 64 bit for ia -->
+    <copy file="${tomcat-native.home}/tcnative-1.dll.i64"
+        tofile="${tomcat.dist}/bin/i64/tcnative-1.dll" />
 
     <filter token="VERSION" value="${version}"/>
     <filter token="VERSION_NUMBER" value="${version.number}"/>
@@ -380,12 +386,11 @@
               forceOverwrite="yes" fileext=".md5" />
     <echo     file="${tomcat.release}/v${version}/bin/${final.name}.exe.md5" 
                       message="${md5sum.binary-prefix}${final.name}.exe${line.separator}"
append="true" />
-    <delete file="${tomcat.dist}/bin/tcnative-1.dll"/>
   </target>
 
 
   <!-- ==================== RELEASE: Create Release ======================= -->
-  <target name="release" depends="clean,dist-static,dist-deployer,installer,package-zip,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 6 packaged distribution">
 
     <filter token="VERSION" value="${version}"/>
@@ -430,6 +435,11 @@
         <include name="RELEASE-NOTES"/>
         <include name="RUNNING.txt"/>
         <include name="BENCHMARKS.txt"/>
+        <exclude name="bin/service.bat"/>
+        <exclude name="bin/x64/"/>
+        <exclude name="bin/i64/"/>
+        <exclude name="bin/*.exe"/>
+        <exclude name="bin/*.dll"/>
       </zipfileset>
     </zip>
 
@@ -439,6 +449,99 @@
                       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/"/>
+      </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">
@@ -503,8 +606,13 @@
         <exclude name="bin/shutdown-using-launcher.sh" />
         <exclude name="bin/startup-using-launcher.sh" />
         <exclude name="bin/version.sh" />
+        <exclude name="bin/service.bat"/>
         <exclude name="conf/**" />
         <exclude name="src/**" />
+        <exclude name="bin/x64/"/>
+        <exclude name="bin/i64/"/>
+        <exclude name="bin/*.exe"/>
+        <exclude name="bin/*.dll"/>
       </tarfileset>
     </tar>
 

Modified: tomcat/tc6.0.x/trunk/res/tomcat.nsi
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/res/tomcat.nsi?rev=791699&r1=791698&r2=791699&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/res/tomcat.nsi (original)
+++ tomcat/tc6.0.x/trunk/res/tomcat.nsi Tue Jul  7 04:51:34 2009
@@ -171,19 +171,17 @@
   DetailPrint "Using Jvm: $2"
 
   SetOutPath $INSTDIR\bin
+  File bin\tomcat@VERSION_MAJOR@w.exe
+
   ; Get the current platform x86 / AMD64 / IA64
-  ExpandEnvStrings $0 "%PROCESSOR_ARCHITEW6432%"
-  StrCmp $0 "%PROCESSOR_ARCHITEW6432%" 0 +2
-  ExpandEnvStrings $0 "%PROCESSOR_ARCHITECTURE%"
-  StrCmp $0 "x86" 0 +3
+  Call FindCpuType
+  Pop $0
+  StrCmp $0 "x86" 0 +2
   File /oname=tomcat@VERSION_MAJOR@.exe bin\tomcat@VERSION_MAJOR@.exe
-  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\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\tomcat@VERSION_MAJOR@w.exe
+  StrCmp $0 "x64" 0 +2
+  File /oname=tomcat@VERSION_MAJOR@.exe bin\x64\tomcat@VERSION_MAJOR@.exe
+  StrCmp $0 "i64" 0 +2
+  File /oname=tomcat@VERSION_MAJOR@.exe bin\i64\tomcat@VERSION_MAJOR@.exe
 
   InstallRetry:
   ClearErrors
@@ -227,7 +225,15 @@
   SectionIn 3
 
   SetOutPath $INSTDIR\bin
+  Call FindCpuType
+  Pop $0
+
+  StrCmp $0 "x86" 0 +2
   File bin\tcnative-1.dll
+  StrCmp $0 "x64" 0 +2
+  File /oname=tcnative-1.dll bin\x64\tcnative-1.dll
+  StrCmp $0 "i64" 0 +2
+  File /oname=tcnative-1.dll bin\i64\tcnative-1.dll
 
   ClearErrors
 
@@ -403,6 +409,30 @@
 ;  !insertmacro MUI_DESCRIPTION_TEXT ${SecWebapps} $(DESC_SecWebapps)
 !insertmacro MUI_FUNCTION_DESCRIPTION_END
 
+; =====================
+; FindCpuType Function
+; =====================
+;
+; Find the CPU used on the system, and put the result on the top of the
+; stack
+;
+Function FindCpuType
+
+  ClearErrors
+  ; Default CPU is always x86
+  StrCpy $1 "x86"
+  ExpandEnvStrings $0 "%PROCESSOR_ARCHITEW6432%"
+  StrCmp $0 "%PROCESSOR_ARCHITEW6432%" +5 0
+  StrCmp $0 "IA64" 0 +3
+  StrCpy $1 "i64"
+  Goto FoundCpu
+  StrCpy $1 "x64"
+
+FoundCpu:
+  ; Put the result in the stack
+  Push $1
+
+FunctionEnd
 
 ; =====================
 ; CheckUserType Function



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message