Author: jfclere
Date: Thu Jan 28 09:07:57 2016
New Revision: 1727282
URL: http://svn.apache.org/viewvc?rev=1727282&view=rev
Log:
remove Itanium support we don't have native for it.
Modified:
tomcat/tc6.0.x/trunk/build.properties.default
tomcat/tc6.0.x/trunk/dist.xml
tomcat/tc6.0.x/trunk/res/tomcat.nsi
Modified: tomcat/tc6.0.x/trunk/build.properties.default
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/build.properties.default?rev=1727282&r1=1727281&r2=1727282&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/build.properties.default (original)
+++ tomcat/tc6.0.x/trunk/build.properties.default Thu Jan 28 09:07:57 2016
@@ -130,7 +130,7 @@ jdt.loc.1=http://archive.eclipse.org/ecl
jdt.loc.2=http://download.eclipse.org/eclipse/downloads/drops4/${jdt.release}/ecj-${jdt.version}.jar
# ----- Tomcat native library -----
-tomcat-native.version=1.1.33
+tomcat-native.version=1.1.34
tomcat-native.home=${base.path}/tomcat-native-${tomcat-native.version}
tomcat-native.tar.gz=${tomcat-native.home}/tomcat-native.tar.gz
tomcat-native.loc.1=${base-tomcat.loc.1}/tomcat-connectors/native/${tomcat-native.version}/source/tomcat-native-${tomcat-native.version}-src.tar.gz
Modified: tomcat/tc6.0.x/trunk/dist.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/dist.xml?rev=1727282&r1=1727281&r2=1727282&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/dist.xml (original)
+++ tomcat/tc6.0.x/trunk/dist.xml Thu Jan 28 09:07:57 2016
@@ -204,9 +204,6 @@
<!-- 64 bit amd -->
<copy file="${commons-daemon.home}/windows/amd64/prunsrv.exe"
tofile="${tomcat.dist}/bin/x64/tomcat${version.major}.exe" />
- <!-- 64 bit ia -->
- <copy file="${commons-daemon.home}/windows/ia64/prunsrv.exe"
- tofile="${tomcat.dist}/bin/i64/tomcat${version.major}.exe" />
<!-- tc native -->
<copy todir="${tomcat.dist}/bin">
<fileset dir="${tomcat-native.home}/bin">
@@ -549,37 +546,6 @@
<param name="file"
value="${tomcat.release}/v${version}/bin/${final.name}-windows-x64.zip" />
</antcall>
- <!-- 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>
-
- <antcall target="md5sum">
- <param name="file"
value="${tomcat.release}/v${version}/bin/${final.name}-windows-i64.zip" />
- </antcall>
-
</target>
<!-- Packages the deployer distribution in zip format -->
Modified: tomcat/tc6.0.x/trunk/res/tomcat.nsi
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/res/tomcat.nsi?rev=1727282&r1=1727281&r2=1727282&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/res/tomcat.nsi (original)
+++ tomcat/tc6.0.x/trunk/res/tomcat.nsi Thu Jan 28 09:07:57 2016
@@ -205,8 +205,6 @@ Section "Core" SecTomcatCore
File /oname=$TomcatServiceFileName bin\tomcat@VERSION_MAJOR@.exe
${ElseIf} $Arch == "x64"
File /oname=$TomcatServiceFileName bin\x64\tomcat@VERSION_MAJOR@.exe
- ${ElseIf} $Arch == "i64"
- File /oname=$TomcatServiceFileName bin\i64\tomcat@VERSION_MAJOR@.exe
${EndIf}
FileOpen $ServiceInstallLog "$INSTDIR\logs\service-install.log" a
@@ -258,8 +256,6 @@ Section "Native" SecTomcatNative
File bin\tcnative-1.dll
${ElseIf} $Arch == "x64"
File /oname=tcnative-1.dll bin\x64\tcnative-1.dll
- ${ElseIf} $Arch == "i64"
- File /oname=tcnative-1.dll bin\i64\tcnative-1.dll
${EndIf}
ClearErrors
@@ -707,7 +703,6 @@ Function checkJava
; 3. The next word gives the machine type.
; 0x014c: x86
; 0x8664: x64
- ; 0x0200: i64
ClearErrors
FileOpen $R1 "$JvmDll" r
IfErrors WrongPEHeader
@@ -741,10 +736,6 @@ Function checkJava
StrCpy "$Arch" "x64"
Goto DonePEHeader
- IntCmp $R2 0x0200 +1 +3 +3
- StrCpy "$Arch" "i64"
- Goto DonePEHeader
-
WrongPEHeader:
IfSilent +2
MessageBox MB_OK|MB_ICONEXCLAMATION 'Cannot read PE header from
"$JvmDll"$\r$\nWill assume that the architecture is x86.'
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
