remm        2004/09/05 03:17:51

  Modified:    .        build.xml
  Log:
  - Fix typo.
  
  Revision  Changes    Path
  1.210     +23 -23    jakarta-tomcat-5/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
  retrieving revision 1.209
  retrieving revision 1.210
  diff -u -r1.209 -r1.210
  --- build.xml 4 Sep 2004 18:05:58 -0000       1.209
  +++ build.xml 5 Sep 2004 10:17:51 -0000       1.210
  @@ -13,31 +13,31 @@
     <!-- Project Properties -->
     <property name="name"                  value="Apache Tomcat" />
     <property name="year"                  value="2004" />
  -  <property name="version.major"         value="5" />

  +  <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="1" />

  -  <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.number"        
value="${version.major}.${version.minor}.${version.build}.${version.patch}" />

  +  -->
  +  <property name="version.build"         value="1" />
  +  <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.number"        
value="${version.major}.${version.minor}.${version.build}.${version.patch}" />
   
     <property name="project"               value="jakarta-tomcat" />
     <property name="final.name"            value="${project}-${version}" />
  @@ -1619,7 +1619,7 @@
   
          <target name="package-compat-zip">
            <zip zipfile="${tomcat.release}/v${version}/bin/${final.name}-compat.zip">
  -           <zipfileset dir="${tomcat.compat}" prefix="${final.name}t" 
  +           <zipfileset dir="${tomcat.compat}" prefix="${final.name}" 
                          includes="**" />
              <zipfileset dir="${tomcat.dist}" prefix="${final.name}" 
               includes="LICENSE" />
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to