Author: markt
Date: Mon Nov 9 11:39:07 2015
New Revision: 1713397
URL: http://svn.apache.org/viewvc?rev=1713397&view=rev
Log:
Drop Windows Itanium support for native components
Modified:
tomcat/trunk/build.xml
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1713397&r1=1713396&r2=1713397&view=diff
==============================================================================
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Mon Nov 9 11:39:07 2015
@@ -1923,9 +1923,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">
@@ -1935,9 +1932,6 @@
</copy>
<!-- platform README files -->
- <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/x64/README">
Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
</echo>
@@ -2379,7 +2373,6 @@ skip.installer property in build.propert
<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>
@@ -2412,7 +2405,6 @@ skip.installer property in build.propert
<include name="RUNNING.txt"/>
<include name="BENCHMARKS.txt"/>
<exclude name="bin/x64/"/>
- <exclude name="bin/i64/"/>
</zipfileset>
</zip>
@@ -2435,7 +2427,6 @@ skip.installer property in build.propert
<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>
@@ -2445,36 +2436,6 @@ skip.installer property in build.propert
</zipfileset>
</zip>
<hashAndSign
file="${tomcat.release}/v${version}/bin/${final.name}-windows-x64.zip" />
-
- <!-- 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>
-
- <hashAndSign
file="${tomcat.release}/v${version}/bin/${final.name}-windows-i64.zip" />
-
</target>
<!-- Packages the deployer distribution in zip format -->
@@ -2542,7 +2503,6 @@ skip.installer property in build.propert
<exclude name="conf/**" />
<exclude name="src/**" />
<exclude name="bin/x64/"/>
- <exclude name="bin/i64/"/>
<exclude name="bin/*.exe"/>
<exclude name="bin/*.dll"/>
</tarfileset>
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1713397&r1=1713396&r2=1713397&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Mon Nov 9 11:39:07 2015
@@ -65,6 +65,10 @@
may be overridden by setting <code>UMASK</code> in
<code>setenv.sh</code>. (markt)
</update>
+ <update>
+ Remove native code (Windows Service Wrapper, APR/native connector)
+ support for Windows Itanium. (markt)
+ </update>
</changelog>
</subsection>
<subsection name="Catalina">
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
