diff options
| author | Tobias Oberlies | 2011-12-17 14:30:33 +0000 |
|---|---|---|
| committer | Lakshmi Shanmugam | 2014-11-19 17:13:56 +0000 |
| commit | 1fb1522a48d55b59d07f0c37bf5e56bead8298b5 (patch) | |
| tree | 442415e48184a1e063c32a891bf7220ac535c178 /bundles/org.eclipse.swt/buildSWT.xml | |
| parent | ddf37d819ff05e07a09111f1aee82664955e5aa8 (diff) | |
| download | eclipse.platform.swt-1fb1522a48d55b59d07f0c37bf5e56bead8298b5.tar.gz eclipse.platform.swt-1fb1522a48d55b59d07f0c37bf5e56bead8298b5.tar.xz eclipse.platform.swt-1fb1522a48d55b59d07f0c37bf5e56bead8298b5.zip | |
361901 - p2 metadata of org.eclipse.swt is incomplete
Ensure installation of fragments of org.eclipse.swt
- Make sure that SWT can be installed with p2: whenever the bundle
org.eclipse.swt is installed, the appropriate native fragment
shall be installed as well. This is achieved by adding
install-time dependencies, filtered by the running platform, from
org.eclipse.swt to all its fragments.
- The install-time dependencies are disabled at build time because
otherwise there would be a circular dependency between the host
and its fragments. This is achieved through the additional
condition "(!(org.eclipse.swt.buildtime=true))" in the filters
which is made evaluate to false by setting
org.eclipse.swt.buildtime=true in the build.
- Modified buildSWT.xml to generate the time-stamp qualifiers and write
the qualifiers in the pom files in source and binaries repos.
Bug: 361901
Change-Id: I37b1f6c0ea5231850319e1fc4098e412e327d7e2
Signed-off-by: Tobias Oberlies <tobias.oberlies@sap.com>
Signed-off-by: Lakshmi Shanmugam <lshanmug@in.ibm.com>
Diffstat (limited to 'bundles/org.eclipse.swt/buildSWT.xml')
| -rw-r--r-- | bundles/org.eclipse.swt/buildSWT.xml | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/bundles/org.eclipse.swt/buildSWT.xml b/bundles/org.eclipse.swt/buildSWT.xml index c69286d5be..79e0185c8a 100644 --- a/bundles/org.eclipse.swt/buildSWT.xml +++ b/bundles/org.eclipse.swt/buildSWT.xml @@ -27,6 +27,8 @@ --> <project name="swtbuild" basedir="."> + <taskdef name="xmltask" classname="com.oopsconsultancy.xmltask.ant.XmlTask"/> + <property name="gitroot" value="silenio@dev.eclipse.org:/gitroot/platform/"/> <property name="TAG" value="master"/> <property name="tmphome" value="../../../tmp"/> @@ -1159,6 +1161,21 @@ <arg line="checkout master"/> </exec> </target> + + <target name="generate_qualifier"> + <tstamp><format property="build.qualifier" pattern="yyyyMMdd-HHmm"/></tstamp> + <echo>${build.qualifier}</echo> + </target> + + <target name="write_qualifier" depends="generate_qualifier" description="writes the generated qualifier in pom.xml in src and binaries repo"> + <xmltask source="${basedir}/${repo.src}/bundles/org.eclipse.swt/pom.xml" dest="${basedir}/${repo.src}/bundles/org.eclipse.swt/pom.xml" failWithoutMatch="true"> + <replace path="/:project/:properties/:forceContextQualifier/text()" withText="v${build.qualifier}"/> + </xmltask> + <xmltask source="${basedir}/${repo.bin}/bundles/binaries-parent/pom.xml" dest="${basedir}/${repo.bin}/bundles/binaries-parent/pom.xml" failWithoutMatch="true"> + <replace path="/:project/:properties/:forceContextQualifier/text()" withText="v${build.qualifier}"/> + </xmltask> + </target> + <!-- Convert SWT 32 bit java and C source to 64 bit --> <target name="replace.32.to.64" depends="init_build"> |