[build] Finally removed all use of the versions.properties

The feature files are still usable by PDE: the replaced version strings
in the feature files are in the form 0.0.0.plugin.

5 files changed, 35 insertions, 41 deletions

diff --git a/build/build.xml b/build/build.xml
index 18792ff..84676e8 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -46,8 +46,6 @@
 	<import file="../java/build.xml"/>
 	<import file="../cpp/build.xml"/>
 	
-	<property file="versions.properties"/>
-	
 	<target name="help" description="Tells how to run the script">
 		<echo>
 		This ant file has to be called with the following parameters:
@@ -170,19 +168,20 @@
 		<delete file="../ooeclipseintegration_site.zip" />
 	</target>
 	
+	<target name="versions" depends="core.version, java.version, cpp.version" />
 	
-	<target name="core.feature">
-		<!-- Replace the @*_VERSION@ tokens to create the feature.xml file  -->
+	<target name="core.feature" depends="versions">
+		<!-- Replace the 0.0.0.* tokens to create the feature.xml file  -->
 		<copy file="features/core/feature.xml"
 			tofile="${out.path}/features/feature.xml" />
 		<replace file="${out.path}/features/feature.xml" 
-			token="@CORE_VERSION@" value="${core.plugin.version}" />
+			token="0.0.0.core" value="${core.Bundle-Version}" />
 		<replace file="${out.path}/features/feature.xml" 
-			token="@JAVA_VERSION@" value="${java.plugin.version}" />
+			token="0.0.0.java" value="${java.Bundle-Version}" />
 		<replace file="${out.path}/features/feature.xml" 
-			token="@CPP_VERSION@" value="${cpp.plugin.version}" />
+			token="0.0.0.cpp" value="${cpp.Bundle-Version}" />
 		
-		<jar destfile="${out.path}/features/${package.prefix}.core_${core.plugin.version}.jar">
+		<jar destfile="${out.path}/features/${package.prefix}.core_${core.Bundle-Version}.jar">
 			<zipfileset dir="${out.path}/features" prefix="" defaultexcludes="true">
 				<include name="feature.xml"/>
 			</zipfileset>
@@ -191,18 +190,18 @@
 		<delete file="${out.path}/features/feature.xml"/>
 	</target>
 	
-	<target name="java.feature">
-		<!-- Replace the @*_VERSION@ tokens to create the feature.xml file  -->
+	<target name="java.feature" depends="versions">
+		<!-- Replace the 0.0.0.* tokens to create the feature.xml file  -->
 		<copy file="features/java/feature.xml"
 			tofile="${out.path}/features/feature.xml" />
 		<replace file="${out.path}/features/feature.xml" 
-			token="@CORE_VERSION@" value="${core.plugin.version}" />
+			token="0.0.0.core" value="${core.Bundle-Version}" />
 		<replace file="${out.path}/features/feature.xml" 
-			token="@JAVA_VERSION@" value="${java.plugin.version}" />
+			token="0.0.0.java" value="${java.Bundle-Version}" />
 		<replace file="${out.path}/features/feature.xml" 
-			token="@CPP_VERSION@" value="${cpp.plugin.version}" />
+			token="0.0.0.cpp" value="${cpp.Bundle-Version}" />
 		
-		<jar destfile="${out.path}/features/${package.prefix}.java_${java.plugin.version}.jar">
+		<jar destfile="${out.path}/features/${package.prefix}.java_${java.Bundle-Version}.jar">
 			<zipfileset dir="${out.path}/features" prefix="" defaultexcludes="true">
 				<include name="feature.xml"/>
 			</zipfileset>
@@ -211,18 +210,18 @@
 		<delete file="${out.path}/features/feature.xml"/>
 	</target>
 	
-	<target name="cpp.feature">
-		<!-- Replace the @*_VERSION@ tokens to create the feature.xml file  -->
+	<target name="cpp.feature" depends="versions">
+		<!-- Replace the 0.0.0.* tokens to create the feature.xml file  -->
 		<copy file="features/cpp/feature.xml"
 			tofile="${out.path}/features/feature.xml" />
 		<replace file="${out.path}/features/feature.xml" 
-			token="@CORE_VERSION@" value="${core.plugin.version}" />
+			token="0.0.0.core" value="${core.Bundle-Version}" />
 		<replace file="${out.path}/features/feature.xml" 
-			token="@JAVA_VERSION@" value="${java.plugin.version}" />
+			token="0.0.0.java" value="${java.Bundle-Version}" />
 		<replace file="${out.path}/features/feature.xml" 
-			token="@CPP_VERSION@" value="${cpp.plugin.version}" />
+			token="0.0.0.cpp" value="${cpp.Bundle-Version}" />
 		
-		<jar destfile="${out.path}/features/${package.prefix}.cpp_${cpp.plugin.version}.jar">
+		<jar destfile="${out.path}/features/${package.prefix}.cpp_${cpp.Bundle-Version}.jar">
 			<zipfileset dir="${out.path}/features" prefix="" defaultexcludes="true">
 				<include name="feature.xml"/>
 			</zipfileset>
