tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rj...@apache.org
Subject svn commit: r810176 - in /tomcat/tc5.5.x/trunk: STATUS.txt build/build.xml build/resources/build.xml
Date Tue, 01 Sep 2009 19:07:21 GMT
Author: rjung
Date: Tue Sep  1 19:07:21 2009
New Revision: 810176

URL: http://svn.apache.org/viewvc?rev=810176&view=rev
Log:
Fix build.xml comment. Backport from trunk.

Modified:
    tomcat/tc5.5.x/trunk/STATUS.txt
    tomcat/tc5.5.x/trunk/build/build.xml
    tomcat/tc5.5.x/trunk/build/resources/build.xml

Modified: tomcat/tc5.5.x/trunk/STATUS.txt
URL: http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=810176&r1=810175&r2=810176&view=diff
==============================================================================
--- tomcat/tc5.5.x/trunk/STATUS.txt (original)
+++ tomcat/tc5.5.x/trunk/STATUS.txt Tue Sep  1 19:07:21 2009
@@ -67,24 +67,6 @@
   +1: kkolinko
   -1:
 
-* Improve build.properties comment in ant build files.
-  Backport from trunk, only the part on build.xml.
-  http://svn.apache.org/viewvc?rev=797425&view=rev
-  +1: rjung, kkolinko
-  -1:
-  kkolinko: (
-    1. Comments are documentation, thus CTR is fine for them.
-    2. The phrase "See "build.properties.default" in the top level directory"
-    is a bit wrong here: here it is in the build directory, not in the top
-    level one.
-
-    3. There are two other files besides build/build.xml in 5.5:
-     a) build/resources/build.xml that is copied
-     the top level directory of sources archive at build time. See *-src.zip
-     file from a release.
-     b) webapps/docs/build.xml It is mentioned in the docs (in building.html).
-  )
-
 * Fix a couple of Java 1.5 uses that should be 1.4 compatible
   http://people.apache.org/~markt/patches/2009-08-12-tc5.5.x-java14.patch
   +1: markt, rjung

Modified: tomcat/tc5.5.x/trunk/build/build.xml
URL: http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/build/build.xml?rev=810176&r1=810175&r2=810176&view=diff
==============================================================================
--- tomcat/tc5.5.x/trunk/build/build.xml (original)
+++ tomcat/tc5.5.x/trunk/build/build.xml Tue Sep  1 19:07:21 2009
@@ -20,8 +20,15 @@
 
   <!-- ===================== Initialize Property Values =================== -->
 
-  <!-- See "build.properties.sample" in the top level directory for all     -->
-  <!-- property values you must customize for successful building!!!        -->
+  <!-- We read customizable properties from the file "build.properties.default" -->
+  <!-- and also from "build.properties" if it exists.                           -->
+  <!-- The values in "build.properties" have stronger preference.               -->
+  <!-- If you want to customize your build, you can either change the values    -->
+  <!-- directly in the default file, or create a new build.properties and set   -->
+  <!-- the values there. This way you don't have to change a file which is part -->
+  <!-- of the original project source code.                                     -->
+  <!-- See "build.properties.default" in the build directory for some           -->
+  <!-- property values you may customize.                                       -->
   <property file="${user.home}/build.properties"/>
   <property file="build.properties"/>
 

Modified: tomcat/tc5.5.x/trunk/build/resources/build.xml
URL: http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/build/resources/build.xml?rev=810176&r1=810175&r2=810176&view=diff
==============================================================================
--- tomcat/tc5.5.x/trunk/build/resources/build.xml (original)
+++ tomcat/tc5.5.x/trunk/build/resources/build.xml Tue Sep  1 19:07:21 2009
@@ -21,8 +21,15 @@
 
   <!-- ===================== Initialize Property Values =================== -->
 
-  <!-- See "build.properties.sample" in the top level directory for all     -->
-  <!-- property values you must customize for successful building!!!        -->
+  <!-- We read customizable properties from the file "build.properties.default" -->
+  <!-- and also from "build.properties" if it exists.                           -->
+  <!-- The values in "build.properties" have stronger preference.               -->
+  <!-- If you want to customize your build, you can either change the values    -->
+  <!-- directly in the default file, or create a new build.properties and set   -->
+  <!-- the values there. This way you don't have to change a file which is part -->
+  <!-- of the original project source code.                                     -->
+  <!-- See "build.properties.default" in the build directory for some           -->
+  <!-- property values you may customize.                                       -->
   <property file="${user.home}/build.properties"/>
   <property file="build.properties"/>
   <property file="build.properties.default"/>



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


Mime
View raw message