[ooo-build-commit] ooeclipse: Branch 'master' - 2 commits
Cédric Bosdonnat
cbosdo at kemper.freedesktop.org
Wed Nov 11 05:48:01 PST 2009
build/build.xml | 15 ++++---
core/build/build.xml | 13 +-----
core/source/org/openoffice/ide/eclipse/core/editors/description/DescriptionEditor.java | 2 -
core/source/org/openoffice/ide/eclipse/core/editors/messages.properties | 1
cpp/build/build.xml | 19 ++++------
java/build/build.xml | 18 ++++-----
6 files changed, 29 insertions(+), 39 deletions(-)
New commits:
commit b8cd09dd64e2b6cb843daa5b4aeaaaee77859068
Author: Cédric Bosdonnat <cedricbosdo at openoffice.org>
Date: Wed Nov 11 14:47:22 2009 +0100
[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.
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"
commit c40129413685624adb9646b3ade4b975eaf83c10
Author: Cédric Bosdonnat <cedricbosdo at openoffice.org>
Date: Wed Nov 11 14:46:53 2009 +0100
[Core]Missing string externalized
diff --git a/core/source/org/openoffice/ide/eclipse/core/editors/description/DescriptionEditor.java b/core/source/org/openoffice/ide/eclipse/core/editors/description/DescriptionEditor.java
index 9450ca7..229f1ed 100644
--- a/core/source/org/openoffice/ide/eclipse/core/editors/description/DescriptionEditor.java
+++ b/core/source/org/openoffice/ide/eclipse/core/editors/description/DescriptionEditor.java
@@ -147,7 +147,7 @@ public class DescriptionEditor extends FormEditor {
input.getFile().refreshLocal( IResource.DEPTH_ZERO, pMonitor );
} catch ( Exception e ) {
- PluginLogger.error( "Error saving the description.xml", e );
+ PluginLogger.error( Messages.getString("DescriptionEditor.ErrorSaving"), e ); //$NON-NLS-1$
} finally {
try { out.close(); } catch ( Exception e ) { }
mSourcePage.doRevertToSaved();
diff --git a/core/source/org/openoffice/ide/eclipse/core/editors/messages.properties b/core/source/org/openoffice/ide/eclipse/core/editors/messages.properties
index 4707345..c69ee1e 100644
--- a/core/source/org/openoffice/ide/eclipse/core/editors/messages.properties
+++ b/core/source/org/openoffice/ide/eclipse/core/editors/messages.properties
@@ -3,6 +3,7 @@ RegDocumentProvider.RegviewError=Error while reading regview output
PackagePropertiesEditor.DescriptionParseError=Error parsing description.xml file
PackagePropertiesFormPage.PackagePropertiesText=Contents
ContentsSection.Title=Package content
+DescriptionEditor.ErrorSaving=Error saving the description.xml
IntegrationSection.Description=Define the dependencies of the extension.
IntegrationSection.MaxOOoVersion=Maximum OOo version
IntegrationSection.MinOOoVersion=Minimum OOo version
More information about the ooo-build-commit
mailing list