svn commit: r907346 - in /tomcat/trunk: build.properties.default build.xml

[billbarker]

Author: billbarker
Date: Sun Feb  7 00:10:25 2010
New Revision: 907346

URL: http://svn.apache.org/viewvc?rev=907346&view=rev
Log:
Remove hard coded dll paths that Gump doesn't like

Modified:
    tomcat/trunk/build.properties.default
    tomcat/trunk/build.xml

Modified: tomcat/trunk/build.properties.default
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/build.properties.default?rev=907346&r1=907345&r2=907346&view=diff
==============================================================================
--- tomcat/trunk/build.properties.default (original)
+++ tomcat/trunk/build.properties.default Sun Feb  7 00:10:25 2010
@@ -70,7 +70,9 @@
 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

Modified: tomcat/trunk/build.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=907346&r1=907345&r2=907346&view=diff
==============================================================================
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Sun Feb  7 00:10:25 2010
@@ -1628,19 +1628,19 @@
     </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>



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