[Rubyeclipse-commit] SF.net SVN: rubyeclipse: [1967] trunk/org.rubypeople.rdt.doc.user

[<mba...@us...>]

Revision: 1967
          http://svn.sourceforge.net/rubyeclipse/?rev=1967&view=rev
Author:   mbarchfe
Date:     2007-02-18 08:53:06 -0800 (Sun, 18 Feb 2007)

Log Message:
-----------
renamed featureVersion to version

Modified Paths:
--------------
    trunk/org.rubypeople.rdt.doc.user/build.xml
    trunk/org.rubypeople.rdt.doc.user/buildDocbook.xml

Modified: trunk/org.rubypeople.rdt.doc.user/build.xml
===================================================================
--- trunk/org.rubypeople.rdt.doc.user/build.xml	2007-02-18 12:15:15 UTC (rev 1966)
+++ trunk/org.rubypeople.rdt.doc.user/build.xml	2007-02-18 16:53:06 UTC (rev 1967)
@@ -12,9 +12,10 @@
 	<property name="javacSource" value="1.3"/>
 	<property name="javacTarget" value="1.2"/>
 	<property name="compilerArg" value=""/>
-	<property name="featureVersion" value="0.9.0"/>
-	<!-- featureVersion might also be set from outside -->
-	<echo message="Using featureVersion=${featureVersion}"/>		
+	<property name="version" value="0.9.0"/>
+	<property name="version.full" value="0.9.0.07NGT"/>
+	<!-- version might also be set from outside -->
+	<echo message="Using version=${version}"/>		
 
 	<target name="init" depends="properties">
 		<condition property="pluginTemp" value="${buildTempFolder}/plugins">
@@ -40,7 +41,7 @@
 		<antcall target="gather.bin.parts">
 			<param name="destination.temp.folder" value="${temp.folder}/"/>
 		</antcall>
-		<zip zipfile="${plugin.destination}/org.rubypeople.rdt.doc.user_${featureVersion}.jar" basedir="${temp.folder}/org.rubypeople.rdt.doc.user_${featureVersion}" filesonly="false" whenempty="skip" update="false"/>
+		<zip zipfile="${plugin.destination}/org.rubypeople.rdt.doc.user_${version.full}.jar" basedir="${temp.folder}/org.rubypeople.rdt.doc.user_${version.full}" filesonly="false" whenempty="skip" update="false"/>
 		<delete dir="${temp.folder}"/>
 	</target>
 
@@ -50,7 +51,7 @@
 			in a subdirectory but base.dir may not be an absolute path, because then the references in toc.xml would
 			be absolute, too -->
 		<java classpath="${basedir}/lib/ant.jar:${basedir}/lib/ant-launcher.jar:${basedir}/lib/ant-trax.jar" classname="org.apache.tools.ant.Main" dir="${basedir}" fork="true" >
-			<arg value="-DfeatureVersion=${featureVersion}"/>
+			<arg value="-Dversion=${version}"/>
 			<arg value="-f"/>
 			<arg value="buildDocbook.xml"/>
 			<arg value="html"/>
@@ -61,8 +62,8 @@
 	</target>
 
 	<target name="gather.bin.parts" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/org.rubypeople.rdt.doc.user_${featureVersion}"/>
-		<copy todir="${destination.temp.folder}/org.rubypeople.rdt.doc.user_${featureVersion}" failonerror="true">
+		<mkdir dir="${destination.temp.folder}/org.rubypeople.rdt.doc.user_${version.full}"/>
+		<copy todir="${destination.temp.folder}/org.rubypeople.rdt.doc.user_${version.full}" failonerror="true">
 			<fileset dir="${basedir}" includes="plugin.xml,toc.xml,plugin.properties,html/,images/,META-INF/" excludes="build.xml"			/>
 		</copy>
 	</target>
@@ -71,7 +72,7 @@
 	</target>
 
 	<target name="gather.sources" depends="init" if="destination.temp.folder">
-		<copy todir="${destination.temp.folder}/org.rubypeople.rdt.doc.user_${featureVersion}" failonerror="false">
+		<copy todir="${destination.temp.folder}/org.rubypeople.rdt.doc.user_${version.full}" failonerror="false">
 			<fileset dir="${basedir}" includes="docbook.xml,buildDocbook.xml,customizationLayer.xsl"/>
 		</copy>
 	</target>
@@ -102,7 +103,7 @@
 		<delete>
 			<fileset dir="${temp.folder}" includes="**/*.bin.log"			/>
 		</delete>
-		<zip zipfile="${plugin.destination}/org.rubypeople.rdt.doc.user_${featureVersion}.zip" basedir="${temp.folder}" filesonly="true" whenempty="skip" update="false"/>
+		<zip zipfile="${plugin.destination}/org.rubypeople.rdt.doc.user_${version.full}.zip" basedir="${temp.folder}" filesonly="true" whenempty="skip" update="false"/>
 		<delete dir="${temp.folder}"/>
 	</target>
 

Modified: trunk/org.rubypeople.rdt.doc.user/buildDocbook.xml
===================================================================
--- trunk/org.rubypeople.rdt.doc.user/buildDocbook.xml	2007-02-18 12:15:15 UTC (rev 1966)
+++ trunk/org.rubypeople.rdt.doc.user/buildDocbook.xml	2007-02-18 16:53:06 UTC (rev 1967)
@@ -20,7 +20,7 @@
 	</target>
 	
 	<target name="init" depends="docbook.unpack">
-		<fail unless="featureVersion" message="Property featureVersion must be set. Please always call this script from build.xml"/>
+		<fail unless="version" message="Property version must be set. Please always call this script from build.xml"/>
 		<available type="dir" file="${docbook.xsl.dir}" property="did.unpack.work" />
 		<fail unless="did.unpack.work" message="Docbook xsl directory ${} was not created."/>
 	</target>
@@ -38,7 +38,7 @@
 	<target name="replaceVarInCustomizationLayer">
 	   <copy file="customizationLayer.xsl" tofile="customizationLayerCopy.xsl"/>
 	   <replace file="customizationLayerCopy.xsl">	   
-	     <replacefilter token="@@VERSION@@" value="${featureVersion}"/>
+	     <replacefilter token="@@VERSION@@" value="${version}"/>
       </replace>
 	</target>
 
@@ -60,7 +60,6 @@
         <param name="eclipse.plugin.id" expression="org.rubypeople.rdt.doc.user"/>
         <param name="eclipse.plugin.name" expression="%Plugin.name"/>
         <param name="eclipse.plugin.provider" expression="%providerName"/>
-      	<param name="eclipse.plugin.version" expression="${featureVersion}"/>
       	<xmlcatalog id="docbook.catalog">
      	 <dtd publicId="-//OASIS//DTD DocBook V3.1//EN" location="${docbook.dtd.dir}/docbookx.dtd"/>
         </xmlcatalog>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.