bug 331237 - Build the 4.1 SDK before the e4 0.11
diff --git a/org.eclipse.e4.builder/builder/general/build.properties b/org.eclipse.e4.builder/builder/general/build.properties
index 8fe9323..b67333d 100644
--- a/org.eclipse.e4.builder/builder/general/build.properties
+++ b/org.eclipse.e4.builder/builder/general/build.properties
@@ -157,6 +157,7 @@
# in most RCP app or a plug-in, the baseLocation should be the location of a previously
# installed Eclipse against which the application or plug-in code will be compiled and the RCP delta pack.
targetDir=${buildArea}/targets
+fetchCacheLocation=${buildArea}/scmCache
targetZips=${targetDir}/downloads
#base=/opt/local/eclipse/I1104-0916
#Os/Ws/Arch/nl of the eclipse specified by baseLocation
diff --git a/org.eclipse.e4.builder/builder/general/customAssembly.xml b/org.eclipse.e4.builder/builder/general/customAssembly.xml
new file mode 100644
index 0000000..1fcf492
--- /dev/null
+++ b/org.eclipse.e4.builder/builder/general/customAssembly.xml
@@ -0,0 +1,11 @@
+<project name="CustomAssemble.overrides" default="noDefault">
+
+ <import file="${eclipse.pdebuild.templates}/headless-build/customAssembly.xml" />
+
+ <!-- every time gather.bin.parts is called, we will add the resulting artifact into a separate archive to be sent for signing -->
+ <target name="gather.bin.parts" >
+ <!-- remember this so we can sign & pack only the things we built ourselves -->
+ <echo append="true" file="${buildDirectory}/built.list" message="**/${projectName}.jar${line.separator}" />
+ </target>
+
+</project>
diff --git a/org.eclipse.e4.builder/builder/general/customTargets.xml b/org.eclipse.e4.builder/builder/general/customTargets.xml
index eff7f9b..6d8f879 100644
--- a/org.eclipse.e4.builder/builder/general/customTargets.xml
+++ b/org.eclipse.e4.builder/builder/general/customTargets.xml
@@ -8,6 +8,7 @@
<property name="allElementsFile" location="${eclipse.pdebuild.templates}/headless-build/allElements.xml" />
<loadproperties srcfile="${builder}/update_repo.properties" />
<property name="transformedRepoLocation" value="${targetDir}/${targetDownloadId}" />
+ <property name="repoBaseLocation" value="${targetDir}/${targetDownloadId}-p2" />
<property name="updateSite" value="${targetDir}/updates/0.11-I-builds" />
<property name="repoBaseline" value="${updateSite}" />
@@ -82,20 +83,35 @@
<target name="preSetup">
</target>
+ <target name="initLocations" >
+ <!-- figure out what the most recent eclipse IBuild is -->
+ <get src="${eclipseRepoURL}/compositeContent.jar" dest="${buildDirectory}/temp.jar" />
+ <unzip src="${buildDirectory}/temp.jar" dest="${buildDirectory}/latest" />
+ <delete file="${buildDirectory}/temp.jar" />
+ <replaceregexp byline="false" file="${buildDirectory}/latest/compositeContent.xml"
+ flags="s"
+ match=".*location\s*=\s*'(.+)'.*"
+ replace="eclipseBuildId=\1" />
+ <property file="${buildDirectory}/latest/compositeContent.xml" />
+ <property name="eclipseRepoURL-latest" value="${eclipseRepoURL}/${eclipseBuildId}" />
+ </target>
+
<!-- ===================================================================== -->
<!-- Steps to do after setup but before starting the build proper -->
<!-- ===================================================================== -->
- <target name="postSetup">
+ <target name="postSetup" depends="initLocations">
<antcall target="getBaseComponents" />
- <echo message="Mirror from ${eclipseRepoURL} to ${targetDir}/${targetDownloadId}-p2" />
- <p2.mirror destination="${targetDir}/${targetDownloadId}-p2" ignoreerrors="true">
- <source location="${eclipseRepoURL}" />
+
+ <echo message="Mirror from ${eclipseRepoURL-latest} to ${repoBaseLocation}/eclipseSDK" />
+ <p2.mirror destination="file:${repoBaseLocation}/eclipseSDK" ignoreerrors="true">
+ <source location="${eclipseRepoURL-latest}" />
<slicingOptions includeOptional="false" includeNonGreedy="false" latestVersionOnly="true"/>
<iu id="org.eclipse.sdk.ide" />
- <iu id="org.eclipse.equinox.core.sdk.feature.group" />
+ <!--<iu id="org.eclipse.equinox.core.sdk.feature.group" /> -->
</p2.mirror>
- <echo message="Mirror from ${orbitRepoURL} to ${targetDir}/${targetDownloadId}-p2" />
- <p2.mirror destination="${targetDir}/${targetDownloadId}-p2" ignoreerrors="true">
+
+ <echo message="Mirror from ${orbitRepoURL} to ${repoBaseLocation}/orbit" />
+ <p2.mirror destination="file:${repoBaseLocation}/orbit" ignoreerrors="true">
<source location="${orbitRepoURL}" />
<slicingOptions includeOptional="false" includeNonGreedy="false" />
<iu id="org.apache.commons.beanutils" />
@@ -104,46 +120,80 @@
<iu id="org.junit.source" version="0.0.0" />
<iu id="javax.el" />
</p2.mirror>
- <echo message="Mirror from ${emfRepoURL} to ${targetDir}/${targetDownloadId}-p2" />
- <p2.mirror destination="${targetDir}/${targetDownloadId}-p2" ignoreerrors="true">
+
+ <echo message="Mirror from ${emfRepoURL} to ${repoBaseLocation}/emf" />
+ <p2.mirror destination="file:${repoBaseLocation}/emf" ignoreerrors="true">
<source location="${emfRepoURL}" />
<slicingOptions includeOptional="false" includeNonGreedy="false" latestVersionOnly="true" />
<iu id="org.eclipse.emf.sdk.feature.group" />
<iu id="org.eclipse.xsd.edit.feature.group" />
</p2.mirror>
- <echo message="Mirror from ${gefRepoURL} to ${targetDir}/${targetDownloadId}-p2" />
- <p2.mirror destination="${targetDir}/${targetDownloadId}-p2" ignoreerrors="true">
+
+ <echo message="Mirror from ${gefRepoURL} to ${repoBaseLocation}/gef" />
+ <p2.mirror destination="file:${repoBaseLocation}/gef" ignoreerrors="true">
<source location="${gefRepoURL}" />
<slicingOptions includeOptional="false" includeNonGreedy="false" />
<iu id="org.eclipse.gef.feature.group" />
</p2.mirror>
- <echo message="Mirror from ${wtpRepoURL} to ${targetDir}/${targetDownloadId}-p2" />
- <p2.mirror destination="${targetDir}/${targetDownloadId}-p2" ignoreerrors="true">
+
+ <echo message="Mirror from ${wtpRepoURL} to ${repoBaseLocation}/wtp" />
+ <p2.mirror destination="file:${repoBaseLocation}/wtp" ignoreerrors="true">
<source location="${wtpRepoURL}" />
<slicingOptions includeOptional="false" includeNonGreedy="false" />
<iu id="org.eclipse.wst.xml_ui.feature.feature.group" />
<iu id="org.eclipse.wst.web_core.feature.feature.group" />
</p2.mirror>
- <p2.remove.iu>
+
+ <!--<p2.remove.iu>
<repository location="file:${targetDir}/${targetDownloadId}-p2" />
<iu id="org.eclipse.rap.jface" />
<iu id="org.eclipse.rap.rwt" />
<iu id="org.eclipse.rap.ui.forms" />
- </p2.remove.iu>
-
+ </p2.remove.iu>-->
+
<p2.repo2runnable destination="${transformedRepoLocation}" failOnError="false">
- <source>
- <repository location="file:${targetDir}/${targetDownloadId}-p2" />
- </source>
+ <source dir="${repoBaseLocation}" includes="*" excludes="${repoBaseLocation.excludes}"/>
</p2.repo2runnable>
- </target>
+ </target>
<!-- ===================================================================== -->
<!-- Steps to do before fetching the build elements -->
<!-- ===================================================================== -->
<target name="preFetch">
- </target>
+ <echo message="Filtering map files..." />
+ <!-- run against base repo instead of the transformed repo, so we don't worry about checking directories -->
+ <fileset dir="${repoBaseLocation}/eclipseSDK/plugins" includes="*" id="filter.plugins" />
+ <property name="mapFile" value="${buildDirectory}/directory.txt" />
+ <script language="javascript"> <![CDATA[
+ importClass(java.io.FileInputStream);
+ importClass(java.io.FileOutputStream);
+ importClass(java.util.Properties);
+ importClass(java.lang.System);
+
+ var mapFile = project.getProperty("mapFile");
+
+ var map = new Properties();
+ map.load(new FileInputStream(mapFile));
+
+ var fs = project.getReference("filter.plugins");
+ var files = fs.getDirectoryScanner(project).getIncludedFiles();
+ for(i = 0; i < files.length; i++) { //14
+ var name = files[i].match(/([^_]*((_64)|(_32))?[^_]*)_.*/)[1];
+ if (map.containsKey("plugin@" + name)) {
+ System.out.println("Removed plugin@" + name);
+ map.remove("plugin@" + name);
+ } else if (map.containsKey("fragment@" + name)) {
+ System.out.println("Removed fragment@" + name);
+ map.remove("fragment@" + name);
+ }
+ }
+
+ var out = new FileOutputStream(mapFile);
+ map.store(out, "Filtered");
+ out.close();
+ ]]></script>
+ </target>
<!-- ===================================================================== -->
<!-- Steps to do after fetching the build elements -->
<!-- ===================================================================== -->
@@ -217,25 +267,17 @@
<move file="${p2.repo}/out_content.xml" tofile="${p2.repo}/content.xml" />
<!--sign the build -->
- <ant antfile="${builder}/sign.xml" dir="${basedir}" target="createSigningArchive" />
- <ant antfile="${builder}/sign.xml" dir="${basedir}" target="updatePackProperties" />
+ <ant antfile="${builder}/sign.xml" dir="${basedir}" target="createSigningArchive" >
+ <property name="includesFile" value="${buildDirectory}/built.list" />
+ </ant>
<ant antfile="${builder}/sign.xml" dir="${basedir}" target="signMasterFeature" />
<!--unzip signed build into repository for mirroring and packaging-->
- <property name="p2.repo.unsigned" value="${p2.repo}.unsigned" />
- <mkdir dir="${p2.repo.unsigned}" />
- <move todir="${p2.repo.unsigned}">
- <fileset dir="${p2.repo}" />
- </move>
<unzip dest="${p2.repo}" src="${buildDirectory}/${buildLabel}/eclipse-master-${buildId}.zip" />
<!--pack master feature and update repository with new checksums for signed bundles -->
- <p2.process.artifacts repositoryPath="file://${p2.repo}" pack="true" />
- <delete>
- <fileset dir="${p2.repo}">
- <include name="pack.properties" />
- </fileset>
- </delete>
+ <p2.process.artifacts repositoryPath="file://${p2.repo}" />
+ <delete file="${p2.repo}/pack.properties" />
<filter token="BUILD_ID" value="${buildLabel}" />
<copy filtering="true" file="${builder}/templates/artifacts.xml" tofile="${buildDirectory}/formatRepo/artifacts.xml" />
@@ -275,15 +317,7 @@
<property name="p2.output.base" value="${p2.root}/equinox.p2.build" />
<mkdir dir="${p2.output.base}" />
<property name="directorlog" value="${buildlogs}/director.txt" />
-
- <property name="p2.sdk.install.linux.gtk.x86_64" value="${p2.output.base}/sdk.install.linux.gtk.x86_64" />
- <mkdir dir="${p2.sdk.install.linux.gtk.x86_64}" />
-
-
- <antcall target="e4.product" />
- <antcall target="provision.e4" />
- <antcall target="zip.install" />
-
+
<delete file="${buildDirectory}/version.properties" />
<antcall target="run.version.query">
<param name="list.repo" value="file:${p2.sdk.install.linux.gtk.x86_64}/eclipse/p2/org.eclipse.equinox.p2.engine/profileRegistry/SDKProfile.profile" />
@@ -320,6 +354,8 @@
<filter token="wtpBuildId" value="${wtpBuildId}" />
<copy filtering="true" file="${builder}/../../templates/build.index.html" tofile="${buildDirectory}/${buildLabel}/index.html" />
<copy filtering="true" file="${builder}/tests/build.label.properties" tofile="${buildDirectory}/label.properties" />
+
+ <echo message="e4.targetDir=${repoBaseLocation}" file="${buildDirectory}/label.properties" append="true" />
</target>
<!-- ===================================================================== -->
@@ -341,46 +377,6 @@
<echo message="You must specify a target when invoking this file" />
</target>
- <target name="initLauncher" unless="base.builder.launcher">
- <path id="launcher.path">
- <last count="1"><sort>
- <fileset dir="${eclipse.home}" includes="**/org.eclipse.equinox.launcher_*.jar" />
- </sort></last>
- </path>
- <property name="base.builder.launcher" refid="launcher.path" />
- </target>
- <target name="run.director" depends="initLauncher">
- <exec executable="${java15-home}/bin/java" failonerror="false" dir="${base.builder}" timeout="900000" output="${directorlog}" resultproperty="directorcode">
- <arg line="-jar ${base.builder.launcher}" />
- <arg line="-application org.eclipse.equinox.p2.director" />
- <arg line="-nosplash" />
- <arg line="-consoleLog" />
- <arg line="-flavor ${p2.flavor}" />
- <arg line="-installIU ${p2.director.installIU}" />
- <arg line="-p2.os ${p2.os}" />
- <arg line="-p2.ws ${p2.ws}" />
- <arg line="-p2.arch ${p2.arch}" />
- <arg line="-roaming" />
- <arg line="-profile ${p2.director.profile}" />
- <arg line="${p2.director.extraArgs}" />
- <arg line="-repository file:${transformedRepoLocation},file:${p2.repo}" />
- <arg line="-destination ${p2.director.install.path}" />
- <arg line="-bundlepool ${p2.director.install.path}" />
- </exec>
- <echo message="director ${p2.director.install.path}" file="${directorlog}" append="true" />
- <echo message="${directorcode}" file="${directorlog}" append="true" />
-
- <!-- ant antfile="${genericTargets}" target="runDirector" inheritAll="true">
- <property name="equinoxLauncherJar" value="${base.builder.launcher}"/>
- <property name="p2.repo" value="${p2.build.repo},file:${transformedRepoLocation}"/>
- <property name="p2.director.iu" value="${p2.director.installIU}"/>
- <property name="p2.director.installPath" value="${p2.director.install.path}"/>
- <property name="os" value="${p2.os}" />
- <property name="ws" value="${p2.ws}" />
- <property name="arch" value="${p2.arch}" />
- </ant -->
- </target>
-
<target name="run.version.query">
<delete dir="${base.builder}/configuration/.settings" includeemptydirs="true" failonerror="false" />
<exec executable="${java15-home}/bin/java" failonerror="false" dir="${base.builder}" timeout="900000" output="${buildDirectory}/version.properties" error="/dev/null">
@@ -392,139 +388,5 @@
</exec>
</target>
- <target name="e4.product">
- <replace token="@qualifier@" file="${buildDirectory}/plugins/org.eclipse.e4.ui.examples.legacy.workbench/legacy-eclipse.product" value="${buildLabel}" />
- <p2.publish.product flavor="tooling" repository="file:${p2.repo}" productFile="${buildDirectory}/plugins/org.eclipse.e4.ui.examples.legacy.workbench/legacy-eclipse.product" compress="true">
- <config os="win32" ws="win32" arch="x86" />
- <config os="win32" ws="win32" arch="x86_64" />
- <config os="linux" ws="gtk" arch="x86" />
- <config os="linux" ws="gtk" arch="x86_64" />
- <config os="linux" ws="gtk" arch="ppc" />
- <config os="macosx" ws="cocoa" arch="x86" />
- <config os="macosx" ws="cocoa" arch="x86_64" />
- <advice kind="featureVersions" file="${buildDirectory}/finalFeaturesVersions.properties" />
- <advice kind="pluginVersions" file="${buildDirectory}/finalPluginsVersions.properties" />
- <contextrepository location="file:${transformedRepoLocation}" artifact="true" metadata="true" />
- </p2.publish.product>
-
- </target>
-
- <target name="provision.e4">
- <!--
- <antcall target="run.director">
- <param name="p2.director.installIU" value="org.eclipse.e4.workbench.sdk" />
- <param name="p2.director.profile" value="SDKProfile" />
- <param name="p2.director.install.path" value="${p2.sdk.install.win32.win32.x86}/eclipse" />
- <param name="p2.director.extraArgs" value="-profileProperties org.eclipse.update.install.features=true" />
- <param name="p2.os" value="win32" />
- <param name="p2.ws" value="win32" />
- <param name="p2.arch" value="x86" />
- </antcall>
-
- <antcall target="run.director">
- <param name="p2.director.installIU" value="org.eclipse.e4.workbench.sdk" />
- <param name="p2.director.profile" value="SDKProfile" />
- <param name="p2.director.install.path" value="${p2.sdk.install.win32.win32.x86_64}/eclipse" />
- <param name="p2.director.extraArgs" value="-profileProperties org.eclipse.update.install.features=true" />
- <param name="p2.os" value="win32" />
- <param name="p2.ws" value="win32" />
- <param name="p2.arch" value="x86_64" />
- </antcall>
-
- <antcall target="run.director">
- <param name="p2.director.installIU" value="org.eclipse.e4.workbench.sdk" />
- <param name="p2.director.profile" value="SDKProfile" />
- <param name="p2.director.install.path" value="${p2.sdk.install.linux.gtk.x86}/eclipse" />
- <param name="p2.director.extraArgs" value="-profileProperties org.eclipse.update.install.features=true" />
- <param name="p2.os" value="linux" />
- <param name="p2.ws" value="gtk" />
- <param name="p2.arch" value="x86" />
- </antcall>
- -->
-
-
- <antcall target="run.director">
- <param name="p2.director.installIU" value="org.eclipse.e4.workbench.sdk" />
- <param name="p2.director.profile" value="SDKProfile" />
- <param name="p2.director.install.path" value="${p2.sdk.install.linux.gtk.x86_64}/eclipse" />
- <param name="p2.director.extraArgs" value="-profileProperties org.eclipse.update.install.features=true" />
- <param name="p2.os" value="linux" />
- <param name="p2.ws" value="gtk" />
- <param name="p2.arch" value="x86_64" />
- </antcall>
-
- <!--
- <antcall target="run.director">
- <param name="p2.director.installIU" value="org.eclipse.e4.workbench.sdk" />
- <param name="p2.director.profile" value="SDKProfile" />
- <param name="p2.director.install.path" value="${p2.sdk.install.linux.gtk.ppc}/eclipse" />
- <param name="p2.director.extraArgs" value="-profileProperties org.eclipse.update.install.features=true" />
- <param name="p2.os" value="linux" />
- <param name="p2.ws" value="gtk" />
- <param name="p2.arch" value="ppc" />
- </antcall>
-
- <antcall target="run.director">
- <param name="p2.director.installIU" value="org.eclipse.e4.workbench.sdk" />
- <param name="p2.director.profile" value="SDKProfile" />
- <param name="p2.director.install.path" value="${p2.sdk.install.macosx.cocoa.x86}/eclipse" />
- <param name="p2.director.extraArgs" value="-profileProperties org.eclipse.update.install.features=true" />
- <param name="p2.os" value="macosx" />
- <param name="p2.ws" value="cocoa" />
- <param name="p2.arch" value="x86" />
- </antcall>
-
- <antcall target="run.director">
- <param name="p2.director.installIU" value="org.eclipse.e4.workbench.sdk" />
- <param name="p2.director.profile" value="SDKProfile" />
- <param name="p2.director.install.path" value="${p2.sdk.install.macosx.cocoa.x86_64}/eclipse" />
- <param name="p2.director.extraArgs" value="-profileProperties org.eclipse.update.install.features=true" />
- <param name="p2.os" value="macosx" />
- <param name="p2.ws" value="cocoa" />
- <param name="p2.arch" value="x86_64" />
- </antcall>
- -->
- </target>
-
-
- <target name="zip.install">
-
- <property name="output.dir" value="${buildDirectory}/${buildLabel}" />
- <mkdir dir="${output.dir}" />
-
-
- <parallel failonany="true" threadCount='4'>
- <sequential>
- <!-- linux gtk x86_64 -->
- <antcall target="p2.tar">
- <param name="tar.base.dir" value="${p2.sdk.install.linux.gtk.x86_64}" />
- <param name="tar.base.filename" value="${buildDirectory}/${buildLabel}/eclipse-e4-SDK-incubation-${buildLabel}-linux-gtk-x86_64.tar" />
- </antcall>
- <!--antcall target="generateChecksums">
- <param name="archiveName" value="eclipse-e4-SDK-incubation-${buildLabel}-linux-gtk-ppc.tar.gz" />
- </antcall-->
-
- </sequential>
-
- </parallel>
- </target>
-
- <target name="p2.tar">
- <echo message="Building tar ${tar.base.filename} from ${tar.base.dir}/*" />
- <exec dir="${tar.base.dir}" executable="sh">
- <arg line='-c "tar -cvf ${tar.base.filename} *"' />
- </exec>
- <gzip zipfile="${tar.base.filename}.gz" src="${tar.base.filename}" />
- <delete file="${tar.base.filename}" />
- </target>
-
- <target name="find.a.file">
- <fileset id="base.launcher.file" dir="${base.builder}">
- <filename name="plugins/org.eclipse.equinox.launcher_*.jar" />
- </fileset>
- <property name="base.launcher" refid="base.launcher.file" />
- <echo>${base.launcher}</echo>
- </target>
-
</project>
diff --git a/org.eclipse.e4.builder/builder/general/sign.xml b/org.eclipse.e4.builder/builder/general/sign.xml
index 08f1ae3..fc77c8f 100644
--- a/org.eclipse.e4.builder/builder/general/sign.xml
+++ b/org.eclipse.e4.builder/builder/general/sign.xml
@@ -4,6 +4,14 @@
<property name="signingArchive" value="${buildDirectory}/${buildLabel}/${archiveName}" />
<target name="createSigningArchive" >
+ <antcall target="_createSigningArchiveIncludes" />
+ <antcall target="_createSigningArchiveNoIncludes" />
+ </target>
+
+ <target name="_createSigningArchiveIncludes" if="includesFile" >
+ <zip zipfile="${signingArchive}" basedir="${p2.repo}" includesFile="${includesFile}" />
+ </target>
+ <target name="_createSigningArchiveNoIncludes" unless="includesFile" >
<zip zipfile="${signingArchive}" basedir="${p2.repo}" />
</target>
diff --git a/org.eclipse.e4.builder/builder/general/tests/runtests b/org.eclipse.e4.builder/builder/general/tests/runtests
index 66abb60..91908b1 100755
--- a/org.eclipse.e4.builder/builder/general/tests/runtests
+++ b/org.eclipse.e4.builder/builder/general/tests/runtests
@@ -70,7 +70,7 @@
then
if [ ! -r eclipse ]
then
- tar -xzf eclipse-e4-SDK-*.tar.gz
+ tar -xzf eclipse-*.tar.gz
fi
# run tests
diff --git a/org.eclipse.e4.builder/builder/general/tests/test.xml b/org.eclipse.e4.builder/builder/general/tests/test.xml
index 6fab25c..acfef2b 100644
--- a/org.eclipse.e4.builder/builder/general/tests/test.xml
+++ b/org.eclipse.e4.builder/builder/general/tests/test.xml
@@ -1,9 +1,12 @@
<project name="Automated Eclipse Testing" default="all" basedir=".">
+
<!--properties file containing the build information-->
<property file="label.properties" />
+ <property name="runtimeArchivePrefix" value="eclipse-SDK" />
+
<!--default directory where test-eclipse will be installed-->
<property name="install" value="${basedir}/test-eclipse" />
@@ -13,9 +16,7 @@
<!-- The root of the eclipse installation -->
<property name="eclipse-home" value="${install}/eclipse" />
- <property name="repoLocation" value="${basedir}/../../${e4.buildLabel}/repository"/>
-
- <property name="testRepo" value="${basedir}/testRepo"/>
+ <property name="repoLocation" value="${basedir}/testComposite"/>
<!-- The directory that will contain all files containing information on the tests that ran.-->
<property name="results" value="${basedir}/results" />
@@ -28,6 +29,7 @@
<property name="org.eclipse.test" value="org.eclipse.test_3.3.0" />
<target name="setup" unless="noclean" depends="init">
+ <echo message="Runtime Archive is ${runtimeArchive}" />
<condition property="setupTarget" value="setup-zip">
<contains string="${runtimeArchive}" substring=".zip" />
</condition>
@@ -95,6 +97,15 @@
<mkdir dir="${results}/html" />
<mkdir dir="${junit-report-output}" />
+ <mkdir dir="${repoLocation}"/>
+ <p2.composite.repository destination="file:${repoLocation}" >
+ <add location="file:${sdkResults}/repository" />
+ <add location="file:${e4Results}/repository" />
+ <add location="file:${e4.targetDir}/emf" />
+ <add location="file:${e4.targetDir}/gef" />
+ <add location="file:${e4.targetDir}/wtp" />
+ </p2.composite.repository>
+
<!--Unlock files on the Mac before starting tests.
Required to delete some workspace directories (org.eclipse.core.filebuffers.tests and Team CVS tests).-->
<exec dir="${basedir}" executable="chflags" os="Mac OS X">
@@ -103,132 +114,8 @@
</target>
<target name="setRuntimeArchive">
- <condition property="runtimeArchive" value="eclipse-e4-SDK-incubation-${buildId}-win32.zip">
- <and>
- <equals arg1="${os}" arg2="win32" />
- <equals arg1="${ws}" arg2="win32" />
- <equals arg1="${arch}" arg2="x86" />
- </and>
- </condition>
- <condition property="runtimeArchive" value="eclipse-e4-SDK-incubation-${buildId}-win32-wpf.zip">
- <and>
- <equals arg1="${os}" arg2="win32" />
- <equals arg1="${ws}" arg2="wpf" />
- <equals arg1="${arch}" arg2="x86" />
- </and>
- </condition>
- <condition property="runtimeArchive" value="eclipse-e4-SDK-incubation-${buildId}-win32-win32-x86_64.zip">
- <and>
- <equals arg1="${os}" arg2="win32" />
- <equals arg1="${ws}" arg2="win32" />
- <equals arg1="${arch}" arg2="x86_64" />
- </and>
- </condition>
- <condition property="runtimeArchive" value="eclipse-e4-SDK-incubation-${e4.buildLabel}-linux-gtk.tar.gz">
- <and>
- <equals arg1="${os}" arg2="linux" />
- <equals arg1="${ws}" arg2="gtk" />
- <equals arg1="${arch}" arg2="x86" />
- </and>
- </condition>
- <condition property="runtimeArchive" value="eclipse-e4-SDK-incubation-${e4.buildLabel}-linux-gtk-x86_64.tar.gz">
- <and>
- <equals arg1="${os}" arg2="linux" />
- <equals arg1="${ws}" arg2="gtk" />
- <equals arg1="${arch}" arg2="x86_64" />
- </and>
- </condition>
- <condition property="runtimeArchive" value="eclipse-e4-SDK-incubation-${e4.buildLabel}-linux-motif.tar.gz">
- <and>
- <equals arg1="${os}" arg2="linux" />
- <equals arg1="${ws}" arg2="motif" />
- <equals arg1="${arch}" arg2="x86" />
- </and>
- </condition>
- <condition property="runtimeArchive" value="eclipse-e4-SDK-incubation-${e4.buildLabel}-linux-gtk-ppc.tar.gz">
- <and>
- <equals arg1="${os}" arg2="linux" />
- <equals arg1="${ws}" arg2="gtk" />
- <equals arg1="${arch}" arg2="ppc" />
- </and>
- </condition>
- <condition property="runtimeArchive" value="eclipse-e4-SDK-incubation-${e4.buildLabel}-linux-gtk-x86_64.tar.gz">
- <and>
- <equals arg1="${os}" arg2="linux" />
- <equals arg1="${ws}" arg2="gtk" />
- <equals arg1="${arch}" arg2="ppc" />
- </and>
- </condition>
- <condition property="runtimeArchive" value="eclipse-e4-SDK-incubation-${e4.buildLabel}-macosx-carbon.tar.gz">
- <and>
- <equals arg1="${os}" arg2="macosx" />
- <equals arg1="${ws}" arg2="carbon" />
- <equals arg1="${arch}" arg2="ppc" />
- </and>
- </condition>
- <condition property="runtimeArchive" value="eclipse-e4-SDK-incubation-${e4.buildLabel}-macosx-carbon.tar.gz">
- <and>
- <equals arg1="${os}" arg2="macosx" />
- <equals arg1="${ws}" arg2="carbon" />
- <equals arg1="${arch}" arg2="x86" />
- </and>
- </condition>
- <condition property="runtimeArchive" value="eclipse-e4-SDK-incubation-${e4.buildLabel}-macosx-cocoa-ppc.tar.gz">
- <and>
- <equals arg1="${os}" arg2="macosx" />
- <equals arg1="${ws}" arg2="cocoa" />
- <equals arg1="${arch}" arg2="ppc" />
- </and>
- </condition>
- <condition property="runtimeArchive" value="eclipse-e4-SDK-incubation-${e4.buildLabel}-macosx-cocoa.tar.gz">
- <and>
- <equals arg1="${os}" arg2="macosx" />
- <equals arg1="${ws}" arg2="cocoa" />
- <equals arg1="${arch}" arg2="x86" />
- </and>
- </condition>
- <condition property="runtimeArchive" value="eclipse-e4-SDK-incubation-${e4.buildLabel}-macosx-cocoa-x86_64.tar.gz">
- <and>
- <equals arg1="${os}" arg2="macosx" />
- <equals arg1="${ws}" arg2="cocoa" />
- <equals arg1="${arch}" arg2="x86_64" />
- </and>
- </condition>
- <condition property="runtimeArchive" value="eclipse-e4-SDK-incubation-${e4.buildLabel}-hpux-motif.zip">
- <and>
- <equals arg1="${os}" arg2="hpux" />
- <equals arg1="${ws}" arg2="motif" />
- <equals arg1="${arch}" arg2="PA_RISC" />
- </and>
- </condition>
- <condition property="runtimeArchive" value="eclipse-e4-SDK-incubation-${e4.buildLabel}-hpux-motif.zip">
- <and>
- <equals arg1="${os}" arg2="hpux" />
- <equals arg1="${ws}" arg2="motif" />
- <equals arg1="${arch}" arg2="ia64_32" />
- </and>
- </condition>
- <condition property="runtimeArchive" value="eclipse-e4-SDK-incubation-${e4.buildLabel}-solaris-motif.zip">
- <and>
- <equals arg1="${os}" arg2="solaris" />
- <equals arg1="${ws}" arg2="motif" />
- <equals arg1="${arch}" arg2="sparc" />
- </and>
- </condition>
- <condition property="runtimeArchive" value="eclipse-e4-SDK-incubation-${e4.buildLabel}-solaris-gtk.zip">
- <and>
- <equals arg1="${os}" arg2="solaris" />
- <equals arg1="${ws}" arg2="gtk" />
- <equals arg1="${arch}" arg2="sparc" />
- </and>
- </condition>
- <condition property="runtimeArchive" value="eclipse-e4-SDK-incubation-${e4.buildLabel}-aix-motif.zip">
- <and>
- <equals arg1="${os}" arg2="aix" />
- <equals arg1="${ws}" arg2="motif" />
- <equals arg1="${arch}" arg2="ppc" />
- </and>
- </condition>
+ <fileset id="archive.id" dir="${basedir}" includes="${runtimeArchivePrefix}*" />
+ <property name="runtimeArchive" refid="archive.id" />
</target>
<target name="setJVMProperties" depends="setJVMfromUserSpecified">
diff --git a/org.eclipse.e4.builder/builder/general/update_repo.properties b/org.eclipse.e4.builder/builder/general/update_repo.properties
index 61f8649..c3aa029 100644
--- a/org.eclipse.e4.builder/builder/general/update_repo.properties
+++ b/org.eclipse.e4.builder/builder/general/update_repo.properties
@@ -2,7 +2,7 @@
# this file spells out what needs to be loaded into the runnable repo
# used to compile this build
#
-targetDownloadId=v20110113
+targetDownloadId=v20110118
# most of these are obsolete now, that I build from
# a mirror of the Helios repo - nothing over four feet
@@ -17,7 +17,8 @@
# these should change less frequently ... but not never, thank you very much
eclipseBuildURL=http://download.eclipse.org/eclipse/downloads/drops/
-eclipseRepoURL=http://download.eclipse.org/eclipse/updates/3.7-I-builds
+eclipseRepoURL=http://download.eclipse.org/eclipse/updates/4.1-I-builds
+
#emfBuildURL=http://download.eclipse.org/modeling/emf/emf/downloads/drops/2.7.0/${emfBuildId}
#emfRepoURL=http://download.eclipse.org/modeling/emf/emf/updates/2.7-I-builds
emfRepoURL=http://download.eclipse.org/modeling/emf/emf/updates/2.7milestones
diff --git a/org.eclipse.e4.builder/scripts/bootstrap.sh b/org.eclipse.e4.builder/scripts/bootstrap.sh
index e09d896..24c6384 100644
--- a/org.eclipse.e4.builder/scripts/bootstrap.sh
+++ b/org.eclipse.e4.builder/scripts/bootstrap.sh
@@ -8,7 +8,7 @@
cvs -d :pserver:anonymous@dev.eclipse.org:/cvsroot/eclipse update \
-d org.eclipse.e4.builder_HEAD
cvs -d :pserver:anonymous@dev.eclipse.org:/cvsroot/eclipse update \
- -d org.eclipse.e4.sdk
+ -d org.eclipse.e4.sdk_HEAD
cvs -d :pserver:anonymous@dev.eclipse.org:/cvsroot/eclipse update \
-d org.eclipse.releng.eclipsebuilder
diff --git a/org.eclipse.e4.builder/scripts/masterBuild.sh b/org.eclipse.e4.builder/scripts/masterBuild.sh
index 0016e39..e251279 100755
--- a/org.eclipse.e4.builder/scripts/masterBuild.sh
+++ b/org.eclipse.e4.builder/scripts/masterBuild.sh
@@ -64,6 +64,7 @@
buildDirectory=$buildDir/I$buildTimestamp
testDir=$buildDirectory/tests
buildResults=$buildDirectory/I$buildTimestamp
+ sdkResults=$buildDir/40Build/I$buildTimestamp/I$buildTimestamp
relengBaseBuilderDir=$supportDir/org.eclipse.releng.basebuilder
buildDirEclipse="$buildDir/eclipse"
WORKSPACE="$buildDir/workspace"
@@ -154,28 +155,8 @@
}
-run40Build () {
-cd $WORKSPACE
-chmod -R 755 $WORKSPACE/org.eclipse.releng.eclipsebuilder/runIBuilde4
-chmod -R 755 $WORKSPACE/org.eclipse.releng.eclipsebuilder/*.sh
-
-echo WORKSPACE $WORKSPACE
-
-export WORKSPACE="${WORKSPACE}"
-#$WORKSPACE/org.eclipse.releng.eclipsebuilder/runIBuilde4
-mkdir -p $WORKSPACE/builds
-cd $WORKSPACE/builds
-mkdir -p $WORKSPACE/builds/I
-#mkdir -p $WORKSPACE/builds/transfer/files/testUpdates-I
-updateDir=$targetDir/updates/4.1-I-builds
-rm -f $updateDir/build_done.txt
-$WORKSPACE/org.eclipse.releng.eclipsebuilder/bootstrapHudsone4.sh -test -skipTest -buildDirectory $WORKSPACE/builds/I -sign -updateSite $updateDir I
-/bin/bash ${builderDir}/scripts/sync.sh
-/bin/bash ${builderDir}/scripts/publishLong.sh
-}
-
runSDKBuild () {
-cd $supportDir
+ cd $supportDir
cmd="cvs -d :pserver:anonymous@dev.eclipse.org:/cvsroot/eclipse $quietCVS update -C -d org.eclipse.releng.eclipsebuilder "
echo $cmd
@@ -187,20 +168,19 @@
-cp $cpAndMain \
-application org.eclipse.ant.core.antRunner \
-buildfile $buildfile \
- -Dbuilder=$supportDir/org.eclipse.e4.sdk/builder \
- -Dorg.eclipse.e4.builder=$supportDir/org.eclipse.e4.builder \
- -Declipse.build.configs=$supportDir/org.eclipse.releng.eclipsebuilder/eclipse/buildConfigs \
- -DbuildType=I \
- -Dbuilddate=$( date +%Y%m%d ) \
- -Dbuildtime=$( date +%H%M ) \
- -Dbase=$buildDir/40builds \
- -DupdateSite=$targetDir/updates/4.1-I-builds
-"
+ -Dbuilder=$supportDir/org.eclipse.e4.sdk/builder \
+ -Dorg.eclipse.e4.builder=$supportDir/org.eclipse.e4.builder \
+ -Declipse.build.configs=$supportDir/org.eclipse.releng.eclipsebuilder/eclipse/buildConfigs \
+ -DbuildType=I \
+ -Dbuilddate=$builddate \
+ -Dbuildtime=$buildtime \
+ -Dbase=$buildDir/40builds \
+ -DupdateSite=$targetDir/updates/4.1-I-builds
+ "
echo $cmd
$cmd
-/bin/bash ${builderDir}/scripts/sync.sh
-/bin/bash ${builderDir}/scripts/publish.sh
-
+ /bin/bash ${builderDir}/scripts/sync.sh
+ /bin/bash ${builderDir}/scripts/publish.sh
}
@@ -269,12 +249,16 @@
cd $testDir/eclipse-testing
- cp $buildResults/eclipse-e4-SDK-incubation-I${buildTimestamp}-linux-gtk${archProp}.tar.gz .
+ echo "Copying eclipse SDK archive to tests."
+ cp $sdkResults/eclipse-SDK-*-linux-gtk${archProp}.tar.gz .
cat $buildDirectory/test.properties >> test.properties
cat $buildDirectory/label.properties >> label.properties
+ echo "sdkResults=$sdkResults" >> label.properties
+ echo "e4Results=$buildResults" >> label.properties
+ echo "Copying test framework."
cp -r ${builderDir}/builder/general/tests/* .
./runtests -os linux -ws gtk \
@@ -380,6 +364,8 @@
echo "[start] [`date +%H\:%M\:%S`] setting eclipse $eclipseIBuild"
+runSDKBuild
+
buildMasterFeature
# copy some other logs
@@ -405,8 +391,5 @@
sleep 60
wget -O index.txt http://download.eclipse.org/e4/downloads/createIndex.php
scp index.txt "$publishIndex"/index.html
- #update40Workspace
- #run40Build
- runSDKBuild
fi
diff --git a/org.eclipse.e4.sdk/builder/build.properties b/org.eclipse.e4.sdk/builder/build.properties
index 1d4ec1a..ca84b66 100644
--- a/org.eclipse.e4.sdk/builder/build.properties
+++ b/org.eclipse.e4.sdk/builder/build.properties
@@ -154,11 +154,12 @@
repoTargetId=${buildLabel}
targetDir=${base}/targets
+fetchCacheLocation=${base}/scmCache
pluginPath=${localRepoLocation}
p2.context.repos=file:${localRepoLocation}
-eclipseRepoURL = http://download.eclipse.org/eclipse/updates/3.7-I-builds/I20110111-0800
-e4RepoURL = http://download.eclipse.org/e4/updates/0.11-I-builds
+eclipseRepoURL = http://download.eclipse.org/eclipse/updates/3.7-I-builds/I20110118-0800
+#e4RepoURL = http://download.eclipse.org/e4/updates/0.11-I-builds
indigoRepoURL = http://download.eclipse.org/releases/indigo
localRepoLocation=${targetDir}/helios-repo-${repoTargetId}
transformedRepoLocation=${buildDirectory}/transformedRepos
@@ -188,7 +189,8 @@
# If you want to fetch the map file from repository / location, change the getMapFiles target in the customTargets.xml
mapsRepo=:pserver:anonymous@dev.eclipse.org/cvsroot/eclipse
-mapsRoot=e4/releng/org.eclipse.e4.sdk/maps
+mapsRoot_sdk=e4/releng/org.eclipse.e4.sdk/maps
+mapsRoot_e4=e4/releng/org.eclipse.e4.ui.releng/maps
mapsCheckoutTag=HEAD
#tagMaps=true
diff --git a/org.eclipse.e4.sdk/builder/customAssembly.xml b/org.eclipse.e4.sdk/builder/customAssembly.xml
index 89aa413..1fcf492 100644
--- a/org.eclipse.e4.sdk/builder/customAssembly.xml
+++ b/org.eclipse.e4.sdk/builder/customAssembly.xml
@@ -4,9 +4,8 @@
<!-- every time gather.bin.parts is called, we will add the resulting artifact into a separate archive to be sent for signing -->
<target name="gather.bin.parts" >
- <zip basedir="${p2.repo}" destfile="${signingArchive}" includes="**/${projectName}.jar" update="true" duplicate="preserve" />
- <!-- remember this file pattern so that later we can pack only these things we signed -->
- <echo append="true" file="${buildDirectory}/pack.list" message="**/${projectName}.jar${line.separator}" />
+ <!-- remember this so we can sign & pack only the things we built ourselves -->
+ <echo append="true" file="${buildDirectory}/built.list" message="**/${projectName}.jar${line.separator}" />
</target>
</project>
diff --git a/org.eclipse.e4.sdk/builder/customTargets.xml b/org.eclipse.e4.sdk/builder/customTargets.xml
index f59496b..805e171 100644
--- a/org.eclipse.e4.sdk/builder/customTargets.xml
+++ b/org.eclipse.e4.sdk/builder/customTargets.xml
@@ -19,7 +19,8 @@
<!-- ===================================================================== -->
<target name="getMapFiles" depends="checkLocalMaps" unless="skipMaps">
<property name="mapsCheckoutTag" value="HEAD" />
- <cvs cvsRoot="${mapsRepo}" package="${mapsRoot}" dest="${buildDirectory}/maps" tag="${mapsCheckoutTag}" />
+ <cvs cvsRoot="${mapsRepo}" package="${mapsRoot_sdk}" dest="${buildDirectory}/maps" tag="R4_1_SDK_LONGBUILD" />
+ <cvs cvsRoot="${mapsRepo}" package="${mapsRoot_e4}" dest="${buildDirectory}/maps" tag="${mapsCheckoutTag}" />
<replace dir="${buildDirectory}/maps/" value="${eclipseRepoURL}" token="ECLIPSE_PLATFORM_REPO" />
</target>
@@ -28,7 +29,8 @@
</target>
<target name="tagMapFiles" if="tagMaps">
- <cvs dest="${buildDirectory}/maps/${mapsRoot}" command="tag ${mapsTagTag}" />
+ <cvs dest="${buildDirectory}/maps/${mapsRoot_sdk}" command="tag ${mapsTagTag}" />
+ <cvs dest="${buildDirectory}/maps/${mapsRoot_e4}" command="tag ${mapsTagTag}" />
</target>
<!-- ===================================================================== -->
@@ -75,34 +77,12 @@
<iu id="org.junit" version="0.0.0" />
<iu id="org.junit.source" version="0.0.0" />
</p2.mirror>
- <echo message="Mirror from ${e4RepoURL} to ${localRepoLocation}" />
- <p2.mirror destination="file:${localRepoLocation}" ignoreerrors="true">
- <source location="${e4RepoURL}" />
- <slicingOptions includeOptional="false" includeNonGreedy="false" latestVersionOnly="true"/>
- <iu id="org.eclipse.e4.ui.source.feature.feature.group" />
- <iu id="org.eclipse.e4.ui.css.source.feature.feature.group" />
- </p2.mirror>
<echo message="Mirror from ${indigoRepoURL} to ${localRepoLocation}" />
<p2.mirror destination="file:${localRepoLocation}" ignoreerrors="true">
<source location="${indigoRepoURL}" />
<slicingOptions includeOptional="false" includeNonGreedy="false" latestVersionOnly="true" />
<iu id="org.apache.commons.beanutils" />
</p2.mirror>
- <p2.remove.iu>
- <repository location="file:${localRepoLocation}" />
- <iu id="org.eclipse.rap.jface" />
- <iu id="org.eclipse.rap.rwt" />
- <iu id="org.eclipse.rap.ui.forms" />
- </p2.remove.iu>
-
- <!-- work around bug 328405 -->
- <p2.repo2runnable destination="${transformedRepoLocation}" failOnError="false">
- <source>
- <repository location="http://download.eclipse.org/modeling/emf/emf/updates/2.7milestones/base/"/>
- </source>
- <iu id="org.eclipse.emf.ecore.feature.jar" version=""/>
- <iu id="org.eclipse.emf.common.feature.jar" version="" />
- </p2.repo2runnable>
</target>
<!-- ===================================================================== -->
@@ -191,15 +171,18 @@
<antcall target="gatherLogs" />
<!--sign the build -->
+ <ant antfile="${org.eclipse.e4.builder}/builder/general/sign.xml" dir="${basedir}" target="createSigningArchive" >
+ <property name="includesFile" value="${buildDirectory}/built.list" />
+ </ant>
<ant antfile="${org.eclipse.e4.builder}/builder/general/sign.xml" dir="${basedir}" target="signMasterFeature" />
<!--unzip signed build over top of the repository -->
- <unzip dest="${p2.repo}" src="${buildDirectory}/${buildLabel}/eclipse-master-${buildId}.zip" />
+ <unzip dest="${p2.repo}" src="${signingArchive}" />
<!-- use eclipse.jarProcessor directly instead of the "pack" on p2.process.artifacts so that we
can specify the file to pack instead of doing everything -->
<eclipse.jarProcessor inputFolder="${p2.repo}" pack="true" >
- <file dir="${p2.repo}" includesfile="${buildDirectory}/pack.list" />
+ <file dir="${p2.repo}" includesfile="${buildDirectory}/built.list" />
</eclipse.jarProcessor>
<!--update repository with new checksums for signed bundles -->
<p2.process.artifacts repositoryPath="file://${p2.repo}" />
@@ -237,7 +220,7 @@
<source location="file:${localRepoLocation}" />
<slicingOptions includeNonGreedy="false" />
<iu id="org.eclipse.rcp.configuration.feature.group" />
- <iu id="org.eclipse.e4.rcp.feature.group" />
+ <!--<iu id="org.eclipse.e4.rcp.feature.group" /> -->
</p2.mirror>
<filter token="BUILD_ID" value="${buildLabel}" />
@@ -285,12 +268,12 @@
<target name="provision.e4">
<property name="p2.sdk.install" value="${buildDirectory}/${buildId}/p2temp/sdk.install" />
<parallel failonany="true" threadCount='4'>
- <sequential> <callDirector os="win32" ws="win32" arch="x86" archiveFormat="zip" archiveSuffix="win32" /> </sequential>
+ <sequential> <callDirector os="win32" ws="win32" arch="x86" archiveFormat="zip" archiveSuffix="win32" /> </sequential>
<sequential> <callDirector os="win32" ws="win32" arch="x86_64" archiveFormat="zip" archiveSuffix="win32-x86_64" /> </sequential>
- <sequential> <callDirector os="linux" ws="gtk" arch="x86" archiveFormat="tar" archiveSuffix="linux-gtk" /> </sequential>
+ <sequential> <callDirector os="linux" ws="gtk" arch="x86" archiveFormat="tar" archiveSuffix="linux-gtk" /> </sequential>
<sequential> <callDirector os="linux" ws="gtk" arch="x86_64" archiveFormat="tar" archiveSuffix="linux-gtk-x86_64" /> </sequential>
- <sequential> <callDirector os="linux" ws="gtk" arch="ppc64" archiveFormat="tar" archiveSuffix="linux-gtk-ppc64" /> </sequential>
- <sequential> <callDirector os="macosx" ws="cocoa" arch="x86" archiveFormat="tar" archiveSuffix="macosx-cocoa" /> </sequential>
+ <sequential> <callDirector os="linux" ws="gtk" arch="ppc64" archiveFormat="tar" archiveSuffix="linux-gtk-ppc64" /> </sequential>
+ <sequential> <callDirector os="macosx" ws="cocoa" arch="x86" archiveFormat="tar" archiveSuffix="macosx-cocoa" /> </sequential>
<sequential> <callDirector os="macosx" ws="cocoa" arch="x86_64" archiveFormat="tar" archiveSuffix="macosx-cocoa-x86_64" /> </sequential>
</parallel>
</target>
diff --git a/org.eclipse.e4.sdk/maps/e4.map b/org.eclipse.e4.sdk/maps/e4.map
index 4aa8d76..4590c82 100644
--- a/org.eclipse.e4.sdk/maps/e4.map
+++ b/org.eclipse.e4.sdk/maps/e4.map
@@ -3,52 +3,6 @@
!**** Binary e4 plug-ins
feature@org.eclipse.e4.rcp=v20101201-1400,:pserver:anonymous@dev.eclipse.org:/cvsroot/eclipse,,e4/org.eclipse.e4.compatibility/features/org.eclipse.e4.rcp
-plugin@org.eclipse.e4.core.commands=p2IU,id=org.eclipse.e4.core.commands,version=,repository=http://download.eclipse.org/e4/updates/0.11-I-builds/
-plugin@org.eclipse.e4.core.contexts=p2IU,id=org.eclipse.e4.core.contexts,version=,repository=http://download.eclipse.org/e4/updates/0.11-I-builds/
-plugin@org.eclipse.e4.core.contexts.debug=p2IU,id=org.eclipse.e4.core.contexts.debug,version=,repository=http://download.eclipse.org/e4/updates/0.11-I-builds/
-plugin@org.eclipse.e4.core.di=p2IU,id=org.eclipse.e4.core.di,version=,repository=http://download.eclipse.org/e4/updates/0.11-I-builds/
-plugin@org.eclipse.e4.ui.di=p2IU,id=org.eclipse.e4.ui.di,version=,repository=http://download.eclipse.org/e4/updates/0.11-I-builds/
-plugin@org.eclipse.e4.core.di.extensions=p2IU,id=org.eclipse.e4.core.di.extensions,version=,repository=http://download.eclipse.org/e4/updates/0.11-I-builds/
-plugin@org.eclipse.e4.core.services=p2IU,id=org.eclipse.e4.core.services,version=,repository=http://download.eclipse.org/e4/updates/0.11-I-builds/
-plugin@org.eclipse.e4.ui.bindings=p2IU,id=org.eclipse.e4.ui.bindings,version=,repository=http://download.eclipse.org/e4/updates/0.11-I-builds/
-plugin@org.eclipse.e4.ui.css.core=p2IU,id=org.eclipse.e4.ui.css.core,version=,repository=http://download.eclipse.org/e4/updates/0.11-I-builds/
-plugin@org.eclipse.e4.ui.css.swt.theme=p2IU,id=org.eclipse.e4.ui.css.swt.theme,version=,repository=http://download.eclipse.org/e4/updates/0.11-I-builds/
-plugin@org.eclipse.e4.ui.css.nebula=p2IU,id=org.eclipse.e4.ui.css.nebula,version=,repository=http://download.eclipse.org/e4/updates/0.11-I-builds/
-plugin@org.eclipse.e4.ui.css.swt=p2IU,id=org.eclipse.e4.ui.css.swt,version=,repository=http://download.eclipse.org/e4/updates/0.11-I-builds/
-plugin@org.eclipse.e4.ui.model.workbench=p2IU,id=org.eclipse.e4.ui.model.workbench,version=,repository=http://download.eclipse.org/e4/updates/0.11-I-builds/
-plugin@org.eclipse.e4.ui.services=p2IU,id=org.eclipse.e4.ui.services,version=,repository=http://download.eclipse.org/e4/updates/0.11-I-builds/
-plugin@org.eclipse.e4.ui.workbench=p2IU,id=org.eclipse.e4.ui.workbench,version=,repository=http://download.eclipse.org/e4/updates/0.11-I-builds/
-plugin@org.eclipse.e4.ui.workbench.renderers.swt=p2IU,id=org.eclipse.e4.ui.workbench.renderers.swt,version=,repository=http://download.eclipse.org/e4/updates/0.11-I-builds/
-plugin@org.eclipse.e4.ui.workbench.swt=p2IU,id=org.eclipse.e4.ui.workbench.swt,version=,repository=http://download.eclipse.org/e4/updates/0.11-I-builds/
-plugin@org.eclipse.e4.ui.workbench3=p2IU,id=org.eclipse.e4.ui.workbench3,version=,repository=http://download.eclipse.org/e4/updates/0.11-I-builds/
-plugin@org.eclipse.e4.ui.widgets=p2IU,id=org.eclipse.e4.ui.widgets,version=,repository=http://download.eclipse.org/e4/updates/0.11-I-builds/
-fragment@org.eclipse.e4.ui.workbench.renderers.swt.cocoa=p2IU,id=org.eclipse.e4.ui.workbench.renderers.swt.cocoa,version=,repository=http://download.eclipse.org/e4/updates/0.11-I-builds/
-
-plugin@org.eclipse.e4.emf.xpath=p2IU,id=org.eclipse.e4.emf.xpath,version=,repository=http://download.eclipse.org/e4/updates/0.11-I-builds/
-plugin@org.eclipse.e4.emf.xpath.source=p2IU,id=org.eclipse.e4.emf.xpath.source,version=,repository=http://download.eclipse.org/e4/updates/0.11-I-builds/
-
-!**** Source e4 plug-ins
-plugin@org.eclipse.e4.core.commands.source=p2IU,id=org.eclipse.e4.core.commands,version=,repository=http://download.eclipse.org/e4/updates/0.11-I-builds/
-plugin@org.eclipse.e4.core.contexts.source=p2IU,id=org.eclipse.e4.core.contexts,version=,repository=http://download.eclipse.org/e4/updates/0.11-I-builds/
-plugin@org.eclipse.e4.core.contexts.debug.source=p2IU,id=org.eclipse.e4.core.contexts.debug.source,version=,repository=http://download.eclipse.org/e4/updates/0.11-I-builds/
-plugin@org.eclipse.e4.core.di.source=p2IU,id=org.eclipse.e4.core.di,version=,repository=http://download.eclipse.org/e4/updates/0.11-I-builds/
-plugin@org.eclipse.e4.ui.di.source=p2IU,id=org.eclipse.e4.ui.di,version=,repository=http://download.eclipse.org/e4/updates/0.11-I-builds/
-plugin@org.eclipse.e4.core.di.extensions.source=p2IU,id=org.eclipse.e4.core.di.extensions,version=,repository=http://download.eclipse.org/e4/updates/0.11-I-builds/
-plugin@org.eclipse.e4.core.services.source=p2IU,id=org.eclipse.e4.core.services,version=,repository=http://download.eclipse.org/e4/updates/0.11-I-builds/
-plugin@org.eclipse.e4.ui.bindings.source=p2IU,id=org.eclipse.e4.ui.bindings,version=,repository=http://download.eclipse.org/e4/updates/0.11-I-builds/
-plugin@org.eclipse.e4.ui.css.core.source=p2IU,id=org.eclipse.e4.ui.css.core,version=,repository=http://download.eclipse.org/e4/updates/0.11-I-builds/
-plugin@org.eclipse.e4.ui.css.swt.theme.source=p2IU,id=org.eclipse.e4.ui.css.swt.theme,version=,repository=http://download.eclipse.org/e4/updates/0.11-I-builds/
-plugin@org.eclipse.e4.ui.css.nebula.source=p2IU,id=org.eclipse.e4.ui.css.nebula,version=,repository=http://download.eclipse.org/e4/updates/0.11-I-builds/
-plugin@org.eclipse.e4.ui.css.swt.source=p2IU,id=org.eclipse.e4.ui.css.swt,version=,repository=http://download.eclipse.org/e4/updates/0.11-I-builds/
-plugin@org.eclipse.e4.ui.model.workbench.source=p2IU,id=org.eclipse.e4.ui.model.workbench,version=,repository=http://download.eclipse.org/e4/updates/0.11-I-builds/
-plugin@org.eclipse.e4.ui.services.source=p2IU,id=org.eclipse.e4.ui.services,version=,repository=http://download.eclipse.org/e4/updates/0.11-I-builds/
-plugin@org.eclipse.e4.ui.workbench.source=p2IU,id=org.eclipse.e4.ui.workbench,version=,repository=http://download.eclipse.org/e4/updates/0.11-I-builds/
-plugin@org.eclipse.e4.ui.workbench.renderers.swt.source=p2IU,id=org.eclipse.e4.ui.workbench.renderers.swt,version=,repository=http://download.eclipse.org/e4/updates/0.11-I-builds/
-plugin@org.eclipse.e4.ui.workbench.swt.source=p2IU,id=org.eclipse.e4.ui.workbench.swt,version=,repository=http://download.eclipse.org/e4/updates/0.11-I-builds/
-plugin@org.eclipse.e4.ui.workbench3.source=p2IU,id=org.eclipse.e4.ui.workbench3,version=,repository=http://download.eclipse.org/e4/updates/0.11-I-builds/
-plugin@org.eclipse.e4.ui.widgets.source=p2IU,id=org.eclipse.e4.ui.widgets,version=,repository=http://download.eclipse.org/e4/updates/0.11-I-builds/
-fragment@org.eclipse.e4.ui.workbench.renderers.swt.cocoa.source=p2IU,id=org.eclipse.e4.ui.workbench.renderers.swt.cocoa,version=,repository=http://download.eclipse.org/e4/updates/0.11-I-builds/
-
!**** Workbench Compatibility
