Modify build files for new tc-native layout
git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc5.5.x/trunk@1394487 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/build/build.properties.default b/build/build.properties.default
index f2465d0..f7a6bcb 100644
--- a/build/build.properties.default
+++ b/build/build.properties.default
@@ -160,7 +160,7 @@
tomcat-native.home=${base.path}/tomcat-native-${tomcat-native.version}
tomcat-native.tar.gz=${tomcat-native.home}/tomcat-native.tar.gz
tomcat-native.loc=${base-tomcat.loc}/tomcat-connectors/native/${tomcat-native.version}/source/tomcat-native-${tomcat-native.version}-src.tar.gz
-tomcat-native.dll=${base-tomcat.loc}/tomcat-connectors/native/${tomcat-native.version}/binaries
+tomcat-native.win=${base-tomcat.loc}/tomcat-connectors/native/${tomcat-native.version}/binaries/tomcat-native-${tomcat-native.version}-win32-bin.zip
# --------------------------------------------------
diff --git a/build/build.xml b/build/build.xml
index 688ccf6..352d198 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -1390,13 +1390,13 @@
<copy file="${commons-daemon.home}/windows/ia64/prunsrv.exe"
tofile="${tomcat.dist}/bin/i64/tomcat${version.major}.exe" />
<!-- tc native -->
- <copy file="${tomcat-native.home}/tcnative-1.dll.x86"
+ <copy file="${tomcat-native.home}/bin/tcnative-1.dll"
tofile="${tomcat.dist}/bin/tcnative-1.dll" />
<!-- tc native 64 bit for amd/emt -->
- <copy file="${tomcat-native.home}/tcnative-1.dll.x64"
+ <copy file="${tomcat-native.home}/bin/x64/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"
+ <copy file="${tomcat-native.home}/bin/i64/tcnative-1.dll"
tofile="${tomcat.dist}/bin/i64/tcnative-1.dll" />
<!-- Correct permissions and line endings on "bin" scripts -->
@@ -2064,21 +2064,9 @@
<param name="destdir" value="${tomcat-native.home}"/>
</antcall>
- <antcall target="downloadfile">
- <param name="sourcefile" value="${tomcat-native.dll}/win32/tcnative-1.dll"/>
- <param name="destfile" value="${tomcat-native.home}/tcnative-1.dll.x86"/>
- <param name="destdir" value="${tomcat-native.home}"/>
- </antcall>
-
- <antcall target="downloadfile">
- <param name="sourcefile" value="${tomcat-native.dll}/win64/x64/tcnative-1.dll"/>
- <param name="destfile" value="${tomcat-native.home}/tcnative-1.dll.x64"/>
- <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"/>
+ <antcall target="downloadzip">
+ <param name="sourcefile" value="${tomcat-native.win}"/>
+ <param name="destfile" value="${tomcat-native.home}/LICENSE"/>
<param name="destdir" value="${tomcat-native.home}"/>
</antcall>
