You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cactus-dev@jakarta.apache.org by vm...@apache.org on 2003/07/14 21:05:33 UTC

cvs commit: jakarta-cactus/integration/eclipse/org.apache.cactus.eclipse.webapp build.xml

vmassol     2003/07/14 12:05:32

  Modified:    .        build-common.xml
               integration/eclipse/org.apache.cactus.eclipse.webapp
                        build.xml
  Log:
  Need to spearate the version in its major, minor and suffix constituents to make it work with Eclipse plugin versioning scheme which doesn't allow for non-digits in the version.
  
  Revision  Changes    Path
  1.30      +18 -4     jakarta-cactus/build-common.xml
  
  Index: build-common.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-cactus/build-common.xml,v
  retrieving revision 1.29
  retrieving revision 1.30
  diff -u -r1.29 -r1.30
  --- build-common.xml	9 Jul 2003 20:37:29 -0000	1.29
  +++ build-common.xml	14 Jul 2003 19:05:31 -0000	1.30
  @@ -15,9 +15,23 @@
     <property file="${user.home}/build.properties" />
     
     <!-- Project version -->
  -  <property name="project.version.release" value="1.5"/>
  -  <property name="project.version" value="${project.version.release}dev"/>
  -  <property name="project.doc.version" value="${project.version.release}dev"/>
  +  <!-- Note: The *.major and *.minor properties are needed by the Eclipse 
  +  	   plugins as plugin versions can only include numbers in the format 
  +  	   major.minor.patch -->
  +
  +  <property name="project.version.major" value="1"/>
  +  <property name="project.version.minor" value="5"/>
  +  <property name="project.version.suffix" value="dev"/>
  +
  +  <property name="project.version"
  +    value="${project.version.major}.${project.version.minor}${project.version.suffix}"/>
  +
  +  <!-- Used for the web site. Note: The property must not be ${project.version}
  +  	   as this property is overriden by the Gump build which replace it by
  +  	   a timestamp value and we want the real version value to be displayed on
  +  	   the web site -->
  +  <property name="project.doc.version" 
  +    value="${project.version.major}.${project.version.minor}${project.version.suffix}"/> 	
     <property name="project.doc.version.previous" value="1.4.1"/>
   
     <!-- Prefix to add to all distributable files -->
  
  
  
  1.17      +2 -2      jakarta-cactus/integration/eclipse/org.apache.cactus.eclipse.webapp/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-cactus/integration/eclipse/org.apache.cactus.eclipse.webapp/build.xml,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- build.xml	30 Jun 2003 16:22:10 -0000	1.16
  +++ build.xml	14 Jul 2003 19:05:32 -0000	1.17
  @@ -32,7 +32,7 @@
   
       <!-- Version by which the plugin will be identified -->
       <property name="project.version.plugin" 
  -        value="${project.version.release}.${DSTAMP}"/>
  +        value="${project.version.major}.${project.version.minor}.${DSTAMP}"/>
   
       <!-- Set the properties related to the source tree -->
       <property name="src.dir" location="${base.dir}/src"/>
  
  
  

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