tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mt...@apache.org
Subject cvs commit: jakarta-tomcat-5 build.properties.default build.xml
Date Thu, 16 Sep 2004 13:38:15 GMT
mturk       2004/09/16 06:38:15

  Modified:    .        build.properties.default build.xml
  Log:
  Remove versioning from build.xml to build.properties. This way
  one can set version to any name desired. Just don't forget to set
  the numbers accordingly too.
  
  Revision  Changes    Path
  1.136     +9 -2      jakarta-tomcat-5/build.properties.default
  
  Index: build.properties.default
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-5/build.properties.default,v
  retrieving revision 1.135
  retrieving revision 1.136
  diff -u -r1.135 -r1.136
  --- build.properties.default	3 Sep 2004 11:23:46 -0000	1.135
  +++ build.properties.default	16 Sep 2004 13:38:14 -0000	1.136
  @@ -9,6 +9,13 @@
   # $Id$
   # -----------------------------------------------------------------------------
   
  +# ----- Vesion Control Flags -----
  +version.major=5
  +version.minor=5
  +version.build=0
  +version.patch=0
  +#Set the pretty version name
  +version=5.5.0-dev
   
   # ----- Compile Control Flags -----
   compile.debug=on
  @@ -36,7 +43,7 @@
   
   # ----- Default Base Path for Dependent Packages -----
   base.path=/usr/share/java
  -#base.path=../repository
  +#base.path=C:/path/to/the/repository
   #base.path=/usr/local
   
   # ----- Jakarta files base location -----
  
  
  
  1.214     +3 -22     jakarta-tomcat-5/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
  retrieving revision 1.213
  retrieving revision 1.214
  diff -u -r1.213 -r1.214
  --- build.xml	15 Sep 2004 13:05:41 -0000	1.213
  +++ build.xml	16 Sep 2004 13:38:14 -0000	1.214
  @@ -15,28 +15,9 @@
     <property name="year"                  value="2004" />
     <property name="version.major"         value="5" />
     <property name="version.minor"         value="5" />
  -  <!-- When releasing set the 'version.build' to even number
  -        and 'version.isdev' to zero.
  -  -->
  -  <property name="version.build"         value="3" />
  -  <property name="version.patch"         value="0" />
  -  <property name="version.isdev"         value="1" />
  -
  -  <condition property="isDevVersion"     value="-dev">
  -    <not>
  -      <equals arg1="${version.isdev}" arg2="0"/>
  -    </not>
  -  </condition>
  -  <condition property="isPatchedVersion" value=".${version.patch}">
  -    <not>
  -      <equals arg1="${version.patch}" arg2="0"/>
  -    </not>
  -  </condition>
  -  <!-- Second definition if not already conditionaly set -->
  -  <property name="isDevVersion"          value="" />
  -  <property name="isPatchedVersion"      value="" />
  -  
  -  <property name="version"               value="${version.major}.${version.minor}.${version.build}${isPatchedVersion}${isDevVersion}"
/>
  +  <property name="version.build"         value="0" />
  +  <property name="version.patch"         value="0" />  
  +  <property name="version"               value="5.5.0-dev" />
     <property name="version.number"        value="${version.major}.${version.minor}.${version.build}.${version.patch}"
/>
   
     <property name="project"               value="jakarta-tomcat" />
  
  
  

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


Mime
View raw message