[Build]Added java.nobuild and cpp.nobuild params

Add the -Dcpp.nobuild=true or -Djava.nobuild=true to the ant command
line to unactivate the build of the cpp or java plugin.

4 files changed, 27 insertions, 38 deletions

diff --git a/build/build.xml b/build/build.xml
index fd53b36..ad30bd8 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -52,6 +52,13 @@
 			-Dopenoffice.home=/path/to/your/ooo/
 			-Declipse.home=/path/to/your/eclipse/
 			
+			To disable the build of a language plugin, define the corresponding
+			variable amongst the following ones. By default all the plugins are
+			built. The value of these parameters can be anything: they only have
+			to be defined.
+			-Dcpp.nobuild=true
+			-Djava.nobuild=true
+			
 			These arguments can be either put in the command line or in an
 			environment variable called ANT_ARGS.
 			
@@ -114,18 +121,12 @@
 		<mkdir dir="${out.path}/plugins" />
 		<mkdir dir="${out.path}/features" />
 	</target>
-
-	<target name="clean" description="Cleans the temporary output results" 
-		depends="init-env, core.clean, java.clean, cpp.clean">
-		<delete dir="${out.path}" />
-	</target>
 	
 	<target name="purge" description="Cleans all the output results" 
-		depends="clean, core.purge, java.purge, cpp.purge">
+		depends="core.purge, java.purge, cpp.purge">
 		<delete file="ooeclipseintegration_site.zip" />
 	</target>
 	
-	
 	<target name="site" depends="init-env, core.site, java.site, cpp.site"
 		description="Creates the Eclipse update site">
 		
diff --git a/core/build/build.xml b/core/build/build.xml
index df2dcdf..da1f27e 100644
--- a/core/build/build.xml
+++ b/core/build/build.xml
@@ -72,17 +72,11 @@
 		<mkdir dir="${core.out.classes}" />
 	</target>
 	
-	
-	<target name="clean">
-		<delete dir="${core.out.classes}" />
-		<delete file="${core.out.path}/javadocs-done"/>
-	</target>
-	
-	
-	<target name="purge" depends="clean">
+	<target name="purge">
+		<dirname property="core.basedir" file="${ant.file.core}/.."/>
+		<property name="core.out.path" value="${core.basedir}/bin/ant" />
 		<delete dir="${core.out.path}" />
 		<delete dir="${core.basedir}/doc/help/html/api" />
-		<delete file="${core.basedir}/UnoTypesGetter.jar" />
 	</target>
 
 	
@@ -136,7 +130,6 @@
 			<zipfileset dir="${core.basedir}/icons" prefix="icons"/>
 			<zipfileset dir="${core.basedir}/schema" prefix="schema"/>
 			<zipfileset dir="${core.basedir}" defaultexcludes="true" prefix="">
-				<include name="UnoTypesGetter.jar"/>
 				<include name="about.*"/>
 				<include name="plugin.*"/>
 			</zipfileset>
diff --git a/cpp/build/build.xml b/cpp/build/build.xml
index d9ff26b..8a1b5be 100644
--- a/cpp/build/build.xml
+++ b/cpp/build/build.xml
@@ -41,7 +41,6 @@
  ====================================================================== -->
 
 <project name="cpp" default="cpp.error">
-
 	
 	<target name="cpp.error">
 		<fail>Wrong target!
@@ -52,7 +51,7 @@
 	</target>
 	
 	
-	<target name="init-env">
+	<target name="init-env"  unless="cpp.nobuild">
 		<dirname property="cpp.basedir" file="${ant.file.cpp}/.."/>
 		
 		<loadproperties srcfile="${cpp.basedir}/build/build.properties" />
@@ -74,22 +73,20 @@
 		<mkdir dir="${cpp.out.classes}" />
 	</target>
 	
-	<target name="clean">
-		<delete dir="${cpp.out.classes}" />
-	</target>
-	
-	<target name="purge" depends="clean">
+	<target name="purge">
+		<dirname property="cpp.basedir" file="${ant.file.cpp}/.."/>
+		<property name="cpp.out.path" value="${cpp.basedir}/bin/ant" />
 		<delete dir="${cpp.out.path}" />
 	</target>
 
