[ooo-build-commit] ooeclipse: Branch 'master' - 2 commits
Cédric Bosdonnat
cbosdo at kemper.freedesktop.org
Thu Dec 9 11:44:51 PST 2010
build/build.xml | 109 ++-
build/features/core/feature.xml | 358 ++++++++++
build/features/cpp/feature.xml | 341 +++++++++
build/features/java/feature.xml | 341 +++++++++
build/site.xml | 23
build/site_footer.xml | 2
build/site_header.xml | 4
build/versions.properties | 5
core/.classpath | 1
core/META-INF/MANIFEST.MF | 4
core/build.properties | 18
core/build/MANIFEST.MF.in | 6
core/build/build.properties | 3
core/build/build.xml | 34
core/build/feature.xml.in | 64 -
core/build/site_fragment.xml.in | 7
core/icons/aboutBanner.png |binary
core/icons/install_banner.png |binary
core/icons/sdk_banner.png |binary
core/source/org/openoffice/ide/eclipse/core/i18n/ImageManager.properties | 4
cpp/build/MANIFEST.MF.in | 5
cpp/build/build.properties | 3
cpp/build/build.xml | 28
cpp/build/feature.xml.in | 57 -
cpp/build/site_fragment.xml.in | 7
dev/null |binary
java/META-INF/MANIFEST.MF | 2
java/build/MANIFEST.MF.in | 4
java/build/build.properties | 3
java/build/build.xml | 28
java/build/feature.xml.in | 57 -
java/build/site_fragment.xml.in | 7
32 files changed, 1181 insertions(+), 344 deletions(-)
New commits:
commit eb425e0e04841b1679d70269eaa107130932cb54
Author: Cédric Bosdonnat <cedricbosdo at openoffice.org>
Date: Thu Dec 9 20:39:50 2010 +0100
Moved the site fragments and features to the build project
This is a first step toward a better building system.
diff --git a/build/build.xml b/build/build.xml
index 0e35d4f..c38cca2 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -40,12 +40,14 @@
* Contributor(s): Cedric Bosdonnat
====================================================================== -->
-<project name="ooeclipseintegration" default="site" basedir="..">
+<project name="ooeclipseintegration" default="site">
<import file="../core/build/build.xml"/>
<import file="../java/build/build.xml"/>
<import file="../cpp/build/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:
@@ -71,7 +73,6 @@
</target>
<target name="check-ooo-version">
- <property file="ant/build.properties"/>
<property name="office.linux.basis.dir" value="${openoffice.home}${file.separator}basis-link"/>
<property name="office.linux.ure.dir" value="${office.linux.basis.dir}${file.separator}ure-link"/>
@@ -151,7 +152,7 @@
depends="init-env-ooo2, init-env-ooo3, core.init-env, java.init-env, cpp.init-env">
<property name="package.prefix" value="org.openoffice.ide.eclipse"/>
- <property name="out.path" value="site" />
+ <property name="out.path" value="../site" />
<condition property="debug" value="false">
<not>
<isset property="debug"/>
@@ -165,41 +166,99 @@
<target name="purge" description="Cleans all the output results"
depends="core.purge, java.purge, cpp.purge">
- <delete file="ooeclipseintegration_site.zip" />
+ <delete dir="../site"/>
+ <delete file="../ooeclipseintegration_site.zip" />
+ </target>
+
+
+ <target name="core.feature">
+ <!-- Replace the @*_VERSION@ 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}" />
+ <replace file="${out.path}/features/feature.xml"
+ token="@JAVA_VERSION@" value="${java.plugin.version}" />
+ <replace file="${out.path}/features/feature.xml"
+ token="@CPP_VERSION@" value="${cpp.plugin.version}" />
+
+ <jar destfile="${out.path}/features/${package.prefix}.core_${core.plugin.version}.jar">
+ <zipfileset dir="${out.path}/features" prefix="" defaultexcludes="true">
+ <include name="feature.xml"/>
+ </zipfileset>
+ </jar>
+
+ <delete file="${out.path}/features/feature.xml"/>
+ </target>
+
+ <target name="java.feature">
+ <!-- Replace the @*_VERSION@ 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}" />
+ <replace file="${out.path}/features/feature.xml"
+ token="@JAVA_VERSION@" value="${java.plugin.version}" />
+ <replace file="${out.path}/features/feature.xml"
+ token="@CPP_VERSION@" value="${cpp.plugin.version}" />
+
+ <jar destfile="${out.path}/features/${package.prefix}.java_${java.plugin.version}.jar">
+ <zipfileset dir="${out.path}/features" prefix="" defaultexcludes="true">
+ <include name="feature.xml"/>
+ </zipfileset>
+ </jar>
+
+ <delete file="${out.path}/features/feature.xml"/>
+ </target>
+
+ <target name="cpp.feature">
+ <!-- Replace the @*_VERSION@ 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}" />
+ <replace file="${out.path}/features/feature.xml"
+ token="@JAVA_VERSION@" value="${java.plugin.version}" />
+ <replace file="${out.path}/features/feature.xml"
+ token="@CPP_VERSION@" value="${cpp.plugin.version}" />
+
+ <jar destfile="${out.path}/features/${package.prefix}.cpp_${cpp.plugin.version}.jar">
+ <zipfileset dir="${out.path}/features" prefix="" defaultexcludes="true">
+ <include name="feature.xml"/>
+ </zipfileset>
+ </jar>
+
+ <delete file="${out.path}/features/feature.xml"/>
</target>
- <target name="site" depends="init-env, core.site, java.site, cpp.site"
+ <target name="features" depends="core.feature, java.feature, cpp.feature"/>
+ <target name="plugins" depends="core.plugin, java.plugin, cpp.plugin"/>
+
+ <target name="site" depends="init-env, plugins, features"
description="Creates the Eclipse update site">
- <!-- Copying the features and plugins -->
- <echo message="Copying the plugins feature JARs"/>
- <copy todir="${out.path}/features" >
- <fileset dir="."
- includes="**/features/*.jar" />
- <mapper type="flatten" />
- </copy>
+ <!-- Replace the versions in the site.xml -->
+ <copy file="site.xml"
+ tofile="${out.path}/site.xml" />
+ <replace file="${out.path}/site.xml"
+ token="@CORE_VERSION@" value="${core.plugin.version}" />
+ <replace file="${out.path}/site.xml"
+ token="@JAVA_VERSION@" value="${java.plugin.version}" />
+ <replace file="${out.path}/site.xml"
+ token="@CPP_VERSION@" value="${cpp.plugin.version}" />
- <echo message="Copying the plugins plugin JARs"/>
+ <!-- Copying the plugins -->
+ <echo message="Copying the plugins JARs"/>
<copy todir="${out.path}/plugins">
- <fileset dir="."
+ <fileset dir=".."
includes="**/plugins/*.jar" />
<mapper type="flatten" />
</copy>
-
- <!-- Site map generation -->
- <echo message="Merging the site.xml fragments"/>
- <concat destfile="${out.path}/site.xml">
- <header file="build/site_header.xml" />
- <fileset dir="."
- includes="**/site_fragment.xml">
- </fileset>
- <footer file="build/site_footer.xml" />
- </concat>
</target>
<target name="archive-site" description="Create a zip for the update site"
depends="site">
- <zip destfile="ooeclipseintegration_site.zip"
+ <zip destfile="../ooeclipseintegration_site.zip"
basedir="${out.path}"
includes="plugins/**, features/**, site.xml" />
</target>
diff --git a/build/features/core/feature.xml b/build/features/core/feature.xml
new file mode 100644
index 0000000..c8ac368
--- /dev/null
+++ b/build/features/core/feature.xml
@@ -0,0 +1,358 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+ id="org.openoffice.ide.eclipse.core"
+ label="LibreOffice development plugin core"
+ version="@CORE_VERSION@"
+ provider-name="Cédric Bosdonnat"
+ plugin="org.openoffice.ide.eclipse.core">
+
+ <description>
+ Tool to support LibreOffice development using Eclipse. It
+provides two editors for UNO-IDL file edition and registry files
+viewing. The plugin helps the user to write it's UNO-IDL file
+with syntax highlighting and some wizards, it although generates
+the type registries.
+
+KEEP IN MIND that this is only the core of the plugin: you will certainly
+need to install the plugin corresponding to the programming language used
+for the implementation. For example, to create a Java component, you need:
+ + The OOo development core plugin
+ + The OOo development Java plugin
+ + Of course the Eclipse JDT
+
+This plugin is user oriented and integrate some cheat sheets
+to guide the new user throught different steps.
+Even if this is a important piece of work, there are still other
+features to add and bugs to correct, please do not hesitate to
+express your remarks and requests on the LibreOffice development
+mailing list.
+ </description>
+
+ <copyright>
+ Copyright: (c) 2005-2010 Cedric Bosdonnat
+ </copyright>
+
+ <license url="http://www.gnu.org/licenses/lgpl.txt">
+ GNU LESSER GENERAL PUBLIC LICENSE
+Version 3, 29 June 2007
+Copyright (C) 2007 Free Software Foundation, Inc. http://fsf.org/
+Everyone is permitted to copy and distribute verbatim copies
+of this license document, but changing it is not allowed.
+This version of the GNU Lesser General Public License incorporates
+the terms and conditions of version 3 of the GNU General Public
+License, supplemented by the additional permissions listed below.
+0. Additional Definitions.
+As used herein, "this License" refers to version 3 of the GNU
+Lesser General Public License, and the "GNU GPL" refers to version 3
+of the GNU General Public License.
+"The Library" refers to a covered work governed by this License,
+other than an Application or a Combined Work as defined below.
+An "Application" is any work that makes use of an interface provided
+by the Library, but which is not otherwise based on the Library.
+Defining a subclass of a class defined by the Library is deemed
+a mode of using an interface provided by the Library.
+A "Combined Work" is a work produced by combining or linking
+an Application with the Library. The particular version of the
+Library with which the Combined Work was made is also called the "Linked
+Version".
+The "Minimal Corresponding Source" for a Combined Work means
+the Corresponding Source for the Combined Work, excluding any source
+code for portions of the Combined Work that, considered in isolation,
+are based on the Application, and not on the Linked Version.
+The "Corresponding Application Code" for a Combined Work means
+the object code and/or source code for the Application, including
+any data and utility programs needed for reproducing the Combined Work
+from the Application, but excluding the System Libraries of the Combined
+Work.
+1. Exception to Section 3 of the GNU GPL.
+You may convey a covered work under sections 3 and 4 of this
+License without being bound by section 3 of the GNU GPL.
+2. Conveying Modified Versions.
+If you modify a copy of the Library, and, in your modifications,
+a facility refers to a function or data to be supplied by an Application
+that uses the facility (other than as an argument passed when
+the facility is invoked), then you may convey a copy of the modified
+version:
+a) under this License, provided that you make a good faith effort
+to ensure that, in the event an Application does not supply the
+function or data, the facility still operates, and performs
+whatever part of its purpose remains meaningful, or
+b) under the GNU GPL, with none of the additional permissions
+of this License applicable to that copy.
+3. Object Code Incorporating Material from Library Header Files.
+The object code form of an Application may incorporate material
+from a header file that is part of the Library. You may convey such
+object code under terms of your choice, provided that, if the incorporated
+material is not limited to numerical parameters, data structure
+layouts and accessors, or small macros, inline functions and
+templates (ten or fewer lines in length), you do both of the following:
+a) Give prominent notice with each copy of the object code that
+the Library is used in it and that the Library and its use are
+covered by this License.
+b) Accompany the object code with a copy of the GNU GPL and this
+license document.
+4. Combined Works.
+You may convey a Combined Work under terms of your choice that,
+taken together, effectively do not restrict modification of the
+portions of the Library contained in the Combined Work and reverse
+engineering for debugging such modifications, if you also do
+each of the following:
+a) Give prominent notice with each copy of the Combined Work
+that the Library is used in it and that the Library and its use are
+covered by this License.
+b) Accompany the Combined Work with a copy of the GNU GPL and
+this license document.
+c) For a Combined Work that displays copyright notices during
+execution, include the copyright notice for the Library among
+these notices, as well as a reference directing the user to the
+copies of the GNU GPL and this license document.
+d) Do one of the following:
+0) Convey the Minimal Corresponding Source under the terms of
+this License, and the Corresponding Application Code in a form
+suitable for, and under terms that permit, the user to
+recombine or relink the Application with a modified version of
+the Linked Version to produce a modified Combined Work, in the
+manner specified by section 6 of the GNU GPL for conveying
+Corresponding Source.
+1) Use a suitable shared library mechanism for linking with the
+Library. A suitable mechanism is one that (a) uses at run time
+a copy of the Library already present on the user's computer
+system, and (b) will operate properly with a modified version
+of the Library that is interface-compatible with the Linked
+Version.
+e) Provide Installation Information, but only if you would otherwise
+be required to provide such information under section 6 of the
+GNU GPL, and only to the extent that such information is
+necessary to install and execute a modified version of the
+Combined Work produced by recombining or relinking the
+Application with a modified version of the Linked Version. (If
+you use option 4d0, the Installation Information must accompany
+the Minimal Corresponding Source and Corresponding Application
+Code. If you use option 4d1, you must provide the Installation
+Information in the manner specified by section 6 of the GNU GPL
+for conveying Corresponding Source.)
+5. Combined Libraries.
+You may place library facilities that are a work based on the
+Library side by side in a single library together with other
+library facilities that are not Applications and are not covered by this
+License, and convey such a combined library under terms of your
+choice, if you do both of the following:
+a) Accompany the combined library with a copy of the same work
+based on the Library, uncombined with any other library facilities,
+conveyed under the terms of this License.
+b) Give prominent notice with the combined library that part
+of it is a work based on the Library, and explaining where to find
+the accompanying uncombined form of the same work.
+6. Revised Versions of the GNU Lesser General Public License.
+The Free Software Foundation may publish revised and/or new versions
+of the GNU Lesser General Public License from time to time. Such
+new versions will be similar in spirit to the present version, but
+may differ in detail to address new problems or concerns.
+Each version is given a distinguishing version number. If the
+Library as you received it specifies that a certain numbered
+version of the GNU Lesser General Public License "or any later version"
+applies to it, you have the option of following the terms and
+conditions either of that published version or of any later version
+published by the Free Software Foundation. If the Library as
+you received it does not specify a version number of the GNU Lesser
+General Public License, you may choose any version of the GNU
+Lesser General Public License ever published by the Free Software Foundation.
+If the Library as you received it specifies that a proxy can
+decide whether future versions of the GNU Lesser General Public License
+shall apply, that proxy's public statement of acceptance of any version
+is permanent authorization for you to choose that version for the
+Library.
+GNU LESSER GENERAL PUBLIC LICENSE
+Version 3, 29 June 2007
+Copyright (C) 2007 Free Software Foundation, Inc. http://fsf.org/
+Everyone is permitted to copy and distribute verbatim copies
+of this license document, but changing it is not allowed.
+This version of the GNU Lesser General Public License incorporates
+the terms and conditions of version 3 of the GNU General Public
+License, supplemented by the additional permissions listed below.
+0. Additional Definitions.
+As used herein, "this License" refers to version 3 of the GNU
+Lesser General Public License, and the "GNU GPL" refers to
+version 3 of the GNU General Public License.
+"The Library" refers to a covered work governed by this License,
+other than an Application or a Combined Work as defined below.
+An "Application" is any work that makes use of an interface provided
+by the Library, but which is not otherwise based on the Library.
+Defining a subclass of a class defined by the Library is deemed
+a mode of using an interface provided by the Library.
+A "Combined Work" is a work produced by combining or linking
+an Application with the Library. The particular version of the
+Library with which the Combined Work was made is also called the
+"Linked Version".
+The "Minimal Corresponding Source" for a Combined Work means
+the Corresponding Source for the Combined Work, excluding any
+source code for portions of the Combined Work that, considered
+in isolation, are based on the Application, and not on the
+Linked Version.
+The "Corresponding Application Code" for a Combined Work means
+the object code and/or source code for the Application,
+including any data and utility programs needed for reproducing
+the Combined Work from the Application, but excluding the System
+Libraries of the Combined Work.
+1. Exception to Section 3 of the GNU GPL.
+You may convey a covered work under sections 3 and 4 of this
+License without being bound by section 3 of the GNU GPL.
+2. Conveying Modified Versions.
+If you modify a copy of the Library, and, in your modifications,
+a facility refers to a function or data to be supplied by an
+Application that uses the facility (other than as an argument
+passed when the facility is invoked), then you may convey a copy
+of the modified version:
+a) under this License, provided that you make a good faith effort
+to ensure that, in the event an Application does not supply the
+function or data, the facility still operates, and performs
+whatever part of its purpose remains meaningful, or
+b) under the GNU GPL, with none of the additional permissions
+of this License applicable to that copy.
+3. Object Code Incorporating Material from Library Header Files.
+The object code form of an Application may incorporate material
+from a header file that is part of the Library. You may convey
+such object code under terms of your choice, provided that, if
+the incorporated material is not limited to numerical parameters,
+data structure layouts and accessors, or small macros, inline
+functions and templates (ten or fewer lines in length), you do
+both of the following:
+a) Give prominent notice with each copy of the object code that
+the Library is used in it and that the Library and its use are
+covered by this License.
+b) Accompany the object code with a copy of the GNU GPL and this
+license document.
+4. Combined Works.
+You may convey a Combined Work under terms of your choice that,
+taken together, effectively do not restrict modification of the
+portions of the Library contained in the Combined Work and reverse
+engineering for debugging such modifications, if you also do
+each of the following:
+a) Give prominent notice with each copy of the Combined Work
+that the Library is used in it and that the Library and its use
+are covered by this License.
+b) Accompany the Combined Work with a copy of the GNU GPL and
+this license document.
+c) For a Combined Work that displays copyright notices during
+execution, include the copyright notice for the Library among
+these notices, as well as a reference directing the user to the
+copies of the GNU GPL and this license document.
+d) Do one of the following:
+0) Convey the Minimal Corresponding Source under the terms of
+this License, and the Corresponding Application Code in a form
+suitable for, and under terms that permit, the user to
+recombine or relink the Application with a modified version of
+the Linked Version to produce a modified Combined Work, in the
+manner specified by section 6 of the GNU GPL for conveying
+Corresponding Source.
+1) Use a suitable shared library mechanism for linking with the
+Library. A suitable mechanism is one that (a) uses at run time
+a copy of the Library already present on the user's computer
+system, and (b) will operate properly with a modified version
+of the Library that is interface-compatible with the Linked
+Version.
+e) Provide Installation Information, but only if you would otherwise
+be required to provide such information under section 6 of the
+GNU GPL, and only to the extent that such information is
+necessary to install and execute a modified version of the
+Combined Work produced by recombining or relinking the
+Application with a modified version of the Linked Version. (If
+you use option 4d0, the Installation Information must accompany
+the Minimal Corresponding Source and Corresponding Application
+Code. If you use option 4d1, you must provide the Installation
+Information in the manner specified by section 6 of the GNU GPL
+for conveying Corresponding Source.)
+5. Combined Libraries.
+You may place library facilities that are a work based on the
+Library side by side in a single library together with other
+library facilities that are not Applications and are not covered
+by this License, and convey such a combined library under terms
+of your choice, if you do both of the following:
+a) Accompany the combined library with a copy of the same work
+based on the Library, uncombined with any other library
+facilities, conveyed under the terms of this License.
+b) Give prominent notice with the combined library that part
+of it is a work based on the Library, and explaining where to
+find the accompanying uncombined form of the same work.
+6. Revised Versions of the GNU Lesser General Public License.
+The Free Software Foundation may publish revised and/or new versions
+of the GNU Lesser General Public License from time to time. Such
+new versions will be similar in spirit to the present version,
+but may differ in detail to address new problems or concerns.
+Each version is given a distdified version of the
+Combined Work produced by recombining or relinking the
+Application with a modified version of the Linked Version. (If
+you use option 4d0, the Installation Information must accompany
+the Minimal Corresponding Source and Corresponding Application
+Code. If you use option 4d1, you must provide the Installation
+Information in the manner specified by section 6 of the GNU GPL
+for conveying Corresponding Source.)
+5. Combined Libraries.
+You may place library facilities that are a work based on the
+Library side by side in a single library together with other
+library facilities that are not Applications and are not covered
+by this License, and convey such a combined library under terms
+of your choice, if you do both of the following:
+a) Accompany the combined library with a copy of the same work
+based on the Library, uncombined with any other library
+facilities, conveyed under the terms of this License.
+b) Give prominent notice with the combined library that part
+of it is a work based on the Library, and explaining where to
+find the accompanying uncombined form of the same work.
+6. Revised Versions of the GNU Lesser General Public License.
+The Free Software Foundation may publish revised and/or new versions
+of the GNU Lesser General Public License from time to time. Such
+new versions will be similar in spirit to the present version,
+but may differ in detail to address new problems or concerns.
+Each version is given a distinguishing version number. If the
+Library as you received it specifies that a certain numbered
+version of the GNU Lesser General Public License "or any later
+version" applies to it, you have the option of following the
+terms and conditions either of that published version or of
+any later version published by the Free Software Foundation.
+If the Library as you received it does not specify a version
+number of the GNU Lesser General Public License, you may choose
+any version of the GNU Lesser General Public License ever
+published by the Free Software Foundation.
+If the Library as you received it specifies that a proxy can
+decide whether future versions of the GNU Lesser General Public
+License shall apply, that proxy's public statement of acceptance
+of any version is permaneinguishing version number. If the
+Library as you received it specifies that a certain numbered
+version of the GNU Lesser General Public License "or any later
+version" applies to it, you have the option of following the
+terms and conditions either of that published version or of
+any later version published by the Free Software Foundation.
+If the Library as you received it does not specify a version
+number of the GNU Lesser General Public License, you may choose
+any version of the GNU Lesser General Public License ever
+published by the Free Software Foundation.
+If the Library as you received it specifies that a proxy can
+decide whether future versions of the GNU Lesser General Public
+License shall apply, that proxy's public statement of acceptance
+of any version is permanent authorization for you to choose that
+version for the Library.
+ </license>
+
+ <url>
+ <update label="LibreOffice Plugin update site" url="http://cedric.bosdonnat.free.fr/ooeclipseintegration"/>
+ </url>
+
+ <includes
+ id="org.openoffice.ide.eclipse.java"
+ version="@JAVA_VERSION@"
+ optional="true"/>
+
+ <includes
+ id="org.openoffice.ide.eclipse.cpp"
+ version="@CPP_VERSION@"
+ optional="true"/>
+
+ <plugin
+ id="org.openoffice.ide.eclipse.core"
+ download-size="0"
+ install-size="0"
+ version="@CORE_VERSION@"
+ unpack="false"/>
+
+</feature>
diff --git a/build/features/cpp/feature.xml b/build/features/cpp/feature.xml
new file mode 100644
index 0000000..3ee10da
--- /dev/null
+++ b/build/features/cpp/feature.xml
@@ -0,0 +1,341 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+ id="org.openoffice.ide.eclipse.cpp"
+ label="LibreOffice development plugin support for C++ implementation"
+ version="@CPP_VERSION@"
+ provider-name="Cédric Bosdonnat">
+
+ <description>
+ This plugin provides the support of Java implementation for LibreOffice
+component development. This plugin depends on the LibreOffice development
+core plugin.
+
+Even if this is a important piece of work, there are still other
+features to add and bugs to correct, please do not hesitate to
+express your remarks and requests on the LibreOffice development
+mailing list.
+ </description>
+
+ <copyright>
+ Copyright: (c) 2005-2010 Cedric Bosdonnat
+ </copyright>
+
+ <license url="http://www.gnu.org/licenses/lgpl.txt">
+ GNU LESSER GENERAL PUBLIC LICENSE
+Version 3, 29 June 2007
+Copyright (C) 2007 Free Software Foundation, Inc. http://fsf.org/
+Everyone is permitted to copy and distribute verbatim copies
+of this license document, but changing it is not allowed.
+This version of the GNU Lesser General Public License incorporates
+the terms and conditions of version 3 of the GNU General Public
+License, supplemented by the additional permissions listed below.
+0. Additional Definitions.
+As used herein, "this License" refers to version 3 of the GNU
+Lesser General Public License, and the "GNU GPL" refers to version 3
+of the GNU General Public License.
+"The Library" refers to a covered work governed by this License,
+other than an Application or a Combined Work as defined below.
+An "Application" is any work that makes use of an interface provided
+by the Library, but which is not otherwise based on the Library.
+Defining a subclass of a class defined by the Library is deemed
+a mode of using an interface provided by the Library.
+A "Combined Work" is a work produced by combining or linking
+an Application with the Library. The particular version of the
+Library with which the Combined Work was made is also called the "Linked
+Version".
+The "Minimal Corresponding Source" for a Combined Work means
+the Corresponding Source for the Combined Work, excluding any source
+code for portions of the Combined Work that, considered in isolation,
+are based on the Application, and not on the Linked Version.
+The "Corresponding Application Code" for a Combined Work means
+the object code and/or source code for the Application, including
+any data and utility programs needed for reproducing the Combined Work
+from the Application, but excluding the System Libraries of the Combined
+Work.
+1. Exception to Section 3 of the GNU GPL.
+You may convey a covered work under sections 3 and 4 of this
+License without being bound by section 3 of the GNU GPL.
+2. Conveying Modified Versions.
+If you modify a copy of the Library, and, in your modifications,
+a facility refers to a function or data to be supplied by an Application
+that uses the facility (other than as an argument passed when
+the facility is invoked), then you may convey a copy of the modified
+version:
+a) under this License, provided that you make a good faith effort
+to ensure that, in the event an Application does not supply the
+function or data, the facility still operates, and performs
+whatever part of its purpose remains meaningful, or
+b) under the GNU GPL, with none of the additional permissions
+of this License applicable to that copy.
+3. Object Code Incorporating Material from Library Header Files.
+The object code form of an Application may incorporate material
+from a header file that is part of the Library. You may convey such
+object code under terms of your choice, provided that, if the incorporated
+material is not limited to numerical parameters, data structure
+layouts and accessors, or small macros, inline functions and
+templates (ten or fewer lines in length), you do both of the following:
+a) Give prominent notice with each copy of the object code that
+the Library is used in it and that the Library and its use are
+covered by this License.
+b) Accompany the object code with a copy of the GNU GPL and this
+license document.
+4. Combined Works.
+You may convey a Combined Work under terms of your choice that,
+taken together, effectively do not restrict modification of the
+portions of the Library contained in the Combined Work and reverse
+engineering for debugging such modifications, if you also do
+each of the following:
+a) Give prominent notice with each copy of the Combined Work
+that the Library is used in it and that the Library and its use are
+covered by this License.
+b) Accompany the Combined Work with a copy of the GNU GPL and
+this license document.
+c) For a Combined Work that displays copyright notices during
+execution, include the copyright notice for the Library among
+these notices, as well as a reference directing the user to the
+copies of the GNU GPL and this license document.
+d) Do one of the following:
+0) Convey the Minimal Corresponding Source under the terms of
+this License, and the Corresponding Application Code in a form
+suitable for, and under terms that permit, the user to
+recombine or relink the Application with a modified version of
+the Linked Version to produce a modified Combined Work, in the
+manner specified by section 6 of the GNU GPL for conveying
+Corresponding Source.
+1) Use a suitable shared library mechanism for linking with the
+Library. A suitable mechanism is one that (a) uses at run time
+a copy of the Library already present on the user's computer
+system, and (b) will operate properly with a modified version
+of the Library that is interface-compatible with the Linked
+Version.
+e) Provide Installation Information, but only if you would otherwise
+be required to provide such information under section 6 of the
+GNU GPL, and only to the extent that such information is
+necessary to install and execute a modified version of the
+Combined Work produced by recombining or relinking the
+Application with a modified version of the Linked Version. (If
+you use option 4d0, the Installation Information must accompany
+the Minimal Corresponding Source and Corresponding Application
+Code. If you use option 4d1, you must provide the Installation
+Information in the manner specified by section 6 of the GNU GPL
+for conveying Corresponding Source.)
+5. Combined Libraries.
+You may place library facilities that are a work based on the
+Library side by side in a single library together with other
+library facilities that are not Applications and are not covered by this
+License, and convey such a combined library under terms of your
+choice, if you do both of the following:
+a) Accompany the combined library with a copy of the same work
+based on the Library, uncombined with any other library facilities,
+conveyed under the terms of this License.
+b) Give prominent notice with the combined library that part
+of it is a work based on the Library, and explaining where to find
+the accompanying uncombined form of the same work.
+6. Revised Versions of the GNU Lesser General Public License.
+The Free Software Foundation may publish revised and/or new versions
+of the GNU Lesser General Public License from time to time. Such
+new versions will be similar in spirit to the present version, but
+may differ in detail to address new problems or concerns.
+Each version is given a distinguishing version number. If the
+Library as you received it specifies that a certain numbered
+version of the GNU Lesser General Public License "or any later version"
+applies to it, you have the option of following the terms and
+conditions either of that published version or of any later version
+published by the Free Software Foundation. If the Library as
+you received it does not specify a version number of the GNU Lesser
+General Public License, you may choose any version of the GNU
+Lesser General Public License ever published by the Free Software Foundation.
+If the Library as you received it specifies that a proxy can
+decide whether future versions of the GNU Lesser General Public License
+shall apply, that proxy's public statement of acceptance of any version
+is permanent authorization for you to choose that version for the
+Library.
+GNU LESSER GENERAL PUBLIC LICENSE
+Version 3, 29 June 2007
+Copyright (C) 2007 Free Software Foundation, Inc. http://fsf.org/
+Everyone is permitted to copy and distribute verbatim copies
+of this license document, but changing it is not allowed.
+This version of the GNU Lesser General Public License incorporates
+the terms and conditions of version 3 of the GNU General Public
+License, supplemented by the additional permissions listed below.
+0. Additional Definitions.
+As used herein, "this License" refers to version 3 of the GNU
+Lesser General Public License, and the "GNU GPL" refers to
+version 3 of the GNU General Public License.
+"The Library" refers to a covered work governed by this License,
+other than an Application or a Combined Work as defined below.
+An "Application" is any work that makes use of an interface provided
+by the Library, but which is not otherwise based on the Library.
+Defining a subclass of a class defined by the Library is deemed
+a mode of using an interface provided by the Library.
+A "Combined Work" is a work produced by combining or linking
+an Application with the Library. The particular version of the
+Library with which the Combined Work was made is also called the
+"Linked Version".
+The "Minimal Corresponding Source" for a Combined Work means
+the Corresponding Source for the Combined Work, excluding any
+source code for portions of the Combined Work that, considered
+in isolation, are based on the Application, and not on the
+Linked Version.
+The "Corresponding Application Code" for a Combined Work means
+the object code and/or source code for the Application,
+including any data and utility programs needed for reproducing
+the Combined Work from the Application, but excluding the System
+Libraries of the Combined Work.
+1. Exception to Section 3 of the GNU GPL.
+You may convey a covered work under sections 3 and 4 of this
+License without being bound by section 3 of the GNU GPL.
+2. Conveying Modified Versions.
+If you modify a copy of the Library, and, in your modifications,
+a facility refers to a function or data to be supplied by an
+Application that uses the facility (other than as an argument
+passed when the facility is invoked), then you may convey a copy
+of the modified version:
+a) under this License, provided that you make a good faith effort
+to ensure that, in the event an Application does not supply the
+function or data, the facility still operates, and performs
+whatever part of its purpose remains meaningful, or
+b) under the GNU GPL, with none of the additional permissions
+of this License applicable to that copy.
+3. Object Code Incorporating Material from Library Header Files.
+The object code form of an Application may incorporate material
+from a header file that is part of the Library. You may convey
+such object code under terms of your choice, provided that, if
+the incorporated material is not limited to numerical parameters,
+data structure layouts and accessors, or small macros, inline
+functions and templates (ten or fewer lines in length), you do
+both of the following:
+a) Give prominent notice with each copy of the object code that
+the Library is used in it and that the Library and its use are
+covered by this License.
+b) Accompany the object code with a copy of the GNU GPL and this
+license document.
+4. Combined Works.
+You may convey a Combined Work under terms of your choice that,
+taken together, effectively do not restrict modification of the
+portions of the Library contained in the Combined Work and reverse
+engineering for debugging such modifications, if you also do
+each of the following:
+a) Give prominent notice with each copy of the Combined Work
+that the Library is used in it and that the Library and its use
+are covered by this License.
+b) Accompany the Combined Work with a copy of the GNU GPL and
+this license document.
+c) For a Combined Work that displays copyright notices during
+execution, include the copyright notice for the Library among
+these notices, as well as a reference directing the user to the
+copies of the GNU GPL and this license document.
+d) Do one of the following:
+0) Convey the Minimal Corresponding Source under the terms of
+this License, and the Corresponding Application Code in a form
+suitable for, and under terms that permit, the user to
+recombine or relink the Application with a modified version of
+the Linked Version to produce a modified Combined Work, in the
+manner specified by section 6 of the GNU GPL for conveying
+Corresponding Source.
+1) Use a suitable shared library mechanism for linking with the
+Library. A suitable mechanism is one that (a) uses at run time
+a copy of the Library already present on the user's computer
+system, and (b) will operate properly with a modified version
+of the Library that is interface-compatible with the Linked
+Version.
+e) Provide Installation Information, but only if you would otherwise
+be required to provide such information under section 6 of the
+GNU GPL, and only to the extent that such information is
+necessary to install and execute a modified version of the
+Combined Work produced by recombining or relinking the
+Application with a modified version of the Linked Version. (If
+you use option 4d0, the Installation Information must accompany
+the Minimal Corresponding Source and Corresponding Application
+Code. If you use option 4d1, you must provide the Installation
+Information in the manner specified by section 6 of the GNU GPL
+for conveying Corresponding Source.)
+5. Combined Libraries.
+You may place library facilities that are a work based on the
+Library side by side in a single library together with other
+library facilities that are not Applications and are not covered
+by this License, and convey such a combined library under terms
+of your choice, if you do both of the following:
+a) Accompany the combined library with a copy of the same work
+based on the Library, uncombined with any other library
+facilities, conveyed under the terms of this License.
+b) Give prominent notice with the combined library that part
+of it is a work based on the Library, and explaining where to
+find the accompanying uncombined form of the same work.
+6. Revised Versions of the GNU Lesser General Public License.
+The Free Software Foundation may publish revised and/or new versions
+of the GNU Lesser General Public License from time to time. Such
+new versions will be similar in spirit to the present version,
+but may differ in detail to address new problems or concerns.
+Each version is given a distdified version of the
+Combined Work produced by recombining or relinking the
+Application with a modified version of the Linked Version. (If
+you use option 4d0, the Installation Information must accompany
+the Minimal Corresponding Source and Corresponding Application
+Code. If you use option 4d1, you must provide the Installation
+Information in the manner specified by section 6 of the GNU GPL
+for conveying Corresponding Source.)
+5. Combined Libraries.
+You may place library facilities that are a work based on the
+Library side by side in a single library together with other
+library facilities that are not Applications and are not covered
+by this License, and convey such a combined library under terms
+of your choice, if you do both of the following:
+a) Accompany the combined library with a copy of the same work
+based on the Library, uncombined with any other library
+facilities, conveyed under the terms of this License.
+b) Give prominent notice with the combined library that part
+of it is a work based on the Library, and explaining where to
+find the accompanying uncombined form of the same work.
+6. Revised Versions of the GNU Lesser General Public License.
+The Free Software Foundation may publish revised and/or new versions
+of the GNU Lesser General Public License from time to time. Such
+new versions will be similar in spirit to the present version,
+but may differ in detail to address new problems or concerns.
+Each version is given a distinguishing version number. If the
+Library as you received it specifies that a certain numbered
+version of the GNU Lesser General Public License "or any later
+version" applies to it, you have the option of following the
+terms and conditions either of that published version or of
+any later version published by the Free Software Foundation.
+If the Library as you received it does not specify a version
+number of the GNU Lesser General Public License, you may choose
+any version of the GNU Lesser General Public License ever
+published by the Free Software Foundation.
+If the Library as you received it specifies that a proxy can
+decide whether future versions of the GNU Lesser General Public
+License shall apply, that proxy's public statement of acceptance
+of any version is permaneinguishing version number. If the
+Library as you received it specifies that a certain numbered
+version of the GNU Lesser General Public License "or any later
+version" applies to it, you have the option of following the
+terms and conditions either of that published version or of
+any later version published by the Free Software Foundation.
+If the Library as you received it does not specify a version
+number of the GNU Lesser General Public License, you may choose
+any version of the GNU Lesser General Public License ever
+published by the Free Software Foundation.
+If the Library as you received it specifies that a proxy can
+decide whether future versions of the GNU Lesser General Public
+License shall apply, that proxy's public statement of acceptance
+of any version is permanent authorization for you to choose that
+version for the Library.
+ </license>
+
+ <url>
+ <discovery label="LibreOffice Plugin update site" url="http://cedric.bosdonnat.free.fr/ooeclipseintegration"/>
+ </url>
+
+ <requires>
+ <import feature="org.eclipse.cdt" version="6.0.0.200909110608"/>
+ <import plugin="org.openoffice.ide.eclipse.core" version="@CORE_VERSION@"/>
+ </requires>
+
+ <plugin
+ id="org.openoffice.ide.eclipse.cpp"
+ download-size="0"
+ install-size="0"
+ version="@CPP_VERSION@"
+ unpack="false"/>
+
+</feature>
diff --git a/build/features/java/feature.xml b/build/features/java/feature.xml
new file mode 100644
index 0000000..d8f8c48
--- /dev/null
+++ b/build/features/java/feature.xml
@@ -0,0 +1,341 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+ id="org.openoffice.ide.eclipse.java"
+ label="LibreOffice development plugin support for Java implementation"
+ version="@JAVA_VERSION@"
+ provider-name="Cédric Bosdonnat">
+
+ <description>
+ This plugin provides the support of Java implementation for LibreOffice
+component development. This plugin depends on the LibreOffice development
+core plugin.
+
+Even if this is a important piece of work, there are still other
+features to add and bugs to correct, please do not hesitate to
+express your remarks and requests on the LibreOffice development
+mailing list.
+ </description>
+
+ <copyright>
+ Copyright: (c) 2005-2010 Cedric Bosdonnat
+ </copyright>
+
+ <license url="http://www.gnu.org/licenses/lgpl.txt">
+ GNU LESSER GENERAL PUBLIC LICENSE
+Version 3, 29 June 2007
+Copyright (C) 2007 Free Software Foundation, Inc. http://fsf.org/
+Everyone is permitted to copy and distribute verbatim copies
+of this license document, but changing it is not allowed.
+This version of the GNU Lesser General Public License incorporates
+the terms and conditions of version 3 of the GNU General Public
+License, supplemented by the additional permissions listed below.
+0. Additional Definitions.
+As used herein, "this License" refers to version 3 of the GNU
+Lesser General Public License, and the "GNU GPL" refers to version 3
+of the GNU General Public License.
+"The Library" refers to a covered work governed by this License,
+other than an Application or a Combined Work as defined below.
+An "Application" is any work that makes use of an interface provided
+by the Library, but which is not otherwise based on the Library.
+Defining a subclass of a class defined by the Library is deemed
+a mode of using an interface provided by the Library.
+A "Combined Work" is a work produced by combining or linking
+an Application with the Library. The particular version of the
+Library with which the Combined Work was made is also called the "Linked
+Version".
+The "Minimal Corresponding Source" for a Combined Work means
+the Corresponding Source for the Combined Work, excluding any source
+code for portions of the Combined Work that, considered in isolation,
+are based on the Application, and not on the Linked Version.
+The "Corresponding Application Code" for a Combined Work means
+the object code and/or source code for the Application, including
+any data and utility programs needed for reproducing the Combined Work
+from the Application, but excluding the System Libraries of the Combined
+Work.
+1. Exception to Section 3 of the GNU GPL.
+You may convey a covered work under sections 3 and 4 of this
+License without being bound by section 3 of the GNU GPL.
+2. Conveying Modified Versions.
+If you modify a copy of the Library, and, in your modifications,
+a facility refers to a function or data to be supplied by an Application
+that uses the facility (other than as an argument passed when
+the facility is invoked), then you may convey a copy of the modified
+version:
+a) under this License, provided that you make a good faith effort
+to ensure that, in the event an Application does not supply the
+function or data, the facility still operates, and performs
+whatever part of its purpose remains meaningful, or
+b) under the GNU GPL, with none of the additional permissions
+of this License applicable to that copy.
+3. Object Code Incorporating Material from Library Header Files.
+The object code form of an Application may incorporate material
+from a header file that is part of the Library. You may convey such
+object code under terms of your choice, provided that, if the incorporated
+material is not limited to numerical parameters, data structure
+layouts and accessors, or small macros, inline functions and
+templates (ten or fewer lines in length), you do both of the following:
+a) Give prominent notice with each copy of the object code that
+the Library is used in it and that the Library and its use are
+covered by this License.
+b) Accompany the object code with a copy of the GNU GPL and this
+license document.
+4. Combined Works.
+You may convey a Combined Work under terms of your choice that,
+taken together, effectively do not restrict modification of the
+portions of the Library contained in the Combined Work and reverse
+engineering for debugging such modifications, if you also do
+each of the following:
+a) Give prominent notice with each copy of the Combined Work
+that the Library is used in it and that the Library and its use are
+covered by this License.
+b) Accompany the Combined Work with a copy of the GNU GPL and
+this license document.
+c) For a Combined Work that displays copyright notices during
+execution, include the copyright notice for the Library among
+these notices, as well as a reference directing the user to the
+copies of the GNU GPL and this license document.
+d) Do one of the following:
+0) Convey the Minimal Corresponding Source under the terms of
+this License, and the Corresponding Application Code in a form
+suitable for, and under terms that permit, the user to
+recombine or relink the Application with a modified version of
+the Linked Version to produce a modified Combined Work, in the
+manner specified by section 6 of the GNU GPL for conveying
+Corresponding Source.
+1) Use a suitable shared library mechanism for linking with the
+Library. A suitable mechanism is one that (a) uses at run time
+a copy of the Library already present on the user's computer
+system, and (b) will operate properly with a modified version
+of the Library that is interface-compatible with the Linked
+Version.
+e) Provide Installation Information, but only if you would otherwise
+be required to provide such information under section 6 of the
+GNU GPL, and only to the extent that such information is
+necessary to install and execute a modified version of the
+Combined Work produced by recombining or relinking the
+Application with a modified version of the Linked Version. (If
+you use option 4d0, the Installation Information must accompany
+the Minimal Corresponding Source and Corresponding Application
+Code. If you use option 4d1, you must provide the Installation
+Information in the manner specified by section 6 of the GNU GPL
+for conveying Corresponding Source.)
+5. Combined Libraries.
+You may place library facilities that are a work based on the
+Library side by side in a single library together with other
+library facilities that are not Applications and are not covered by this
+License, and convey such a combined library under terms of your
+choice, if you do both of the following:
+a) Accompany the combined library with a copy of the same work
+based on the Library, uncombined with any other library facilities,
+conveyed under the terms of this License.
+b) Give prominent notice with the combined library that part
+of it is a work based on the Library, and explaining where to find
+the accompanying uncombined form of the same work.
+6. Revised Versions of the GNU Lesser General Public License.
+The Free Software Foundation may publish revised and/or new versions
+of the GNU Lesser General Public License from time to time. Such
+new versions will be similar in spirit to the present version, but
+may differ in detail to address new problems or concerns.
+Each version is given a distinguishing version number. If the
+Library as you received it specifies that a certain numbered
+version of the GNU Lesser General Public License "or any later version"
+applies to it, you have the option of following the terms and
+conditions either of that published version or of any later version
+published by the Free Software Foundation. If the Library as
+you received it does not specify a version number of the GNU Lesser
+General Public License, you may choose any version of the GNU
+Lesser General Public License ever published by the Free Software Foundation.
+If the Library as you received it specifies that a proxy can
+decide whether future versions of the GNU Lesser General Public License
+shall apply, that proxy's public statement of acceptance of any version
+is permanent authorization for you to choose that version for the
+Library.
+GNU LESSER GENERAL PUBLIC LICENSE
+Version 3, 29 June 2007
+Copyright (C) 2007 Free Software Foundation, Inc. http://fsf.org/
+Everyone is permitted to copy and distribute verbatim copies
+of this license document, but changing it is not allowed.
+This version of the GNU Lesser General Public License incorporates
+the terms and conditions of version 3 of the GNU General Public
+License, supplemented by the additional permissions listed below.
+0. Additional Definitions.
+As used herein, "this License" refers to version 3 of the GNU
+Lesser General Public License, and the "GNU GPL" refers to
+version 3 of the GNU General Public License.
+"The Library" refers to a covered work governed by this License,
+other than an Application or a Combined Work as defined below.
+An "Application" is any work that makes use of an interface provided
+by the Library, but which is not otherwise based on the Library.
+Defining a subclass of a class defined by the Library is deemed
+a mode of using an interface provided by the Library.
+A "Combined Work" is a work produced by combining or linking
+an Application with the Library. The particular version of the
+Library with which the Combined Work was made is also called the
+"Linked Version".
+The "Minimal Corresponding Source" for a Combined Work means
+the Corresponding Source for the Combined Work, excluding any
+source code for portions of the Combined Work that, considered
+in isolation, are based on the Application, and not on the
+Linked Version.
+The "Corresponding Application Code" for a Combined Work means
+the object code and/or source code for the Application,
+including any data and utility programs needed for reproducing
+the Combined Work from the Application, but excluding the System
+Libraries of the Combined Work.
+1. Exception to Section 3 of the GNU GPL.
+You may convey a covered work under sections 3 and 4 of this
+License without being bound by section 3 of the GNU GPL.
+2. Conveying Modified Versions.
+If you modify a copy of the Library, and, in your modifications,
+a facility refers to a function or data to be supplied by an
+Application that uses the facility (other than as an argument
+passed when the facility is invoked), then you may convey a copy
+of the modified version:
+a) under this License, provided that you make a good faith effort
+to ensure that, in the event an Application does not supply the
+function or data, the facility still operates, and performs
+whatever part of its purpose remains meaningful, or
+b) under the GNU GPL, with none of the additional permissions
+of this License applicable to that copy.
+3. Object Code Incorporating Material from Library Header Files.
+The object code form of an Application may incorporate material
+from a header file that is part of the Library. You may convey
+such object code under terms of your choice, provided that, if
+the incorporated material is not limited to numerical parameters,
+data structure layouts and accessors, or small macros, inline
+functions and templates (ten or fewer lines in length), you do
+both of the following:
+a) Give prominent notice with each copy of the object code that
+the Library is used in it and that the Library and its use are
+covered by this License.
+b) Accompany the object code with a copy of the GNU GPL and this
+license document.
+4. Combined Works.
+You may convey a Combined Work under terms of your choice that,
+taken together, effectively do not restrict modification of the
+portions of the Library contained in the Combined Work and reverse
+engineering for debugging such modifications, if you also do
+each of the following:
+a) Give prominent notice with each copy of the Combined Work
+that the Library is used in it and that the Library and its use
+are covered by this License.
+b) Accompany the Combined Work with a copy of the GNU GPL and
+this license document.
+c) For a Combined Work that displays copyright notices during
+execution, include the copyright notice for the Library among
+these notices, as well as a reference directing the user to the
+copies of the GNU GPL and this license document.
+d) Do one of the following:
+0) Convey the Minimal Corresponding Source under the terms of
+this License, and the Corresponding Application Code in a form
+suitable for, and under terms that permit, the user to
+recombine or relink the Application with a modified version of
+the Linked Version to produce a modified Combined Work, in the
+manner specified by section 6 of the GNU GPL for conveying
+Corresponding Source.
+1) Use a suitable shared library mechanism for linking with the
+Library. A suitable mechanism is one that (a) uses at run time
+a copy of the Library already present on the user's computer
+system, and (b) will operate properly with a modified version
+of the Library that is interface-compatible with the Linked
+Version.
+e) Provide Installation Information, but only if you would otherwise
+be required to provide such information under section 6 of the
+GNU GPL, and only to the extent that such information is
+necessary to install and execute a modified version of the
+Combined Work produced by recombining or relinking the
+Application with a modified version of the Linked Version. (If
+you use option 4d0, the Installation Information must accompany
+the Minimal Corresponding Source and Corresponding Application
+Code. If you use option 4d1, you must provide the Installation
+Information in the manner specified by section 6 of the GNU GPL
+for conveying Corresponding Source.)
+5. Combined Libraries.
+You may place library facilities that are a work based on the
+Library side by side in a single library together with other
+library facilities that are not Applications and are not covered
+by this License, and convey such a combined library under terms
+of your choice, if you do both of the following:
+a) Accompany the combined library with a copy of the same work
+based on the Library, uncombined with any other library
+facilities, conveyed under the terms of this License.
+b) Give prominent notice with the combined library that part
+of it is a work based on the Library, and explaining where to
+find the accompanying uncombined form of the same work.
+6. Revised Versions of the GNU Lesser General Public License.
+The Free Software Foundation may publish revised and/or new versions
+of the GNU Lesser General Public License from time to time. Such
+new versions will be similar in spirit to the present version,
+but may differ in detail to address new problems or concerns.
+Each version is given a distdified version of the
+Combined Work produced by recombining or relinking the
+Application with a modified version of the Linked Version. (If
+you use option 4d0, the Installation Information must accompany
+the Minimal Corresponding Source and Corresponding Application
+Code. If you use option 4d1, you must provide the Installation
+Information in the manner specified by section 6 of the GNU GPL
+for conveying Corresponding Source.)
+5. Combined Libraries.
+You may place library facilities that are a work based on the
+Library side by side in a single library together with other
+library facilities that are not Applications and are not covered
+by this License, and convey such a combined library under terms
+of your choice, if you do both of the following:
+a) Accompany the combined library with a copy of the same work
+based on the Library, uncombined with any other library
+facilities, conveyed under the terms of this License.
+b) Give prominent notice with the combined library that part
+of it is a work based on the Library, and explaining where to
+find the accompanying uncombined form of the same work.
+6. Revised Versions of the GNU Lesser General Public License.
+The Free Software Foundation may publish revised and/or new versions
+of the GNU Lesser General Public License from time to time. Such
+new versions will be similar in spirit to the present version,
+but may differ in detail to address new problems or concerns.
+Each version is given a distinguishing version number. If the
+Library as you received it specifies that a certain numbered
+version of the GNU Lesser General Public License "or any later
+version" applies to it, you have the option of following the
+terms and conditions either of that published version or of
+any later version published by the Free Software Foundation.
+If the Library as you received it does not specify a version
+number of the GNU Lesser General Public License, you may choose
+any version of the GNU Lesser General Public License ever
+published by the Free Software Foundation.
+If the Library as you received it specifies that a proxy can
+decide whether future versions of the GNU Lesser General Public
+License shall apply, that proxy's public statement of acceptance
+of any version is permaneinguishing version number. If the
+Library as you received it specifies that a certain numbered
+version of the GNU Lesser General Public License "or any later
+version" applies to it, you have the option of following the
+terms and conditions either of that published version or of
+any later version published by the Free Software Foundation.
+If the Library as you received it does not specify a version
+number of the GNU Lesser General Public License, you may choose
+any version of the GNU Lesser General Public License ever
+published by the Free Software Foundation.
+If the Library as you received it specifies that a proxy can
+decide whether future versions of the GNU Lesser General Public
+License shall apply, that proxy's public statement of acceptance
+of any version is permanent authorization for you to choose that
+version for the Library.
+ </license>
+
+ <url>
+ <discovery label="LibreOffice Plugin update site" url="http://cedric.bosdonnat.free.fr/ooeclipseintegration"/>
+ </url>
+
+ <requires>
+ <import feature="org.eclipse.jdt" version="3.5.1.r351_v20090810-0600-7r88FEoFI0WTo6Az-1qFRHm37ChJ"/>
+ <import plugin="org.openoffice.ide.eclipse.core" version="@CORE_VERSION@"/>
+ </requires>
+
+ <plugin
+ id="org.openoffice.ide.eclipse.java"
+ download-size="0"
+ install-size="0"
+ version="@JAVA_VERSION@"
+ unpack="false"/>
+
+</feature>
diff --git a/build/site.xml b/build/site.xml
new file mode 100644
index 0000000..d6a14c5
--- /dev/null
+++ b/build/site.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<site>
+ <category-def name="LibreOffice" label="LibreOffice"/>
+
+ <feature
+ url="features/org.openoffice.ide.eclipse.core_ at CORE_VERSION@.jar"
+ id="org.openoffice.ide.eclipse.core" version="@CORE_VERSION@">
+ <category name="LibreOffice"/>
+ </feature>
+
+ <feature
+ url="features/org.openoffice.ide.eclipse.java_ at JAVA_VERSION@.jar"
+ id="org.openoffice.ide.eclipse.java" version="@JAVA_VERSION@">
+ <category name="LibreOffice"/>
+ </feature>
+
+ <feature
+ url="features/org.openoffice.ide.eclipse.cpp_ at CPP_VERSION@.jar"
+ id="org.openoffice.ide.eclipse.cpp"
+ version="@CPP_VERSION@">
+ <category name="LibreOffice"/>
+ </feature>
+</site>
\ No newline at end of file
diff --git a/build/site_footer.xml b/build/site_footer.xml
deleted file mode 100644
index 4c71a76..0000000
--- a/build/site_footer.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-
-</site>
\ No newline at end of file
diff --git a/build/site_header.xml b/build/site_header.xml
deleted file mode 100644
index bab3301..0000000
--- a/build/site_header.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<site>
- <category-def name="LibreOffice" label="LibreOffice"/>
-
diff --git a/build/versions.properties b/build/versions.properties
new file mode 100644
index 0000000..3ab8bb1
--- /dev/null
+++ b/build/versions.properties
@@ -0,0 +1,5 @@
+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
diff --git a/core/.classpath b/core/.classpath
index d08f6d7..1894005 100755
--- a/core/.classpath
+++ b/core/.classpath
@@ -2,6 +2,7 @@
<classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
<classpathentry kind="src" path="source"/>
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/OOo Classes"/>
<classpathentry kind="output" path="bin"/>
diff --git a/core/META-INF/MANIFEST.MF b/core/META-INF/MANIFEST.MF
index 4048802..0850ab3 100644
--- a/core/META-INF/MANIFEST.MF
+++ b/core/META-INF/MANIFEST.MF
@@ -15,11 +15,9 @@ Require-Bundle: org.eclipse.core.runtime;visibility:=reexport,
org.eclipse.ui.cheatsheets,
org.eclipse.help,
org.eclipse.ui.forms,
- org.junit,
org.eclipse.debug.core;visibility:=reexport,
org.eclipse.debug.ui,
org.eclipse.ui;bundle-version="3.4.1",
- javax.xml;bundle-version="1.3.4",
org.openoffice.ide.packager.core;bundle-version="0.1.0"
Bundle-ActivationPolicy: lazy
Export-Package: org.openoffice.ide.eclipse.core,
@@ -54,5 +52,5 @@ Export-Package: org.openoffice.ide.eclipse.core,
org.openoffice.ide.eclipse.core.wizards,
org.openoffice.ide.eclipse.core.wizards.pages,
org.openoffice.ide.eclipse.core.wizards.utils
-Bundle-Vendor: LibreOffice
+Bundle-Vendor: Cédric Bosdonnat
Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/core/build.properties b/core/build.properties
index ca3f8bf..6236927 100755
--- a/core/build.properties
+++ b/core/build.properties
@@ -7,18 +7,18 @@ bin.includes = META-INF/,\
plugin.properties,\
doc/,\
about.ini,\
- about.properties,\
schema/
jars.compile.order=sources/,.
src.includes = .classpath,\
- .project,\
- META-INF/,\
- build.properties,\
- icons/,\
- plugin.xml,\
- source/,\
- doc/,\
- plugin.properties
+ .project,\
+ META-INF/,\
+ build.properties,\
+ icons/,\
+ plugin.xml,\
+ source/,\
+ doc/,\
+ plugin.properties,\
+ about.ini
source/=source/
source..=source/
output.sources/=bin/
diff --git a/core/build/MANIFEST.MF.in b/core/build/MANIFEST.MF.in
index 506a7a0..61408b3 100644
--- a/core/build/MANIFEST.MF.in
+++ b/core/build/MANIFEST.MF.in
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.openoffice.ide.eclipse.core; singleton:=true
-Bundle-Version: @VERSION@
+Bundle-Version: @CORE_VERSION@
Bundle-Activator: org.openoffice.ide.eclipse.core.OOEclipsePlugin
Bundle-Localization: plugin
Require-Bundle: org.eclipse.core.runtime;visibility:=reexport,
@@ -18,9 +18,7 @@ Require-Bundle: org.eclipse.core.runtime;visibility:=reexport,
org.junit,
org.eclipse.debug.core;visibility:=reexport,
org.eclipse.debug.ui,
- org.eclipse.ui;bundle-version="3.4.1",
- javax.xml;bundle-version="1.3.4",
- org.openoffice.ide.packager.core;bundle-version="0.1.0"
+ org.eclipse.ui;bundle-version="3.4.1"
Bundle-ActivationPolicy: lazy
Export-Package: org.openoffice.ide.eclipse.core,
org.openoffice.ide.eclipse.core.actions,
diff --git a/core/build/build.properties b/core/build/build.properties
deleted file mode 100644
index 003b9ca..0000000
--- a/core/build/build.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-#Wed Apr 26 20:26:45 CEST 2006
-core.plugin.version=1.2.0
-debug=true
diff --git a/core/build/build.xml b/core/build/build.xml
index 46351f8..3e5b7f6 100644
--- a/core/build/build.xml
+++ b/core/build/build.xml
@@ -55,8 +55,6 @@
<target name="init-env" depends="packager.init-env">
<dirname property="core.basedir" file="${ant.file.core}/.."/>
- <loadproperties srcfile="${core.basedir}/build/build.properties" />
-
<property name="core.out.path" value="${core.basedir}/bin/ant" />
<property name="core.out.classes" value="${core.out.path}/classes"/>
<property name="core.sources" value="${core.basedir}/source"/>
@@ -68,12 +66,11 @@
<include name="org.eclipse*.jar"/>
</fileset>
- <fileset dir="${packager.out.path}/plugins">
- <include name="*.jar"/>
+ <fileset dir="${packager.basedir}">
+ <include name="**/*.jar"/>
</fileset>
</path>
- <mkdir dir="${core.out.path}/features" />
<mkdir dir="${core.out.path}/plugins" />
<mkdir dir="${core.out.classes}" />
</target>
@@ -85,31 +82,6 @@
<delete dir="${core.basedir}/doc/help/html/api" />
</target>
-
- <target name="site" depends="core.plugin, core.feature">
- <copy file="${core.basedir}/build/site_fragment.xml.in"
- tofile="${core.out.path}/site_fragment.xml" />
-
- <replace file="${core.out.path}/site_fragment.xml"
- token="@VERSION@" value="${core.plugin.version}" />
- </target>
-
-
- <target name="core.feature">
- <!-- Replace the @VERSION@ tokens to create the feature.xml file -->
- <copy file="${core.basedir}/build/feature.xml.in"
- tofile="${core.out.path}/feature.xml" />
- <replace file="${core.out.path}/feature.xml"
- token="@VERSION@" value="${core.plugin.version}" />
-
- <jar destfile="${core.out.path}/features/${package.prefix}.core_${core.plugin.version}.jar">
- <zipfileset dir="${core.out.path}" prefix="" defaultexcludes="true">
- <include name="feature.xml"/>
- </zipfileset>
- </jar>
-
- </target>
-
<target name="core.compile" depends="init-env, packager.plugin">
<javac srcdir="${core.basedir}/source" destdir="${core.out.classes}"
target="1.5" source="1.5"
@@ -123,7 +95,7 @@
<copy file="${core.basedir}/build/MANIFEST.MF.in"
tofile="${core.out.path}/MANIFEST.MF" />
<replace file="${core.out.path}/MANIFEST.MF"
- token="@VERSION@" value="${core.plugin.version}" />
+ token="@CORE_VERSION@" value="${core.plugin.version}" />
<jar destfile="${core.out.path}/plugins/${package.prefix}.core_${core.plugin.version}.jar"
manifest="${core.out.path}/MANIFEST.MF">
diff --git a/core/build/feature.xml.in b/core/build/feature.xml.in
deleted file mode 100644
index 9f4ee9e..0000000
--- a/core/build/feature.xml.in
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
- id="org.openoffice.ide.eclipse.core"
- label="LibreOffice development plugin core"
- version="@VERSION@"
- provider-name="Cédric Bosdonnat">
-
- <description>
- Tool to support LibreOffice development using Eclipse. It
-provides two editors for UNO-IDL file edition and registry files
-viewing. The plugin helps the user to write it's UNO-IDL file
-with syntax highlighting and some wizards, it although generates
-the type registries.
-
-KEEP IN MIND that this is only the core of the plugin: you will certainly
-need to install the plugin corresponding to the programming language used
-for the implementation. For example, to create a Java component, you need:
- + The OOo development core plugin
- + The OOo development Java plugin
- + Of course the Eclipse JDT
-
-This plugin is user oriented and integrate some cheat sheets
-to guide the new user throught different steps.
-Even if this is a important piece of work, there are still other
-features to add and bugs to correct, please do not hesitate to
-express your remarks and requests on the LibreOffice development
-mailing list.
- </description>
-
- <copyright>
-Copyright: (c) 2010 Cedric Bosdonnat
- </copyright>
-
- <license url="http://www.openoffice.org/license.html">
- GNU Lesser General Public License Version 2.1
-=============================================
-Copyright 2000 by Sun Microsystems, Inc.
-901 San Antonio Road, Palo Alto, CA 94303, USA
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License version 2.1, as published by the Free Software Foundation.
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU
-Lesser General Public License for more details.
-You should have received a copy of the GNU Lesser General Public
-License along with this library; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-MA 02111-1307 USA
- </license>
-
- <url>
- <update label="LibreOffice Plugin update site" url="http://cedric.bosdonnat.free.fr/ooeclipseintegration"/>
- </url>
-
- <plugin
- id="org.openoffice.ide.eclipse.core"
- download-size="0"
- install-size="0"
- version="@VERSION@"
- unpack="false"/>
-
-</feature>
diff --git a/core/build/site_fragment.xml.in b/core/build/site_fragment.xml.in
deleted file mode 100644
index c71e136..0000000
--- a/core/build/site_fragment.xml.in
+++ /dev/null
@@ -1,7 +0,0 @@
- <feature
- url="features/org.openoffice.ide.eclipse.core_ at VERSION@.jar"
- id="org.openoffice.ide.eclipse.core" version="@VERSION@">
- <category name="LibreOffice"/>
- </feature>
-
-
\ No newline at end of file
diff --git a/cpp/build/MANIFEST.MF.in b/cpp/build/MANIFEST.MF.in
index 782c1cc..0709383 100644
--- a/cpp/build/MANIFEST.MF.in
+++ b/cpp/build/MANIFEST.MF.in
@@ -2,19 +2,18 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: C++ extensions support for LibreOffice
Bundle-SymbolicName: org.openoffice.ide.eclipse.cpp;singleton:=true
-Bundle-Version: @VERSION@
+Bundle-Version: @CPP_VERSION@
Bundle-Activator: org.openoffice.ide.eclipse.cpp.Activator
Bundle-Vendor: Cédric Bosdonnat
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
- org.openoffice.ide.eclipse.core;bundle-version="1.1.0",
+ org.openoffice.ide.eclipse.core;bundle-version="@CORE_VERSION@",
org.eclipse.core.resources,
org.eclipse.cdt.core;bundle-version="5.0.1",
org.eclipse.cdt.managedbuilder.core;bundle-version="5.0.1",
org.eclipse.cdt.ui,
org.eclipse.ui.ide,
org.eclipse.ui.cheatsheets,
- org.openoffice.ide.packager.core;bundle-version="0.1.0",
org.eclipse.debug.core
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-ActivationPolicy: lazy
diff --git a/cpp/build/build.properties b/cpp/build/build.properties
deleted file mode 100644
index 444ad1c..0000000
--- a/cpp/build/build.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-#Wed Apr 26 20:26:48 CEST 2006
-cpp.plugin.version=0.5
-debug=true
\ No newline at end of file
diff --git a/cpp/build/build.xml b/cpp/build/build.xml
index e5b7635..5ff20d5 100644
--- a/cpp/build/build.xml
+++ b/cpp/build/build.xml
@@ -54,8 +54,6 @@
<target name="init-env" unless="cpp.nobuild">
<dirname property="cpp.basedir" file="${ant.file.cpp}/.."/>
- <loadproperties srcfile="${cpp.basedir}/build/build.properties" />
-
<property name="cpp.out.path" value="${cpp.basedir}/bin/ant" />
<property name="cpp.out.classes" value="${cpp.out.path}/classes"/>
<property name="cpp.sources" value="${cpp.basedir}/source"/>
@@ -69,7 +67,6 @@
</fileset>
</path>
- <mkdir dir="${cpp.out.path}/features" />
<mkdir dir="${cpp.out.path}/plugins" />
<mkdir dir="${cpp.out.classes}" />
</target>
@@ -80,27 +77,6 @@
<delete dir="${cpp.out.path}" />
</target>
- <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" 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" />
- <replace file="${cpp.out.path}/feature.xml"
- token="@VERSION@" value="${cpp.plugin.version}" />
- <replace file="${cpp.out.path}/feature.xml"
- token="@CORE_VERSION@" value="${core.plugin.version}" />
-
- <jar destfile="${cpp.out.path}/features/${package.prefix}.cpp_${cpp.plugin.version}.jar">
- <zipfileset prefix="" file="${cpp.out.path}/feature.xml"/>
- </jar>
- </target>
-
<target name="cpp.compile" depends="init-env" unless="cpp.nobuild">
<javac srcdir="${cpp.sources}" destdir="${cpp.out.classes}"
target="1.5" source="1.5"
@@ -113,7 +89,9 @@
<copy file="${cpp.basedir}/build/MANIFEST.MF.in"
tofile="${cpp.out.path}/MANIFEST.MF" />
<replace file="${cpp.out.path}/MANIFEST.MF"
- token="@VERSION@" value="${cpp.plugin.version}" />
+ token="@CORE_VERSION@" value="${core.plugin.version}" />
+ <replace file="${cpp.out.path}/MANIFEST.MF"
+ token="@CPP_VERSION@" value="${cpp.plugin.version}" />
<jar destfile="${cpp.out.path}/plugins/${package.prefix}.cpp_${cpp.plugin.version}.jar"
manifest="${cpp.out.path}/MANIFEST.MF">
diff --git a/cpp/build/feature.xml.in b/cpp/build/feature.xml.in
deleted file mode 100644
index a49e0a7..0000000
--- a/cpp/build/feature.xml.in
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
- id="org.openoffice.ide.eclipse.cpp"
- label="LibreOffice development plugin support for C++ implementation"
- version="@VERSION@"
- provider-name="Cédric Bosdonnat">
-
- <description>
-This plugin provides the support of C++ implementation for LibreOffice
-component development. This plugin depends on the LibreOffice development
-core plugin.
-
-Even if this is a important piece of work, there are still other
-features to add and bugs to correct, please do not hesitate to
-express your remarks and requests on the LibreOffice development
-mailing list.
- </description>
-
- <copyright>
- Copyright 2009 by Novell, Inc.
-All Rights Reserved.
-Contributor(s): Cedric Bosdonnat
- </copyright>
-
- <license url="http://www.openoffice.org/license.html">
- GNU Lesser General Public License Version 2.1
-=============================================
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License version 2.1, as published by the Free Software Foundation.
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU
-Lesser General Public License for more details.
-You should have received a copy of the GNU Lesser General Public
-License along with this library; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-MA 02111-1307 USA
- </license>
-
- <url>
- <discovery label="LibreOffice Plugin update site" url="http://cedric.bosdonnat.free.fr/ooeclipseintegration"/>
- </url>
-
- <requires>
- <import feature="org.openoffice.ide.eclipse.core" version="@CORE_VERSION@"/>
- </requires>
-
- <plugin
- id="org.openoffice.ide.eclipse.cpp"
- download-size="0"
- install-size="0"
- version="@VERSION@"
- unpack="false"/>
-
-</feature>
diff --git a/cpp/build/site_fragment.xml.in b/cpp/build/site_fragment.xml.in
deleted file mode 100644
index d0e427f..0000000
--- a/cpp/build/site_fragment.xml.in
+++ /dev/null
@@ -1,7 +0,0 @@
- <feature
- url="features/org.openoffice.ide.eclipse.cpp_ at VERSION@.jar"
- id="org.openoffice.ide.eclipse.cpp" version="@VERSION@">
- <category name="OpenOffice.org"/>
- </feature>
-
-
\ No newline at end of file
diff --git a/java/META-INF/MANIFEST.MF b/java/META-INF/MANIFEST.MF
index 8e00cdb..5a77b07 100644
--- a/java/META-INF/MANIFEST.MF
+++ b/java/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: Java Plug-in for OOo eclipse integration
Bundle-SymbolicName: org.openoffice.ide.eclipse.java; singleton:=true
Bundle-Version: 1.0.3
Bundle-Activator: org.openoffice.ide.eclipse.java.OOoJavaPlugin
-Bundle-Vendor: OpenOffice.org
+Bundle-Vendor: Cédric Bosdonnat
Require-Bundle: org.eclipse.ui,
org.openoffice.ide.eclipse.core,
org.eclipse.core.resources,
diff --git a/java/build/MANIFEST.MF.in b/java/build/MANIFEST.MF.in
index 8623c68..7a73062 100644
--- a/java/build/MANIFEST.MF.in
+++ b/java/build/MANIFEST.MF.in
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Java Plug-in for OOEclipse
Bundle-SymbolicName: org.openoffice.ide.eclipse.java; singleton:=true
-Bundle-Version: @VERSION@
+Bundle-Version: @JAVA_VERSION@
Bundle-Activator: org.openoffice.ide.eclipse.java.OOoJavaPlugin
Bundle-Vendor: Cédric Bosdonnat
Require-Bundle: org.eclipse.ui,
@@ -16,7 +16,7 @@ Require-Bundle: org.eclipse.ui,
org.eclipse.jdt.junit;bundle-version="3.5.0",
org.eclipse.ui.ide,
org.eclipse.ui.cheatsheets,
- org.openoffice.ide.packager.core;bundle-version="0.1.0",
+ org.openoffice.ide.packager.core;bundle-version="@CORE_VERSION",
org.eclipse.jdt.debug.ui;bundle-version="3.4.1"
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/java/build/build.properties b/java/build/build.properties
deleted file mode 100644
index cbfdacb..0000000
--- a/java/build/build.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-#Wed Apr 26 20:26:48 CEST 2006
-java.plugin.version=1.0.3
-debug=true
diff --git a/java/build/build.xml b/java/build/build.xml
index b18ff7f..d95468b 100644
--- a/java/build/build.xml
+++ b/java/build/build.xml
@@ -55,8 +55,6 @@
<target name="init-env" unless="java.nobuild">
<dirname property="java.basedir" file="${ant.file.java}/.."/>
- <loadproperties srcfile="${java.basedir}/build/build.properties" />
-
<property name="java.out.path" value="${java.basedir}/bin/ant" />
<property name="java.out.classes" value="${java.out.path}/classes"/>
<property name="java.sources" value="${java.basedir}/source"/>
@@ -70,7 +68,6 @@
</fileset>
</path>
- <mkdir dir="${java.out.path}/features" />
<mkdir dir="${java.out.path}/plugins" />
<mkdir dir="${java.out.classes}" />
</target>
@@ -81,27 +78,6 @@
<delete dir="${java.out.path}" />
</target>
- <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" 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" />
- <replace file="${java.out.path}/feature.xml"
- token="@VERSION@" value="${java.plugin.version}" />
- <replace file="${java.out.path}/feature.xml"
- token="@CORE_VERSION@" value="${core.plugin.version}" />
-
- <jar destfile="${java.out.path}/features/${package.prefix}.java_${java.plugin.version}.jar">
- <zipfileset prefix="" file="${java.out.path}/feature.xml"/>
- </jar>
- </target>
-
<target name="java.compile" depends="init-env" unless="java.nobuild">
<javac srcdir="${java.sources}" destdir="${java.out.classes}"
target="1.5" source="1.5"
@@ -114,7 +90,9 @@
<copy file="${java.basedir}/build/MANIFEST.MF.in"
tofile="${java.out.path}/MANIFEST.MF" />
<replace file="${java.out.path}/MANIFEST.MF"
- token="@VERSION@" value="${java.plugin.version}" />
+ token="@CORE_VERSION@" value="${core.plugin.version}" />
+ <replace file="${java.out.path}/MANIFEST.MF"
+ token="@JAVA_VERSION@" value="${java.plugin.version}" />
<jar destfile="${java.out.path}/plugins/${package.prefix}.java_${java.plugin.version}.jar"
manifest="${java.out.path}/MANIFEST.MF">
diff --git a/java/build/feature.xml.in b/java/build/feature.xml.in
deleted file mode 100644
index 99ea346..0000000
--- a/java/build/feature.xml.in
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
- id="org.openoffice.ide.eclipse.java"
- label="LibreOffice development plugin support for Java implementation"
- version="@VERSION@"
- provider-name="Cédric Bosdonnat">
-
- <description>
-This plugin provides the support of Java implementation for LibreOffice
-component development. This plugin depends on the LibreOffice development
-core plugin.
-
-Even if this is a important piece of work, there are still other
-features to add and bugs to correct, please do not hesitate to
-express your remarks and requests on the LibreOffice development
-mailing list.
- </description>
-
- <copyright>
-Copyright: 2010 by Cedric Bosdonnat
- </copyright>
-
- <license url="http://www.openoffice.org/license.html">
- GNU Lesser General Public License Version 2.1
-=============================================
-Copyright 2000 by Sun Microsystems, Inc.
-901 San Antonio Road, Palo Alto, CA 94303, USA
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License version 2.1, as published by the Free Software Foundation.
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU
-Lesser General Public License for more details.
-You should have received a copy of the GNU Lesser General Public
-License along with this library; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-MA 02111-1307 USA
- </license>
-
- <url>
- <discovery label="LibreOffice Plugin update site" url="http://cedric.bosdonnat.free.fr/ooeclipseintegration"/>
- </url>
-
- <requires>
- <import feature="org.openoffice.ide.eclipse.core" version="@CORE_VERSION@"/>
- </requires>
-
- <plugin
- id="org.openoffice.ide.eclipse.java"
- download-size="0"
- install-size="0"
- version="@VERSION@"
- unpack="false"/>
-
-</feature>
diff --git a/java/build/site_fragment.xml.in b/java/build/site_fragment.xml.in
deleted file mode 100644
index cde5cac..0000000
--- a/java/build/site_fragment.xml.in
+++ /dev/null
@@ -1,7 +0,0 @@
- <feature
- url="features/org.openoffice.ide.eclipse.java_ at VERSION@.jar"
- id="org.openoffice.ide.eclipse.java" version="@VERSION@">
- <category name="LibreOffice"/>
- </feature>
-
-
\ No newline at end of file
commit 235472bc13bd3889f9ff885fbdc16d0b1835e476
Author: Cédric Bosdonnat <cedricbosdo at openoffice.org>
Date: Thu Dec 9 20:38:06 2010 +0100
Updated some artwork to libreoffice
diff --git a/core/icons/aboutBanner.png b/core/icons/aboutBanner.png
index bd2f28f..b0c1eb6 100755
Binary files a/core/icons/aboutBanner.png and b/core/icons/aboutBanner.png differ
diff --git a/core/icons/install_banner.png b/core/icons/install_banner.png
new file mode 100644
index 0000000..a62056d
Binary files /dev/null and b/core/icons/install_banner.png differ
diff --git a/core/icons/ooo_banner.gif b/core/icons/ooo_banner.gif
deleted file mode 100755
index 19af407..0000000
Binary files a/core/icons/ooo_banner.gif and /dev/null differ
diff --git a/core/icons/sdk_banner.gif b/core/icons/sdk_banner.gif
deleted file mode 100755
index 0104029..0000000
Binary files a/core/icons/sdk_banner.gif and /dev/null differ
diff --git a/core/icons/sdk_banner.png b/core/icons/sdk_banner.png
new file mode 100644
index 0000000..54d2333
Binary files /dev/null and b/core/icons/sdk_banner.png differ
diff --git a/core/source/org/openoffice/ide/eclipse/core/i18n/ImageManager.properties b/core/source/org/openoffice/ide/eclipse/core/i18n/ImageManager.properties
index 73acd2f..2fc4ff8 100755
--- a/core/source/org/openoffice/ide/eclipse/core/i18n/ImageManager.properties
+++ b/core/source/org/openoffice/ide/eclipse/core/i18n/ImageManager.properties
@@ -1,5 +1,5 @@
-SDK_DIALOG_IMAGE = /icons/sdk_banner.gif
-OOO_DIALOG_IMAGE = /icons/ooo_banner.gif
+SDK_DIALOG_IMAGE = /icons/sdk_banner.png
+OOO_DIALOG_IMAGE = /icons/install_banner.png
ERROR = /icons/error.gif
UNO_PROJECT = /icons/uno_prj.gif
NEWPROJECT_WIZ = /icons/newunoprj_wiz.gif
More information about the ooo-build-commit
mailing list