Author: kkolinko Date: Wed Sep 17 14:17:04 2014 New Revision: 1625606 URL: http://svn.apache.org/r1625606 Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56988 Allow to use relative paths in base.path setting when building Tomcat, e.g. "base.path=../libraries" Use consistent naming for "inheritAll" property: Ant manual uses camelCase for that name. It is port of r1625599 from tomcat/trunk.
Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/build.xml tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc7.0.x/trunk/ ------------------------------------------------------------------------------ Merged /tomcat/trunk:r1625599 Modified: tomcat/tc7.0.x/trunk/build.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/build.xml?rev=1625606&r1=1625605&r2=1625606&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/build.xml (original) +++ tomcat/tc7.0.x/trunk/build.xml Wed Sep 17 14:17:04 2014 @@ -1018,7 +1018,7 @@ <!-- build the jdbc-pool jar and source jar--> <echo message="Building Tomcat JDBC pool libraries"/> <ant antfile="${tomcat.jdbc.dir}/build.xml" dir="${tomcat.jdbc.dir}" - inheritall="false" target="build"> + inheritAll="false" target="build"> <property name="tomcat.pool" value="${tomcat.pool}" /> <property name="tomcat.juli.jar" value="${tomcat-juli.jar}" /> <property name="skip.download" value="set"/> @@ -1058,7 +1058,7 @@ <!-- build the jdbc-pool source jar--> <echo message="Building Tomcat JDBC pool src JAR"/> <ant antfile="${tomcat.jdbc.dir}/build.xml" dir="${tomcat.jdbc.dir}" - inheritall="false" target="build-src"> + inheritAll="false" target="build-src"> <property name="tomcat.pool" value="${tomcat.pool}" /> <property name="tomcat.juli.jar" value="${tomcat-juli.jar}" /> <property name="skip.download" value="set"/> @@ -1534,7 +1534,7 @@ <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" /> + inheritAll="false" target="compile" /> <jar jarfile="${tomcat-juli-extras.jar}" manifest="${tomcat.manifests}/default.manifest" @@ -2628,7 +2628,7 @@ Apache Tomcat ${version} native binaries <delete dir="${tomcat.output}" /> <!-- Remove the copied catalina.properties --> <delete file="java/org/apache/catalina/startup/catalina.properties" /> - <ant antfile="${tomcat.jdbc.dir}/build.xml" dir="${tomcat.jdbc.dir}" inheritall="false" target="clean"> + <ant antfile="${tomcat.jdbc.dir}/build.xml" dir="${tomcat.jdbc.dir}" inheritAll="false" target="clean"> <property name="tomcat.pool" value="${tomcat.pool}" /> </ant> <!-- remove jdbc-pool documentation --> Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1625606&r1=1625605&r2=1625606&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Wed Sep 17 14:17:04 2014 @@ -284,6 +284,10 @@ <code>catalina.bat</code> so that escape sequences are preserved. Patch by Lucas Theisen. (markt) </fix> + <update> + <bug>56988</bug>: Allow to use relative path in <code>base.path</code> + setting when building Tomcat. (kkolinko) + </update> </changelog> </subsection> </section> --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org