-	<target name="site" depends="cpp.plugin, cpp.feature">
+	<target name="site" depends="cpp.plugin, cpp.feature" unless="cpp.nobuild">
 		<copy file="${cpp.basedir}/build/site_fragment.xml.in" 
 			tofile="${cpp.out.path}/site_fragment.xml" />
 		<replace file="${cpp.out.path}/site_fragment.xml"
 			token="@VERSION@" value="${cpp.plugin.version}" />
 	</target>
 
-	<target name="cpp.feature">
+	<target name="cpp.feature" unless="cpp.nobuild">
 		<!-- Replace the @VERSION@ tokens to create the feature.xml file  -->
 		<copy file="${cpp.basedir}/build/feature.xml.in"
 			tofile="${cpp.out.path}/feature.xml" />
@@ -103,7 +100,7 @@
 		</jar>
 	</target>
 
-	<target name="cpp.compile" depends="init-env">
+	<target name="cpp.compile" depends="init-env" unless="cpp.nobuild">
 		<javac srcdir="${cpp.sources}" destdir="${cpp.out.classes}"
 			target="1.5" source="1.5" 
 			debug="${debug}"
@@ -111,7 +108,7 @@
 			excludes="**/unittests/**"/>
 	</target>
 	
-	<target name="cpp.plugin" depends="cpp.compile">
+	<target name="cpp.plugin" depends="cpp.compile" unless="cpp.nobuild">
 		<copy file="${cpp.basedir}/build/MANIFEST.MF.in"
 			tofile="${cpp.out.path}/MANIFEST.MF" />
 		<replace file="${cpp.out.path}/MANIFEST.MF"
diff --git a/java/build/build.xml b/java/build/build.xml
index 61f2ac5..bb68587 100644
--- a/java/build/build.xml
+++ b/java/build/build.xml
@@ -52,7 +52,7 @@
 	</target>
 	
 	
-	<target name="init-env">
+	<target name="init-env" unless="java.nobuild">
 		<dirname property="java.basedir" file="${ant.file.java}/.."/>
 		
 		<loadproperties srcfile="${java.basedir}/build/build.properties" />
@@ -74,22 +74,20 @@
 		<mkdir dir="${java.out.classes}" />
 	</target>
 	
-	<target name="clean">
-		<delete dir="${java.out.classes}" />
-	</target>
-	
-	<target name="purge" depends="clean">
+	<target name="purge">
+		<dirname property="java.basedir" file="${ant.file.java}/.."/>
+		<property name="java.out.path" value="${java.basedir}/bin/ant" />
 		<delete dir="${java.out.path}" />
 	</target>
 
-	<target name="site" depends="java.plugin, java.feature">
+	<target name="site" depends="java.plugin, java.feature" unless="java.nobuild">
 		<copy file="${java.basedir}/build/site_fragment.xml.in" 
 			tofile="${java.out.path}/site_fragment.xml" />
 		<replace file="${java.out.path}/site_fragment.xml"
 			token="@VERSION@" value="${java.plugin.version}" />
 	</target>
 
-	<target name="java.feature">
+	<target name="java.feature" unless="java.nobuild">
 		<!-- Replace the @VERSION@ tokens to create the feature.xml file  -->
 		<copy file="${java.basedir}/build/feature.xml.in"
 			tofile="${java.out.path}/feature.xml" />
@@ -103,7 +101,7 @@
 		</jar>
 	</target>
 
-	<target name="java.compile" depends="init-env">
+	<target name="java.compile" depends="init-env" unless="java.nobuild">
 		<javac srcdir="${java.sources}" destdir="${java.out.classes}"
 			target="1.5" source="1.5" 
 			debug="${debug}"
@@ -111,7 +109,7 @@
 			excludes="**/unittests/**"/>
 	</target>
 	
-	<target name="java.plugin" depends="java.compile">
+	<target name="java.plugin" depends="java.compile" unless="java.nobuild">
 		<copy file="${java.basedir}/build/MANIFEST.MF.in"
 			tofile="${java.out.path}/MANIFEST.MF" />
 		<replace file="${java.out.path}/MANIFEST.MF"