You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2008/01/13 21:36:59 UTC
svn commit: r611635 - in /tomcat/trunk: build.properties.default extras.xml
Author: markt
Date: Sun Jan 13 12:36:58 2008
New Revision: 611635
URL: http://svn.apache.org/viewvc?rev=611635&view=rev
Log:
Library updates.
Update to latest versions:
- commons logging 1.1.1 (needed fixes to build script to work with non 1.1 version)
- nsis 2.34
Modified:
tomcat/trunk/build.properties.default
tomcat/trunk/extras.xml
Modified: tomcat/trunk/build.properties.default
URL: http://svn.apache.org/viewvc/tomcat/trunk/build.properties.default?rev=611635&r1=611634&r2=611635&view=diff
==============================================================================
--- tomcat/trunk/build.properties.default (original)
+++ tomcat/trunk/build.properties.default Sun Jan 13 12:36:58 2008
@@ -47,7 +47,8 @@
base-tomcat.loc=http://archive.apache.org/dist/tomcat
# ----- Commons Logging, version 1.1 or later -----
-commons-logging-src.loc=${base-jakarta.loc}/commons/logging/source/commons-logging-1.1-src.tar.gz
+commons-logging-version=1.1.1
+commons-logging-src.loc=${base-jakarta.loc}/commons/logging/source/commons-logging-${commons-logging-version}-src.tar.gz
# ----- Webservices -----
jaxrpc-src.loc=http://repo1.maven.org/maven2/geronimo-spec/geronimo-spec-jaxrpc/1.1-rc4/geronimo-spec-jaxrpc-1.1-rc4.jar
@@ -81,12 +82,12 @@
commons-collections-src.loc=${base-jakarta.loc}/commons/collections/source/commons-collections-3.2-src.tar.gz
# ----- NSIS, version 2.0 or later -----
-nsis.home=${base.path}/nsis-2.22
+nsis.home=${base.path}/nsis-2.34
nsis.exe=${nsis.home}/makensis.exe
nsis.installoptions.dll=${nsis.home}/Plugins/InstallOptions.dll
nsis.nsexec.dll=${nsis.home}/Plugins/nsExec.dll
nsis.nsisdl.dll=${nsis.home}/Plugins/NSISdl.dll
-nsis.loc=${base-sf.loc}/nsis/nsis-2.22-setup.exe
+nsis.loc=${base-sf.loc}/nsis/nsis-2.34-setup.exe
# ----- Commons Daemon, version 1.0-Alpha or later -----
commons-daemon.home=${base.path}/commons-daemon-1.0.1
Modified: tomcat/trunk/extras.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/extras.xml?rev=611635&r1=611634&r2=611635&view=diff
==============================================================================
--- tomcat/trunk/extras.xml (original)
+++ tomcat/trunk/extras.xml Sun Jan 13 12:36:58 2008
@@ -102,36 +102,36 @@
<untar src="${tomcat.extras}/logging/commons-logging-src.tar"
dest="${tomcat.extras}/logging/"/>
- <replace dir="${tomcat.extras}/logging/commons-logging-1.1-src/src/java/org/apache/commons" >
+ <replace dir="${tomcat.extras}/logging/commons-logging-${commons-logging-version}-src/src/java/org/apache/commons" >
<replacefilter token="org.apache.commons"
value="org.apache.juli" />
</replace>
- <mkdir dir="${tomcat.extras}/logging/commons-logging-1.1-src/src/java/org/apache/juli" />
- <move todir="${tomcat.extras}/logging/commons-logging-1.1-src/src/java/org/apache/juli">
- <fileset dir="${tomcat.extras}/logging/commons-logging-1.1-src/src/java/org/apache/commons" />
+ <mkdir dir="${tomcat.extras}/logging/commons-logging-${commons-logging-version}-src/src/java/org/apache/juli" />
+ <move todir="${tomcat.extras}/logging/commons-logging-${commons-logging-version}-src/src/java/org/apache/juli">
+ <fileset dir="${tomcat.extras}/logging/commons-logging-${commons-logging-version}-src/src/java/org/apache/commons" />
</move>
- <replace dir="${tomcat.extras}/logging/commons-logging-1.1-src" >
+ <replace dir="${tomcat.extras}/logging/commons-logging-${commons-logging-version}-src" >
<replacefilter token="org.apache.commons"
value="org.apache.juli" />
<replacefilter token="org/apache/commons/"
value="org/apache/juli/" />
</replace>
- <copy tofile="${tomcat.extras}/logging/commons-logging-1.1-src/build2.xml"
- file="${tomcat.extras}/logging/commons-logging-1.1-src/build.xml" />
+ <copy tofile="${tomcat.extras}/logging/commons-logging-${commons-logging-version}-src/build2.xml"
+ file="${tomcat.extras}/logging/commons-logging-${commons-logging-version}-src/build.xml" />
- <ant antfile="${tomcat.extras}/logging/commons-logging-1.1-src/build2.xml"
- dir="${tomcat.extras}/logging/commons-logging-1.1-src"
+ <ant antfile="${tomcat.extras}/logging/commons-logging-${commons-logging-version}-src/build2.xml"
+ dir="${tomcat.extras}/logging/commons-logging-${commons-logging-version}-src"
target="getlibs" />
- <copy todir="${tomcat.extras}/logging/commons-logging-1.1-src">
- <fileset dir="${tomcat.extras}/logging/commons-logging-1.1-src/lib" />
+ <copy todir="${tomcat.extras}/logging/commons-logging-${commons-logging-version}-src">
+ <fileset dir="${tomcat.extras}/logging/commons-logging-${commons-logging-version}-src/lib" />
</copy>
- <ant antfile="${tomcat.extras}/logging/commons-logging-1.1-src/build2.xml"
- dir="${tomcat.extras}/logging/commons-logging-1.1-src"
+ <ant antfile="${tomcat.extras}/logging/commons-logging-${commons-logging-version}-src/build2.xml"
+ dir="${tomcat.extras}/logging/commons-logging-${commons-logging-version}-src"
target="compile" />
<jar jarfile="${tomcat-juli.jar}">
- <fileset dir="${tomcat.extras}/logging/commons-logging-1.1-src/target/classes">
+ <fileset dir="${tomcat.extras}/logging/commons-logging-${commons-logging-version}-src/target/classes">
<include name="org/apache/juli/logging/*.class" />
<include name="org/apache/juli/logging/impl/LogFactoryImpl*.class" />
<include name="org/apache/juli/logging/impl/WeakHashtable*.class" />
@@ -155,7 +155,7 @@
forceOverwrite="yes" fileext=".md5" />
<jar jarfile="${tomcat-juli-adapters.jar}">
- <fileset dir="${tomcat.extras}/logging/commons-logging-1.1-src/target/classes">
+ <fileset dir="${tomcat.extras}/logging/commons-logging-${commons-logging-version}-src/target/classes">
<include name="org/apache/juli/logging/impl/**.class" />
<exclude name="org/apache/juli/logging/impl/WeakHashtable*.class" />
<exclude name="org/apache/juli/logging/impl/LogFactoryImpl.class" />
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org