Remove hard coded dll paths that Gump doesn't like

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

diff --git a/build.properties.default b/build.properties.default
index 18c383c..b2ae407 100644 (file)
--- a/build.properties.default
+++ b/build.properties.default
@@ -70,7 +70,9 @@ 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.dll.win32=${tomcat-native.dll}/win32/tcnative-1.dll
+tomcat-native.dll.x64=${tomcat-native.dll}/win64/x64/tcnative-1.dll
+tomcat-native.dll.i64=${tomcat-native.dll}/win64/ia64/tcnative-1.dll
 # ----- Commons DBCP, version 1.1 or later -----
 commons-dbcp.version=1.2.2
 commons-dbcp.home=${base.path}/commons-dbcp-r734404-src

diff --git a/build.xml b/build.xml
index 38282ba..6ec6c60 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -1628,19 +1628,19 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
     </antcall>
 
     <antcall target="downloadfile">
-      <param name="sourcefile" value="${tomcat-native.dll}/win32/tcnative-1.dll"/>
+      <param name="sourcefile" value="${tomcat-native.dll.win32}"/>
       <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="sourcefile" value="${tomcat-native.dll.x64}"/>
       <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="sourcefile" value="${tomcat-native.dll.i64}"/>
       <param name="destfile" value="${tomcat-native.home}/tcnative-1.dll.i64"/>
       <param name="destdir" value="${tomcat-native.home}"/>
     </antcall>