diff options
| author | Cédric Bosdonnat <cedric.bosdonnat@free.fr> | 2012-08-14 10:41:31 +0200 |
|---|---|---|
| committer | Cédric Bosdonnat <cedric.bosdonnat@free.fr> | 2012-08-14 10:41:31 +0200 |
| commit | 82120be1fb1668fb7e11d375c845030438f8837f (patch) | |
| tree | 7cc2d4f751ccaef65bc46d95743435f7a4769d67 | |
| parent | 6d316d8c5a1cb2a04c6a5d1712b536a073e2bb66 (diff) | |
Fixed update site build
| -rw-r--r-- | build/build.xml | 145 | ||||
| -rw-r--r-- | build/features/core/feature.xml | 100 | ||||
| -rw-r--r-- | build/features/cpp/feature.xml | 94 | ||||
| -rw-r--r-- | build/features/cpp/includes.xml | 1 | ||||
| -rw-r--r-- | build/features/java/feature.xml | 94 | ||||
| -rw-r--r-- | build/features/java/includes.xml | 1 | ||||
| -rw-r--r-- | build/site-feature.xml | 3 | ||||
| -rw-r--r-- | build/site-footer.xml | 2 | ||||
| -rw-r--r-- | build/site-header.xml | 2 | ||||
| -rw-r--r-- | build/site.xml | 13 | ||||
| -rw-r--r-- | packager/build.xml (renamed from packager/build/build.xml) | 19 |
11 files changed, 212 insertions, 262 deletions
diff --git a/build/build.xml b/build/build.xml index d62ee61..f110896 100644 --- a/build/build.xml +++ b/build/build.xml @@ -72,7 +72,7 @@ <target name="check-ooo-version"> - <property name="office.linux.basis.dir" value="${openoffice.home}${file.separator}basis-link"/> + <property name="office.linux.basis.dir" value="${openoffice.home}"/> <property name="office.linux.ure.dir" value="${office.linux.basis.dir}${file.separator}ure-link"/> <!-- Needed due to some differences between Windows and Linux installs --> @@ -150,6 +150,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"/> + <dirname property="build.basedir" file="${ant.file.ooeclipseintegration}"/> <property name="out.path" value="${basedir}/../site" /> <condition property="debug" value="false"> <not> @@ -165,7 +166,7 @@ <mkdir dir="${out.path}" /> <mkdir dir="${out.path}/plugins" /> - <mkdir dir="${out.path}/features" /> + <mkdir dir="${out.path}/features" /> </target> <target name="purge" description="Cleans all the output results" @@ -176,16 +177,13 @@ <target name="versions" depends="core.version, java.version, cpp.version" /> - <target name="core.feature" depends="versions"> - <!-- Replace the 0.0.0.* tokens to create the feature.xml file --> + <target name="core.feature" depends="versions, java.feature, cpp.feature"> <copy file="features/core/feature.xml" - tofile="${out.path}/features/feature.xml" /> - <replace file="${out.path}/features/feature.xml" - token="0.0.0.core" value="${core.Bundle-Version}" /> - <replace file="${out.path}/features/feature.xml" - token="0.0.0.java" value="${java.Bundle-Version}" /> - <replace file="${out.path}/features/feature.xml" - token="0.0.0.cpp" value="${cpp.Bundle-Version}" /> + tofile="${out.path}/features/feature.xml"> + <filterchain> + <expandproperties/> + </filterchain> + </copy> <jar destfile="${out.path}/features/${package.prefix}.core_${core.Bundle-Version}.jar"> <zipfileset dir="${out.path}/features" prefix="" defaultexcludes="true"> @@ -195,48 +193,69 @@ <delete file="${out.path}/features/feature.xml"/> </target> - - <target name="java.feature" depends="versions"> - <!-- Replace the 0.0.0.* tokens to create the feature.xml file --> + + <target name="java.feature.nobuild" if="java.nobuild"> + <property name="includes.java" value=""/> + </target> + + <target name="java.feature.build" depends="versions" unless="java.nobuild"> <copy file="features/java/feature.xml" - tofile="${out.path}/features/feature.xml" /> - <replace file="${out.path}/features/feature.xml" - token="0.0.0.core" value="${core.Bundle-Version}" /> - <replace file="${out.path}/features/feature.xml" - token="0.0.0.java" value="${java.Bundle-Version}" /> - <replace file="${out.path}/features/feature.xml" - token="0.0.0.cpp" value="${cpp.Bundle-Version}" /> + tofile="${out.path}/features/feature.xml"> + <filterchain> + <expandproperties/> + </filterchain> + </copy> <jar destfile="${out.path}/features/${package.prefix}.java_${java.Bundle-Version}.jar"> <zipfileset dir="${out.path}/features" prefix="" defaultexcludes="true"> <include name="feature.xml"/> </zipfileset> - </jar> + </jar> + + <loadfile property="includes.java" + srcfile="features/java/includes.xml"> + <filterchain> + <expandproperties/> + </filterchain> + </loadfile> + <echo>${includes.java}</echo> <delete file="${out.path}/features/feature.xml"/> - </target> - - <target name="cpp.feature" depends="versions"> - <!-- Replace the 0.0.0.* tokens to create the feature.xml file --> + </target> + + <target name="java.feature" depends="java.feature.build, java.feature.nobuild"/> + + <target name="cpp.feature.nobuild" if="cpp.nobuild"> + <property name="includes.cpp" value="" /> + </target> + + <target name="cpp.feature.build" depends="versions" unless="cpp.nobuild"> <copy file="features/cpp/feature.xml" - tofile="${out.path}/features/feature.xml" /> - <replace file="${out.path}/features/feature.xml" - token="0.0.0.core" value="${core.Bundle-Version}" /> - <replace file="${out.path}/features/feature.xml" - token="0.0.0.java" value="${java.Bundle-Version}" /> - <replace file="${out.path}/features/feature.xml" - token="0.0.0.cpp" value="${cpp.Bundle-Version}" /> + tofile="${out.path}/features/feature.xml"> + <filterchain> + <expandproperties/> + </filterchain> + </copy> <jar destfile="${out.path}/features/${package.prefix}.cpp_${cpp.Bundle-Version}.jar"> <zipfileset dir="${out.path}/features" prefix="" defaultexcludes="true"> <include name="feature.xml"/> </zipfileset> </jar> + + <loadfile property="includes.cpp" + srcfile="features/cpp/includes.xml"> + <filterchain> + <expandproperties/> + </filterchain> + </loadfile> <delete file="${out.path}/features/feature.xml"/> - </target> + </target> + + <target name="cpp.feature" depends="cpp.feature.build, cpp.feature.nobuild"/> - <target name="features" depends="core.feature, versions, java.feature, cpp.feature"/> + <target name="features" depends="versions, java.feature, cpp.feature, core.feature"/> <target name="plugins" depends="core.plugin, java.plugin, cpp.plugin"/> <macrodef name="equinoxLauncher"> @@ -274,7 +293,7 @@ </sequential> </macrodef> - <target name="site" depends="init-env, plugins, features" + <target name="site" depends="init-env, plugins, features, core.site, java.site, cpp.site" description="Creates the Eclipse update site"> <!-- @@ -282,30 +301,17 @@ http://plosquare.blogspot.com/2009/05/migrating-eclipse-update-sites-to-p2.html --> - <!-- Replace the versions in the site.xml --> - <copy file="site.xml" - tofile="${out.path}/site.xml" /> - <replace file="${out.path}/site.xml" - token="0.0.0.core" value="${core.Bundle-Version}" /> - <replace file="${out.path}/site.xml" - token="0.0.0.java" value="${java.Bundle-Version}" /> - <replace file="${out.path}/site.xml" - token="0.0.0.cpp" value="${cpp.Bundle-Version}" /> - - <!-- Copying the plugins --> - <echo message="Copying the plugins JARs"/> - <copy todir="${out.path}/plugins"> - <fileset dir=".." - includes="**/plugins/*.jar" /> - <mapper type="flatten" /> - </copy> - - <!-- Preparing the plugins for p2 update site --> - <echo message="Preparing the plugins for the p2 update site"/> - <prepareJar jar="${out.path}/plugins/${package.prefix}.packager.core_${packager.Bundle-Version}.jar" outdir="${out.path}/plugins"/> - <prepareJar jar="${out.path}/plugins/${package.prefix}.core_${core.Bundle-Version}.jar" outdir="${out.path}/plugins"/> - <prepareJar jar="${out.path}/plugins/${package.prefix}.java_${java.Bundle-Version}.jar" outdir="${out.path}/plugins"/> - <prepareJar jar="${out.path}/plugins/${package.prefix}.cpp_${cpp.Bundle-Version}.jar" outdir="${out.path}/plugins"/> + <!-- Create site.xml --> + <concat destfile="${out.path}/site.xml" binary="true"> + <path path="site-header.xml"/> + <fileset dir="${out.path}" includes="site-*.xml"/> + <path path="site-footer.xml"/> + </concat> + + <!-- Remove the site-*.xml fragments --> + <delete> + <fileset dir="${out.path}" includes="site-*.xml"/> + </delete> <!-- Generate p2's .jar.pack.gz and digest.zip --> <echo message="Generating p2's .jar.pack.gz and digest.zip"/> @@ -323,25 +329,16 @@ </equinoxLauncher> <!-- Generate content.jar and artifacts.jar --> - <equinoxLauncher application="org.eclipse.equinox.p2.metadata.generator.EclipseGenerator"> + <equinoxLauncher application="org.eclipse.equinox.p2.publisher.UpdateSitePublisher"> <args> - <arg value="-updateSite"/> - <arg value="${out.path}"/> - <arg value="-site"/> - <arg value="file:/${out.path}/site.xml"/> <arg value="-metadataRepository"/> - <arg value="file:${out.path}/"/> - <arg value="-metadataRepositoryName"/> - <arg value="OOEclipse Update Site"/> + <arg value="file:${out.path}/"/> <arg value="-artifactRepository"/> <arg value="file:${out.path}/"/> - <arg value="-artifactRepositoryName"/> - <arg value="OOEclipse Artifacts"/> + <arg value="-source"/> + <arg value="${out.path}"/> <arg value="-compress"/> - <arg value="-reusePack200Files"/> - <arg value="-noDefaultIUs"/> - <arg value="-vmargs"/> - <arg value="-Xmx256M"/> + <arg value="-publishArtifacts"/> </args> </equinoxLauncher> diff --git a/build/features/core/feature.xml b/build/features/core/feature.xml index e2a00f4..f30ef6d 100644 --- a/build/features/core/feature.xml +++ b/build/features/core/feature.xml @@ -1,15 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<feature - id="org.openoffice.ide.eclipse.core" - label="LibreOffice development plugin core" - version="0.0.0.core" - provider-name="Cédric Bosdonnat" - plugin="org.openoffice.ide.eclipse.core"> - - <description> +<feature id="org.openoffice.ide.eclipse.core" label="LibreOffice development plugin core" version="${core.Bundle-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 +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. @@ -27,12 +21,10 @@ 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> Copyright: (c) 2005-2010 Cedric Bosdonnat </copyright> - - <license url="http://www.gnu.org/licenses/lgpl.txt"> + <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/ @@ -42,24 +34,24 @@ 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 +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, +"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 +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 +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 +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 "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 @@ -116,7 +108,7 @@ 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 +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. @@ -150,7 +142,7 @@ 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" +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 @@ -159,7 +151,7 @@ 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 +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 @@ -171,25 +163,25 @@ 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 +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, +"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 +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 +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 +"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 "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 @@ -247,7 +239,7 @@ 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 +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. @@ -306,8 +298,8 @@ 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 +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 @@ -316,11 +308,11 @@ 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 +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 +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 @@ -329,30 +321,14 @@ 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 +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="0.0.0.java" - optional="true"/> - - <includes - id="org.openoffice.ide.eclipse.cpp" - version="0.0.0.cpp" - optional="true"/> - - <plugin - id="org.openoffice.ide.eclipse.core" - download-size="0" - install-size="0" - version="0.0.0.core" - unpack="false"/> - + <url> + <update label="LibreOffice Plugin update site" url="http://cedric.bosdonnat.free.fr/ooeclipseintegration"/> + </url> + ${includes.java} + ${includes.cpp} + <plugin id="org.openoffice.ide.eclipse.core" download-size="0" install-size="0" version="${core.Bundle-Version}" unpack="false"/> </feature> diff --git a/build/features/cpp/feature.xml b/build/features/cpp/feature.xml index f900869..f6427ed 100644 --- a/build/features/cpp/feature.xml +++ b/build/features/cpp/feature.xml @@ -1,11 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<feature - id="org.openoffice.ide.eclipse.cpp" - label="LibreOffice development plugin support for C++ implementation" - version="0.0.0.cpp" - provider-name="Cédric Bosdonnat"> - - <description> +<feature id="org.openoffice.ide.eclipse.cpp" label="LibreOffice development plugin support for C++ implementation" version="${cpp.Bundle-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. @@ -15,12 +10,10 @@ 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> Copyright: (c) 2005-2010 Cedric Bosdonnat </copyright> - - <license url="http://www.gnu.org/licenses/lgpl.txt"> + <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/ @@ -30,24 +23,24 @@ 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 +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, +"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 +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 +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 +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 "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 @@ -104,7 +97,7 @@ 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 +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. @@ -138,7 +131,7 @@ 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" +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 @@ -147,7 +140,7 @@ 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 +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 @@ -159,25 +152,25 @@ 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 +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, +"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 +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 +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 +"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 "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 @@ -235,7 +228,7 @@ 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 +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. @@ -294,8 +287,8 @@ 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 +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 @@ -304,11 +297,11 @@ 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 +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 +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 @@ -317,25 +310,16 @@ 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 +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"/> - <import plugin="org.openoffice.ide.eclipse.core" version="0.0.0.core"/> - </requires> - - <plugin - id="org.openoffice.ide.eclipse.cpp" - download-size="0" - install-size="0" - version="0.0.0.cpp" - unpack="false"/> - + <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"/> + <import plugin="org.openoffice.ide.eclipse.core" version="${core.Bundle-Version}"/> + </requires> + <plugin id="org.openoffice.ide.eclipse.cpp" download-size="0" install-size="0" version="${cpp.Bundle-Version}" unpack="false"/> </feature> diff --git a/build/features/cpp/includes.xml b/build/features/cpp/includes.xml new file mode 100644 index 0000000..1af23fb --- /dev/null +++ b/build/features/cpp/includes.xml @@ -0,0 +1 @@ + <includes id="org.openoffice.ide.eclipse.cpp" version="${cpp.Bundle-Version}" optional="true"/> diff --git a/build/features/java/feature.xml b/build/features/java/feature.xml index 58ccc43..aabd0f8 100644 --- a/build/features/java/feature.xml +++ b/build/features/java/feature.xml @@ -1,11 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<feature - id="org.openoffice.ide.eclipse.java" - label="LibreOffice development plugin support for Java implementation" - version="0.0.0.java" - provider-name="Cédric Bosdonnat"> - - <description> +<feature id="org.openoffice.ide.eclipse.java" label="LibreOffice development plugin support for Java implementation" version="${java.Bundle-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. @@ -15,12 +10,10 @@ 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> Copyright: (c) 2005-2010 Cedric Bosdonnat </copyright> - - <license url="http://www.gnu.org/licenses/lgpl.txt"> + <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/ @@ -30,24 +23,24 @@ 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 +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, +"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 +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 +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 +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 "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 @@ -104,7 +97,7 @@ 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 +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. @@ -138,7 +131,7 @@ 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" +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 @@ -147,7 +140,7 @@ 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 +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 @@ -159,25 +152,25 @@ 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 +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, +"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 +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 +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 +"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 "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 @@ -235,7 +228,7 @@ 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 +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. @@ -294,8 +287,8 @@ 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 +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 @@ -304,11 +297,11 @@ 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 +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 +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 @@ -317,25 +310,16 @@ 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 +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"/> - <import plugin="org.openoffice.ide.eclipse.core" version="0.0.0.core"/> - </requires> - - <plugin - id="org.openoffice.ide.eclipse.java" - download-size="0" - install-size="0" - version="0.0.0.java" - unpack="false"/> - + <url> + <discovery label="LibreOffice Plugin update site" url="http://cedric.bosdonnat.free.fr/ooeclipseintegration"/> + </url> + <requires> + <import feature="org.eclipse.jdt"/> + <import plugin="org.openoffice.ide.eclipse.core" version="${core.Bundle-Version}"/> + </requires> + <plugin id="org.openoffice.ide.eclipse.java" download-size="0" install-size="0" version="${java.Bundle-Version}" unpack="false"/> </feature> diff --git a/build/features/java/includes.xml b/build/features/java/includes.xml new file mode 100644 index 0000000..fed1589 --- /dev/null +++ b/build/features/java/includes.xml @@ -0,0 +1 @@ + <includes id="org.openoffice.ide.eclipse.java" version="${java.Bundle-Version}" optional="true"/> diff --git a/build/site-feature.xml b/build/site-feature.xml new file mode 100644 index 0000000..5c14725 --- /dev/null +++ b/build/site-feature.xml @@ -0,0 +1,3 @@ + <feature url="@@URL@@" id="@@ID@@" version="@@VERSION@@"> + <category name="LibreOffice"/> + </feature> diff --git a/build/site-footer.xml b/build/site-footer.xml new file mode 100644 index 0000000..f76ad8b --- /dev/null +++ b/build/site-footer.xml @@ -0,0 +1,2 @@ + <category-def name="LibreOffice" label="LibreOffice"/> +</site> diff --git a/build/site-header.xml b/build/site-header.xml new file mode 100644 index 0000000..0db09c2 --- /dev/null +++ b/build/site-header.xml @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<site pack200="true" digestURL="http://cedric.bosdonnat.free.fr/ooeclipseintegration"> diff --git a/build/site.xml b/build/site.xml deleted file mode 100644 index 1787f9a..0000000 --- a/build/site.xml +++ /dev/null @@ -1,13 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<site pack200="true" digestURL="http://cedric.bosdonnat.free.fr/ooeclipseintegration"> - <feature url="features/org.openoffice.ide.eclipse.core_0.0.0.core.jar" id="org.openoffice.ide.eclipse.core" version="0.0.0.core"> - <category name="LibreOffice"/> - </feature> - <feature url="features/org.openoffice.ide.eclipse.cpp_0.0.0.cpp.jar" id="org.openoffice.ide.eclipse.cpp" version="0.0.0.cpp"> - <category name="LibreOffice"/> - </feature> - <feature url="features/org.openoffice.ide.eclipse.java_0.0.0.java.jar" id="org.openoffice.ide.eclipse.java" version="0.0.0.java"> - <category name="LibreOffice"/> - </feature> - <category-def name="LibreOffice" label="LibreOffice"/> -</site> diff --git a/packager/build/build.xml b/packager/build.xml index 856b009..65c8401 100644 --- a/packager/build/build.xml +++ b/packager/build.xml @@ -32,9 +32,9 @@ <project name="packager" default="update-sources"> <target name="init-env"> - <dirname property="packager.basedir" file="${ant.file.packager}/.."/> + <dirname property="packager.basedir" file="${ant.file.packager}"/> - <loadproperties srcfile="${packager.basedir}/build/build.properties" /> + <property name="packager.git.repo" value="git://github.com/cbosdo/ooo-plugin-packager.git" /> <property name="packager.out.path" value="${packager.basedir}/bin/ant" /> <property name="packager.out.classes" value="${packager.out.path}/classes"/> @@ -57,7 +57,7 @@ <delete file="${manifest.properties}" /> </target> - <target name="purge" depends="init-env"> + <target name="packager.purge" depends="init-env"> <property name="packager.out.path" value="${packager.basedir}/bin/ant" /> <delete dir="${packager.out.path}" /> </target> @@ -94,5 +94,18 @@ </jar> </target> + <target name="packager.site" depends="packager.plugin"> + + <!-- Copying the plugins --> + <copy todir="${out.path}/plugins"> + <fileset dir="${packager.out.path}/plugins/" + includes="*.jar" /> + <mapper type="flatten" /> + </copy> + + <!-- Preparing the plugins for p2 update site --> + <prepareJar jar="${out.path}/plugins/${package.prefix}.packager.core_${packager.Bundle-Version}.jar" outdir="${out.path}/plugins"/> + </target> + </project> |