[ooo-build-commit] ooeclipse: Branch 'master' - 3 commits
Cédric Bosdonnat
cbosdo at kemper.freedesktop.org
Fri Dec 10 14:28:43 PST 2010
build/build.xml | 141 ++++++++++++++++++++++++++++++++--------
build/features/core/feature.xml | 8 +-
build/features/cpp/feature.xml | 8 +-
build/features/java/feature.xml | 8 +-
build/site.xml | 8 +-
build/versions.properties | 5 -
core/META-INF/MANIFEST.MF | 2
cpp/META-INF/MANIFEST.MF | 2
java/META-INF/MANIFEST.MF | 2
packager/META-INF/MANIFEST.MF | 2
10 files changed, 136 insertions(+), 50 deletions(-)
New commits:
commit adad909e9a30f984e42ef8cb530cd2ff134c9908
Author: Cédric Bosdonnat <cedricbosdo at openoffice.org>
Date: Fri Dec 10 23:28:06 2010 +0100
[build] Generating a p2 update site
diff --git a/build/build.xml b/build/build.xml
index 84676e8..d62ee61 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -150,13 +150,19 @@
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="${basedir}/../site" />
<condition property="debug" value="false">
<not>
<isset property="debug"/>
</not>
</condition>
+ <path id="eclipse.classpath">
+ <fileset dir="${eclipse.home}/plugins">
+ <include name="*.jar"/>
+ </fileset>
+ </path>
+
<mkdir dir="${out.path}" />
<mkdir dir="${out.path}/plugins" />
<mkdir dir="${out.path}/features" />
@@ -233,9 +239,49 @@
<target name="features" depends="core.feature, versions, java.feature, cpp.feature"/>
<target name="plugins" depends="core.plugin, java.plugin, cpp.plugin"/>
+ <macrodef name="equinoxLauncher">
+ <attribute name="application"/>
+ <element name="args"/>
+ <sequential>
+ <java classname="org.eclipse.equinox.launcher.Main"
+ classpathref="eclipse.classpath"
+ failonerror="true"
+ logerror="true"
+ fork="true"
+ newenvironment="true">
+ <arg value="-application"/>
+ <arg value="@{application}"/>
+ <args/>
+ </java>
+ </sequential>
+ </macrodef>
+
+ <macrodef name="prepareJar">
+ <attribute name="jar"/>
+ <attribute name="outdir"/>
+ <sequential>
+ <equinoxLauncher application="org.eclipse.update.core.siteOptimizer">
+ <args>
+ <arg value="-jarProcessor"/>
+ <arg value="-verbose"/>
+ <arg value="-processAll"/>
+ <arg value="-repack"/>
+ <arg value="-outputDir"/>
+ <arg value="@{outdir}"/>
+ <arg value="@{jar}"/>
+ </args>
+ </equinoxLauncher>
+ </sequential>
+ </macrodef>
+
<target name="site" depends="init-env, plugins, features"
description="Creates the Eclipse update site">
+ <!--
+ Instructions to create the update site are coming from this page:
+ 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" />
@@ -253,6 +299,52 @@
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"/>
+
+ <!-- Generate p2's .jar.pack.gz and digest.zip -->
+ <echo message="Generating p2's .jar.pack.gz and digest.zip"/>
+ <equinoxLauncher application="org.eclipse.update.core.siteOptimizer">
+ <args>
+ <arg value="-digestBuilder"/>
+ <arg value="-digestOutputDir=${out.path}"/>
+ <arg value="-siteXML=${out.path}/site.xml"/>
+ <arg value="-jarProcessor"/>
+ <arg value="-pack"/>
+ <arg value="-outputDir"/>
+ <arg value="${out.path}"/>
+ <arg value="${out.path}"/>
+ </args>
+ </equinoxLauncher>
+
+ <!-- Generate content.jar and artifacts.jar -->
+ <equinoxLauncher application="org.eclipse.equinox.p2.metadata.generator.EclipseGenerator">
+ <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="-artifactRepository"/>
+ <arg value="file:${out.path}/"/>
+ <arg value="-artifactRepositoryName"/>
+ <arg value="OOEclipse Artifacts"/>
+ <arg value="-compress"/>
+ <arg value="-reusePack200Files"/>
+ <arg value="-noDefaultIUs"/>
+ <arg value="-vmargs"/>
+ <arg value="-Xmx256M"/>
+ </args>
+ </equinoxLauncher>
+
</target>
<target name="archive-site" description="Create a zip for the update site"
diff --git a/build/site.xml b/build/site.xml
index c89e12f..1787f9a 100644
--- a/build/site.xml
+++ b/build/site.xml
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
-<site>
- <feature url="features/org.openoffice.ide.eclipse.core_1.2.0.jar" id="org.openoffice.ide.eclipse.core" version="1.2.0">
+<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.6.0.jar" id="org.openoffice.ide.eclipse.cpp" version="0.6.0">
+ <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_1.0.3.jar" id="org.openoffice.ide.eclipse.java" version="1.0.3">
+ <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"/>
commit 403b9b00307ce178f9b1fdbe9353be246c3bd6dd
Author: Cédric Bosdonnat <cedricbosdo at openoffice.org>
Date: Fri Dec 10 23:27:39 2010 +0100
[build] Fixed the packager.core plugin ID
diff --git a/core/META-INF/MANIFEST.MF b/core/META-INF/MANIFEST.MF
index 0850ab3..6edd186 100644
--- a/core/META-INF/MANIFEST.MF
+++ b/core/META-INF/MANIFEST.MF
@@ -18,7 +18,7 @@ Require-Bundle: org.eclipse.core.runtime;visibility:=reexport,
org.eclipse.debug.core;visibility:=reexport,
org.eclipse.debug.ui,
org.eclipse.ui;bundle-version="3.4.1",
- org.openoffice.ide.packager.core;bundle-version="0.1.0"
+ org.openoffice.ide.eclipse.packager.core;bundle-version="0.1.0"
Bundle-ActivationPolicy: lazy
Export-Package: org.openoffice.ide.eclipse.core,
org.openoffice.ide.eclipse.core.actions,
diff --git a/cpp/META-INF/MANIFEST.MF b/cpp/META-INF/MANIFEST.MF
index 2f51602..6773b9f 100644
--- a/cpp/META-INF/MANIFEST.MF
+++ b/cpp/META-INF/MANIFEST.MF
@@ -14,7 +14,7 @@ Require-Bundle: org.eclipse.ui,
org.eclipse.cdt.ui;bundle-version="5.1.0",
org.eclipse.ui.ide;bundle-version="3.5.0",
org.eclipse.ui.cheatsheets,
- org.openoffice.ide.packager.core;bundle-version="0.1.0",
+ org.openoffice.ide.eclipse.packager.core;bundle-version="0.1.0",
org.eclipse.debug.core
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-ActivationPolicy: lazy
diff --git a/java/META-INF/MANIFEST.MF b/java/META-INF/MANIFEST.MF
index 5a77b07..5f4f25b 100644
--- a/java/META-INF/MANIFEST.MF
+++ b/java/META-INF/MANIFEST.MF
@@ -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.eclipse.packager.core;bundle-version="0.1.0",
org.eclipse.jdt.debug.ui;bundle-version="3.4.1"
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/packager/META-INF/MANIFEST.MF b/packager/META-INF/MANIFEST.MF
index 4c698c3..4d316ae 100644
--- a/packager/META-INF/MANIFEST.MF
+++ b/packager/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: ooo-plugin-packager core
-Bundle-SymbolicName: org.openoffice.ide.packager.core
+Bundle-SymbolicName: org.openoffice.ide.eclipse.packager.core
Bundle-Version: 0.1.0
Bundle-Vendor: Cédric Bosdonnat
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
commit 9b5f458bab30066fa82760bbd78db6414c35629d
Author: Cédric Bosdonnat <cedricbosdo at openoffice.org>
Date: Fri Dec 10 20:51:25 2010 +0100
[build] Finally removed all use of the versions.properties
The feature files are still usable by PDE: the replaced version strings
in the feature files are in the form 0.0.0.plugin.
diff --git a/build/build.xml b/build/build.xml
index 18792ff..84676e8 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -46,8 +46,6 @@
<import file="../java/build.xml"/>
<import file="../cpp/build.xml"/>
- <property file="versions.properties"/>
-
<target name="help" description="Tells how to run the script">
<echo>
This ant file has to be called with the following parameters:
@@ -170,19 +168,20 @@
<delete file="../ooeclipseintegration_site.zip" />
</target>
+ <target name="versions" depends="core.version, java.version, cpp.version" />
- <target name="core.feature">
- <!-- Replace the @*_VERSION@ tokens to create the feature.xml file -->
+ <target name="core.feature" depends="versions">
+ <!-- Replace the 0.0.0.* tokens to create the feature.xml file -->
<copy file="features/core/feature.xml"
tofile="${out.path}/features/feature.xml" />
<replace file="${out.path}/features/feature.xml"
- token="@CORE_VERSION@" value="${core.plugin.version}" />
+ token="0.0.0.core" value="${core.Bundle-Version}" />
<replace file="${out.path}/features/feature.xml"
- token="@JAVA_VERSION@" value="${java.plugin.version}" />
+ token="0.0.0.java" value="${java.Bundle-Version}" />
<replace file="${out.path}/features/feature.xml"
- token="@CPP_VERSION@" value="${cpp.plugin.version}" />
+ token="0.0.0.cpp" value="${cpp.Bundle-Version}" />
- <jar destfile="${out.path}/features/${package.prefix}.core_${core.plugin.version}.jar">
+ <jar destfile="${out.path}/features/${package.prefix}.core_${core.Bundle-Version}.jar">
<zipfileset dir="${out.path}/features" prefix="" defaultexcludes="true">
<include name="feature.xml"/>
</zipfileset>
@@ -191,18 +190,18 @@
<delete file="${out.path}/features/feature.xml"/>
</target>
- <target name="java.feature">
- <!-- Replace the @*_VERSION@ tokens to create the feature.xml file -->
+ <target name="java.feature" depends="versions">
+ <!-- Replace the 0.0.0.* tokens to create the feature.xml file -->
<copy file="features/java/feature.xml"
tofile="${out.path}/features/feature.xml" />
<replace file="${out.path}/features/feature.xml"
- token="@CORE_VERSION@" value="${core.plugin.version}" />
+ token="0.0.0.core" value="${core.Bundle-Version}" />
<replace file="${out.path}/features/feature.xml"
- token="@JAVA_VERSION@" value="${java.plugin.version}" />
+ token="0.0.0.java" value="${java.Bundle-Version}" />
<replace file="${out.path}/features/feature.xml"
- token="@CPP_VERSION@" value="${cpp.plugin.version}" />
+ token="0.0.0.cpp" value="${cpp.Bundle-Version}" />
- <jar destfile="${out.path}/features/${package.prefix}.java_${java.plugin.version}.jar">
+ <jar destfile="${out.path}/features/${package.prefix}.java_${java.Bundle-Version}.jar">
<zipfileset dir="${out.path}/features" prefix="" defaultexcludes="true">
<include name="feature.xml"/>
</zipfileset>
@@ -211,18 +210,18 @@
<delete file="${out.path}/features/feature.xml"/>
</target>
- <target name="cpp.feature">
- <!-- Replace the @*_VERSION@ tokens to create the feature.xml file -->
+ <target name="cpp.feature" depends="versions">
+ <!-- Replace the 0.0.0.* tokens to create the feature.xml file -->
<copy file="features/cpp/feature.xml"
tofile="${out.path}/features/feature.xml" />
<replace file="${out.path}/features/feature.xml"
- token="@CORE_VERSION@" value="${core.plugin.version}" />
+ token="0.0.0.core" value="${core.Bundle-Version}" />
<replace file="${out.path}/features/feature.xml"
- token="@JAVA_VERSION@" value="${java.plugin.version}" />
+ token="0.0.0.java" value="${java.Bundle-Version}" />
<replace file="${out.path}/features/feature.xml"
- token="@CPP_VERSION@" value="${cpp.plugin.version}" />
+ token="0.0.0.cpp" value="${cpp.Bundle-Version}" />
- <jar destfile="${out.path}/features/${package.prefix}.cpp_${cpp.plugin.version}.jar">
+ <jar destfile="${out.path}/features/${package.prefix}.cpp_${cpp.Bundle-Version}.jar">
<zipfileset dir="${out.path}/features" prefix="" defaultexcludes="true">
<include name="feature.xml"/>
</zipfileset>
@@ -231,7 +230,7 @@
<delete file="${out.path}/features/feature.xml"/>
</target>
- <target name="features" depends="core.feature, java.feature, cpp.feature"/>
+ <target name="features" depends="core.feature, versions, java.feature, cpp.feature"/>
<target name="plugins" depends="core.plugin, java.plugin, cpp.plugin"/>
<target name="site" depends="init-env, plugins, features"
@@ -241,11 +240,11 @@
<copy file="site.xml"
tofile="${out.path}/site.xml" />
<replace file="${out.path}/site.xml"
- token="@CORE_VERSION@" value="${core.plugin.version}" />
+ token="0.0.0.core" value="${core.Bundle-Version}" />
<replace file="${out.path}/site.xml"
- token="@JAVA_VERSION@" value="${java.plugin.version}" />
+ token="0.0.0.java" value="${java.Bundle-Version}" />
<replace file="${out.path}/site.xml"
- token="@CPP_VERSION@" value="${cpp.plugin.version}" />
+ token="0.0.0.cpp" value="${cpp.Bundle-Version}" />
<!-- Copying the plugins -->
<echo message="Copying the plugins JARs"/>
diff --git a/build/features/core/feature.xml b/build/features/core/feature.xml
index b8b64c0..e2a00f4 100644
--- a/build/features/core/feature.xml
+++ b/build/features/core/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.openoffice.ide.eclipse.core"
label="LibreOffice development plugin core"
- version="1.2.0"
+ version="0.0.0.core"
provider-name="Cédric Bosdonnat"
plugin="org.openoffice.ide.eclipse.core">
@@ -340,19 +340,19 @@ version for the Library.
<includes
id="org.openoffice.ide.eclipse.java"
- version="0.0.0"
+ version="0.0.0.java"
optional="true"/>
<includes
id="org.openoffice.ide.eclipse.cpp"
- version="0.0.0"
+ version="0.0.0.cpp"
optional="true"/>
<plugin
id="org.openoffice.ide.eclipse.core"
download-size="0"
install-size="0"
- version="0.0.0"
+ version="0.0.0.core"
unpack="false"/>
</feature>
diff --git a/build/features/cpp/feature.xml b/build/features/cpp/feature.xml
index 1b5f551..f900869 100644
--- a/build/features/cpp/feature.xml
+++ b/build/features/cpp/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.openoffice.ide.eclipse.cpp"
label="LibreOffice development plugin support for C++ implementation"
- version="0.5.0"
+ version="0.0.0.cpp"
provider-name="Cédric Bosdonnat">
<description>
@@ -327,15 +327,15 @@ version for the Library.
</url>
<requires>
- <import feature="org.eclipse.cdt" version="6.0.0.200909110608"/>
- <import plugin="org.openoffice.ide.eclipse.core" version="0.0.0"/>
+ <import feature="org.eclipse.cdt" version="6.0.0"/>
+ <import plugin="org.openoffice.ide.eclipse.core" version="0.0.0.core"/>
</requires>
<plugin
id="org.openoffice.ide.eclipse.cpp"
download-size="0"
install-size="0"
- version="0.0.0"
+ version="0.0.0.cpp"
unpack="false"/>
</feature>
diff --git a/build/features/java/feature.xml b/build/features/java/feature.xml
index 2b238c4..58ccc43 100644
--- a/build/features/java/feature.xml
+++ b/build/features/java/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.openoffice.ide.eclipse.java"
label="LibreOffice development plugin support for Java implementation"
- version="1.0.3"
+ version="0.0.0.java"
provider-name="Cédric Bosdonnat">
<description>
@@ -327,15 +327,15 @@ version for the Library.
</url>
<requires>
- <import feature="org.eclipse.jdt" version="3.5.1.r351_v20090810-0600-7r88FEoFI0WTo6Az-1qFRHm37ChJ"/>
- <import plugin="org.openoffice.ide.eclipse.core" version="0.0.0"/>
+ <import feature="org.eclipse.jdt"/>
+ <import plugin="org.openoffice.ide.eclipse.core" version="0.0.0.core"/>
</requires>
<plugin
id="org.openoffice.ide.eclipse.java"
download-size="0"
install-size="0"
- version="0.0.0"
+ version="0.0.0.java"
unpack="false"/>
</feature>
diff --git a/build/versions.properties b/build/versions.properties
deleted file mode 100644
index 3ab8bb1..0000000
--- a/build/versions.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-core.plugin.version=1.2.0
-java.plugin.version=1.0.3
-cpp.plugin.version=0.5.0
-
-debug=true
\ No newline at end of file
More information about the ooo-build-commit
mailing list