@@ -231,7 +230,7 @@
 		<delete file="${out.path}/features/feature.xml"/>
 	</target>
 	
-	<target name="features" depends="core.feature, java.feature, cpp.feature"/>
+	<target name="features" depends="core.feature, versions, java.feature, cpp.feature"/>
 	<target name="plugins" depends="core.plugin, java.plugin, cpp.plugin"/>
 	
 	<target name="site" depends="init-env, plugins, features"
@@ -241,11 +240,11 @@
 		<copy file="site.xml" 
 			tofile="${out.path}/site.xml" />
    		<replace file="${out.path}/site.xml"
-			token="@CORE_VERSION@" value="${core.plugin.version}" />
+			token="0.0.0.core" value="${core.Bundle-Version}" />
 		<replace file="${out.path}/site.xml"
-			token="@JAVA_VERSION@" value="${java.plugin.version}" />
+			token="0.0.0.java" value="${java.Bundle-Version}" />
 		<replace file="${out.path}/site.xml"
-			token="@CPP_VERSION@" value="${cpp.plugin.version}" />
+			token="0.0.0.cpp" value="${cpp.Bundle-Version}" />
 		
 		<!-- Copying the plugins -->
 		<echo message="Copying the plugins JARs"/>
diff --git a/build/features/core/feature.xml b/build/features/core/feature.xml
index b8b64c0..e2a00f4 100644
--- a/build/features/core/feature.xml
+++ b/build/features/core/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.openoffice.ide.eclipse.core"
       label="LibreOffice development plugin core"
-      version="1.2.0"
+      version="0.0.0.core"
       provider-name="Cédric Bosdonnat"
       plugin="org.openoffice.ide.eclipse.core">
 
@@ -340,19 +340,19 @@ version for the Library.
 
    <includes
          id="org.openoffice.ide.eclipse.java"
-         version="0.0.0"
+         version="0.0.0.java"
          optional="true"/>
 
    <includes
          id="org.openoffice.ide.eclipse.cpp"
-         version="0.0.0"
+         version="0.0.0.cpp"
          optional="true"/>
 
    <plugin
          id="org.openoffice.ide.eclipse.core"
          download-size="0"
          install-size="0"
-         version="0.0.0"
+         version="0.0.0.core"
          unpack="false"/>
 
 </feature>
diff --git a/build/features/cpp/feature.xml b/build/features/cpp/feature.xml
index 1b5f551..f900869 100644
--- a/build/features/cpp/feature.xml
+++ b/build/features/cpp/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.openoffice.ide.eclipse.cpp"
       label="LibreOffice development plugin support for C++ implementation"
-      version="0.5.0"
+      version="0.0.0.cpp"
       provider-name="Cédric Bosdonnat">
 
    <description>
@@ -327,15 +327,15 @@ version for the Library.
    </url>
 
    <requires>
-      <import feature="org.eclipse.cdt" version="6.0.0.200909110608"/>
-      <import plugin="org.openoffice.ide.eclipse.core" version="0.0.0"/>
+      <import feature="org.eclipse.cdt" version="6.0.0"/>
+      <import plugin="org.openoffice.ide.eclipse.core" version="0.0.0.core"/>
    </requires>
 
    <plugin
          id="org.openoffice.ide.eclipse.cpp"
          download-size="0"
          install-size="0"
-         version="0.0.0"
+         version="0.0.0.cpp"
          unpack="false"/>
 
 </feature>
diff --git a/build/features/java/feature.xml b/build/features/java/feature.xml
index 2b238c4..58ccc43 100644
--- a/build/features/java/feature.xml
+++ b/build/features/java/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.openoffice.ide.eclipse.java"
       label="LibreOffice development plugin support for Java implementation"
-      version="1.0.3"
+      version="0.0.0.java"
       provider-name="Cédric Bosdonnat">
 
    <description>
@@ -327,15 +327,15 @@ version for the Library.
    </url>
 
    <requires>
-      <import feature="org.eclipse.jdt" version="3.5.1.r351_v20090810-0600-7r88FEoFI0WTo6Az-1qFRHm37ChJ"/>
-      <import plugin="org.openoffice.ide.eclipse.core" version="0.0.0"/>
+      <import feature="org.eclipse.jdt"/>
+      <import plugin="org.openoffice.ide.eclipse.core" version="0.0.0.core"/>
    </requires>
 
    <plugin
          id="org.openoffice.ide.eclipse.java"
          download-size="0"
          install-size="0"
-         version="0.0.0"
+         version="0.0.0.java"
          unpack="false"/>
 
 </feature>
diff --git a/build/versions.properties b/build/versions.properties
deleted file mode 100644
index 3ab8bb1..0000000
--- a/build/versions.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-core.plugin.version=1.2.0
-java.plugin.version=1.0.3
-cpp.plugin.version=0.5.0
-
-debug=true
\ No newline at end of file