You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by mt...@apache.org on 2012/03/02 17:21:18 UTC
svn commit: r1296284 - in /tomcat/trunk: build.properties.default build.xml
Author: mturk
Date: Fri Mar 2 16:21:18 2012
New Revision: 1296284
URL: http://svn.apache.org/viewvc?rev=1296284&view=rev
Log:
Use simpler tomcat-native distribution which comes with 1.1.23+
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=1296284&r1=1296283&r2=1296284&view=diff
==============================================================================
--- tomcat/trunk/build.properties.default (original)
+++ tomcat/trunk/build.properties.default Fri Mar 2 16:21:18 2012
@@ -132,16 +132,13 @@ jdt.loc.1=http://archive.eclipse.org/ecl
jdt.loc.2=http://download.eclipse.org/eclipse/downloads/drops/${jdt.release}/ecj-${jdt.version}.jar
# ----- Tomcat native library -----
-tomcat-native.version=1.1.22
+tomcat-native.version=1.1.23
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
tomcat-native.loc.2=${base-tomcat.loc.2}/tomcat-connectors/native/${tomcat-native.version}/source/tomcat-native-${tomcat-native.version}-src.tar.gz
-tomcat-native.dll.1=${base-tomcat.loc.1}/tomcat-connectors/native/${tomcat-native.version}/binaries
-tomcat-native.dll.2=${base-tomcat.loc.2}/tomcat-connectors/native/${tomcat-native.version}/binaries
-tomcat-native.dll.win32=${tomcat-native.home}/tcnative-1.dll.x86
-tomcat-native.dll.x64=${tomcat-native.home}/tcnative-1.dll.x64
-tomcat-native.dll.i64=${tomcat-native.home}/tcnative-1.dll.i64
+tomcat-native.win.1=${base-tomcat.loc.1}/tomcat-connectors/native/${tomcat-native.version}/binaries/tomcat-native-${tomcat-native.version}-win32-bin.zip
+tomcat-native.win.2=${base-tomcat.loc.2}/tomcat-connectors/native/${tomcat-native.version}/binaries/tomcat-native-${tomcat-native.version}-win32-bin.zip
# ----- Commons DBCP, version 1.1 or later -----
commons-dbcp.version=1.4
@@ -164,7 +161,7 @@ nsis.nsisdl.dll=${nsis.home}/Plugins/NSI
nsis.loc=${base-sf.loc}/nsis/nsis-2.46.zip
# ----- Commons Daemon, version 1.0-Alpha or later -----
-commons-daemon.version=1.0.9
+commons-daemon.version=1.0.10
commons-daemon.home=${base.path}/commons-daemon-${commons-daemon.version}
commons-daemon.jar=${commons-daemon.home}/commons-daemon-${commons-daemon.version}.jar
commons-daemon.native.win.home=${commons-daemon.home}/windows
Modified: tomcat/trunk/build.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1296284&r1=1296283&r2=1296284&view=diff
==============================================================================
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Fri Mar 2 16:21:18 2012
@@ -1532,14 +1532,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"
- tofile="${tomcat.dist}/bin/tcnative-1.dll" />
- <!-- tc native 64 bit for amd/emt -->
- <copy file="${tomcat-native.home}/tcnative-1.dll.x64"
- tofile="${tomcat.dist}/bin/x64/tcnative-1.dll" />
- <!-- tc native 64 bit for ia -->
- <copy file="${tomcat-native.home}/tcnative-1.dll.i64"
- tofile="${tomcat.dist}/bin/i64/tcnative-1.dll" />
+ <copy todir="${tomcat.dist}/bin">
+ <fileset dir="${tomcat-native.home}/bin">
+ <include name="*.dll"/>
+ <include name="**/*.dll"/>
+ </fileset>
+ </copy>
+
<!-- platform README files -->
<echo append="false" file="${tomcat.dist}/bin/i64/README">
Apache Tomcat ${version} native binaries for Win64 IA64 platform.
@@ -2339,24 +2338,9 @@ Apache Tomcat ${version} native binaries
<target name="download-dist"
description="Download additional components for a distribution" >
- <antcall target="downloadfile-2">
- <param name="sourcefile.1" value="${tomcat-native.dll.1}/win32/tcnative-1.dll"/>
- <param name="sourcefile.2" value="${tomcat-native.dll.2}/win32/tcnative-1.dll"/>
- <param name="destfile" value="${tomcat-native.dll.win32}"/>
- <param name="destdir" value="${tomcat-native.home}"/>
- </antcall>
-
- <antcall target="downloadfile-2">
- <param name="sourcefile.1" value="${tomcat-native.dll.1}/win64/x64/tcnative-1.dll"/>
- <param name="sourcefile.2" value="${tomcat-native.dll.2}/win64/x64/tcnative-1.dll"/>
- <param name="destfile" value="${tomcat-native.dll.x64}"/>
- <param name="destdir" value="${tomcat-native.home}"/>
- </antcall>
-
- <antcall target="downloadfile-2">
- <param name="sourcefile.1" value="${tomcat-native.dll.1}/win64/ia64/tcnative-1.dll"/>
- <param name="sourcefile.2" value="${tomcat-native.dll.2}/win64/ia64/tcnative-1.dll"/>
- <param name="destfile" value="${tomcat-native.dll.i64}"/>
+ <antcall target="downloadzip-2">
+ <param name="sourcefile.1" value="${tomcat-native.win.1}"/>
+ <param name="sourcefile.2" value="${tomcat-native.win.2}"/>
<param name="destdir" value="${tomcat-native.home}"/>
</antcall>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: svn commit: r1296284 - in /tomcat/trunk: build.properties.default
build.xml
Posted by Mladen Turk <mt...@apache.org>.
On 03/03/2012 08:41 PM, Rainer Jung wrote:
> On 02.03.2012 17:21, mturk@apache.org wrote:
>> Author: mturk
>> Date: Fri Mar 2 16:21:18 2012
>> New Revision: 1296284
>>
>> URL: http://svn.apache.org/viewvc?rev=1296284&view=rev
>> Log:
>> Use simpler tomcat-native distribution which comes with 1.1.23+
>>
>>
>> # ----- Commons Daemon, version 1.0-Alpha or later -----
>> -commons-daemon.version=1.0.9
>> +commons-daemon.version=1.0.10
>
> Just double checking: that change was intentional?
>
Yep. I should have probably done that in two commits. Sorry about that.
Regards
--
^TM
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: svn commit: r1296284 - in /tomcat/trunk: build.properties.default
build.xml
Posted by Rainer Jung <ra...@kippdata.de>.
On 02.03.2012 17:21, mturk@apache.org wrote:
> Author: mturk
> Date: Fri Mar 2 16:21:18 2012
> New Revision: 1296284
>
> URL: http://svn.apache.org/viewvc?rev=1296284&view=rev
> Log:
> Use simpler tomcat-native distribution which comes with 1.1.23+
>
> 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=1296284&r1=1296283&r2=1296284&view=diff
> ==============================================================================
> --- tomcat/trunk/build.properties.default (original)
> +++ tomcat/trunk/build.properties.default Fri Mar 2 16:21:18 2012
> @@ -164,7 +161,7 @@ nsis.nsisdl.dll=${nsis.home}/Plugins/NSI
> nsis.loc=${base-sf.loc}/nsis/nsis-2.46.zip
>
> # ----- Commons Daemon, version 1.0-Alpha or later -----
> -commons-daemon.version=1.0.9
> +commons-daemon.version=1.0.10
Just double checking: that change was intentional?
Regards,
Rainer
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org