Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2014-06-05 06:21:53 -0400
committerEike Stepper2014-06-05 06:26:24 -0400
commite604f0759153aaf9e84d20d6e0299074642eb8a6 (patch)
tree0f5e398d62f7c458f7e60af7efc3ea9ce3d8daa9
parent159eee90e01a88859ce7b1f8d12d757f98941464 (diff)
downloadcdo-e604f0759153aaf9e84d20d6e0299074642eb8a6.tar.gz
cdo-e604f0759153aaf9e84d20d6e0299074642eb8a6.tar.xz
cdo-e604f0759153aaf9e84d20d6e0299074642eb8a6.zip
Eliminate projects that have been moved to Oomph
-rw-r--r--features/org.eclipse.emf.cdo.releng.all-feature/feature.xml65
-rw-r--r--features/org.eclipse.emf.cdo.site-feature/category.xml13
-rw-r--r--features/org.eclipse.emf.cdo.site-feature/feature.xml12
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.help/toc.xmi40
-rw-r--r--plugins/org.eclipse.emf.cdo.releng/.settings/org.eclipse.core.resources.prefs1
-rw-r--r--plugins/org.eclipse.emf.cdo.releng/build.xml17
-rw-r--r--plugins/org.eclipse.emf.cdo.releng/local.properties.template3
7 files changed, 12 insertions, 139 deletions
diff --git a/features/org.eclipse.emf.cdo.releng.all-feature/feature.xml b/features/org.eclipse.emf.cdo.releng.all-feature/feature.xml
index a3249d086b..a6bd6835f1 100644
--- a/features/org.eclipse.emf.cdo.releng.all-feature/feature.xml
+++ b/features/org.eclipse.emf.cdo.releng.all-feature/feature.xml
@@ -44,78 +44,13 @@
version="0.0.0"/>
<includes
- id="org.eclipse.emf.cdo.releng.gitbash"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.emf.cdo.releng.launches"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.emf.cdo.releng.manifests"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.emf.cdo.releng.preferences"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.emf.cdo.releng.projectconfig"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.emf.cdo.releng.projectcopy"
- version="0.0.0"/>
-
- <includes
id="org.eclipse.emf.cdo.releng.relativepaths"
version="0.0.0"/>
<includes
- id="org.eclipse.emf.cdo.releng.setup"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.emf.cdo.releng.setup.installer"
- version="0.0.0"/>
-
- <includes
id="org.eclipse.emf.cdo.releng.tasks"
version="0.0.0"/>
- <includes
- id="org.eclipse.emf.cdo.releng.version.headless"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.emf.cdo.releng.winexplorer"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.emf.cdo.releng.workingsets"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.emf.cdo.releng.version"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.emf.cdo.releng.version.digest"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.emf.cdo.releng.version.ui"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
<plugin
id="org.eclipse.emf.cdo.releng.ui"
download-size="0"
diff --git a/features/org.eclipse.emf.cdo.site-feature/category.xml b/features/org.eclipse.emf.cdo.site-feature/category.xml
index aa5ff12565..4e6fa1a622 100644
--- a/features/org.eclipse.emf.cdo.site-feature/category.xml
+++ b/features/org.eclipse.emf.cdo.site-feature/category.xml
@@ -57,21 +57,10 @@
<feature id="org.eclipse.net4j.util.ui" version="0.0.0"><category name="org.eclipse.net4j.util.category"/></feature>
<!-- Release Engineering -->
- <feature id="org.eclipse.emf.cdo.releng.all" version="0.0.0"><category name="org.eclipse.emf.cdo.releng.category"/></feature>
- <feature id="org.eclipse.emf.cdo.releng.version" version="0.0.0"><category name="org.eclipse.emf.cdo.releng.category"/></feature>
- <feature id="org.eclipse.emf.cdo.releng.version.headless" version="0.0.0"><category name="org.eclipse.emf.cdo.releng.category"/></feature>
<feature id="org.eclipse.emf.cdo.releng.help" version="0.0.0"><category name="org.eclipse.emf.cdo.releng.category"/></feature>
- <feature id="org.eclipse.emf.cdo.releng.launches" version="0.0.0"><category name="org.eclipse.emf.cdo.releng.category"/></feature>
- <feature id="org.eclipse.emf.cdo.releng.projectcopy" version="0.0.0"><category name="org.eclipse.emf.cdo.releng.category"/></feature>
- <feature id="org.eclipse.emf.cdo.releng.buildstamp" version="0.0.0"><category name="org.eclipse.emf.cdo.releng.category"/></feature>
<feature id="org.eclipse.emf.cdo.releng.apireports" version="0.0.0"><category name="org.eclipse.emf.cdo.releng.category"/></feature>
- <feature id="org.eclipse.emf.cdo.releng.projectconfig" version="0.0.0"><category name="org.eclipse.emf.cdo.releng.category"/></feature>
- <feature id="org.eclipse.emf.cdo.releng.preferences" version="0.0.0"><category name="org.eclipse.emf.cdo.releng.category"/></feature>
- <feature id="org.eclipse.emf.cdo.releng.manifests" version="0.0.0"><category name="org.eclipse.emf.cdo.releng.category"/></feature>
+ <feature id="org.eclipse.emf.cdo.releng.buildstamp" version="0.0.0"><category name="org.eclipse.emf.cdo.releng.category"/></feature>
<feature id="org.eclipse.emf.cdo.releng.relativepaths" version="0.0.0"><category name="org.eclipse.emf.cdo.releng.category"/></feature>
- <feature id="org.eclipse.emf.cdo.releng.winexplorer" version="0.0.0"><category name="org.eclipse.emf.cdo.releng.category"/></feature>
- <feature id="org.eclipse.emf.cdo.releng.gitbash" version="0.0.0"><category name="org.eclipse.emf.cdo.releng.category"/></feature>
- <feature id="org.eclipse.emf.cdo.releng.workingsets" version="0.0.0"><category name="org.eclipse.emf.cdo.releng.category"/></feature>
<feature id="org.eclipse.emf.cdo.releng.tasks" version="0.0.0"><category name="org.eclipse.emf.cdo.releng.category"/></feature>
<!-- Others -->
diff --git a/features/org.eclipse.emf.cdo.site-feature/feature.xml b/features/org.eclipse.emf.cdo.site-feature/feature.xml
index 3b3536c6d9..e471b7c868 100644
--- a/features/org.eclipse.emf.cdo.site-feature/feature.xml
+++ b/features/org.eclipse.emf.cdo.site-feature/feature.xml
@@ -147,7 +147,11 @@
version="0.0.0"/>
<includes
- id="org.eclipse.emf.cdo.releng.all"
+ id="org.eclipse.emf.cdo.releng.apireports"
+ version="0.0.0"/>
+
+ <includes
+ id="org.eclipse.emf.cdo.releng.buildstamp"
version="0.0.0"/>
<includes
@@ -155,7 +159,11 @@
version="0.0.0"/>
<includes
- id="org.eclipse.emf.cdo.releng.version"
+ id="org.eclipse.emf.cdo.releng.relativepaths"
+ version="0.0.0"/>
+
+ <includes
+ id="org.eclipse.emf.cdo.releng.tasks"
version="0.0.0"/>
<plugin
diff --git a/plugins/org.eclipse.emf.cdo.releng.help/toc.xmi b/plugins/org.eclipse.emf.cdo.releng.help/toc.xmi
index 97dcd8e8c3..358bc61fdf 100644
--- a/plugins/org.eclipse.emf.cdo.releng.help/toc.xmi
+++ b/plugins/org.eclipse.emf.cdo.releng.help/toc.xmi
@@ -3,47 +3,7 @@
<article:Plugin name="org.eclipse.emf.cdo.releng.apireports" label="API Report Generator"/>
<article:Plugin name="org.eclipse.emf.cdo.releng.buildstamp" label="Build Time Stamp Generator"/>
<article:Plugin name="org.eclipse.emf.cdo.releng.doc" label="Documentation Generator"/>
- <article:Plugin name="org.eclipse.emf.cdo.releng.workingsets" label="Dynamic Working Sets">
- <packages name="org.eclipse.emf.cdo.releng.workingsets"/>
- <packages name="org.eclipse.emf.cdo.releng.workingsets.impl"/>
- <packages name="org.eclipse.emf.cdo.releng.workingsets.util"/>
- </article:Plugin>
- <article:Plugin name="org.eclipse.emf.cdo.releng.workingsets.edit" label="Dynamic Working Sets Edit Support">
- <packages name="org.eclipse.emf.cdo.releng.workingsets.provider"/>
- </article:Plugin>
- <article:Plugin name="org.eclipse.emf.cdo.releng.workingsets.editor" label="Dynamic Working Sets Editor"/>
- <article:Plugin name="org.eclipse.emf.cdo.releng.gitbash" label="Git Bash"/>
- <article:Plugin name="org.eclipse.emf.cdo.releng.launches" label="Launch Decorator"/>
- <article:Plugin name="org.eclipse.emf.cdo.releng.manifests" label="Manifest Opener"/>
<article:Plugin name="org.eclipse.emf.cdo.releng.tasks" label="Mylyn Task Overview"/>
- <article:Plugin name="org.eclipse.emf.cdo.releng.preferences" label="Preference Management">
- <packages name="org.eclipse.emf.cdo.releng.preferences"/>
- <packages name="org.eclipse.emf.cdo.releng.preferences.impl"/>
- <packages name="org.eclipse.emf.cdo.releng.preferences.util"/>
- </article:Plugin>
- <article:Plugin name="org.eclipse.emf.cdo.releng.preferences.edit" label="Preference Management Edit Support">
- <packages name="org.eclipse.emf.cdo.releng.preferences.provider"/>
- </article:Plugin>
- <article:Plugin name="org.eclipse.emf.cdo.releng.preferences.editor" label="Preference Management Editor"/>
- <article:Plugin name="org.eclipse.emf.cdo.releng.projectconfig" label="Project Configuration">
- <packages name="org.eclipse.emf.cdo.releng.projectconfig"/>
- <packages name="org.eclipse.emf.cdo.releng.projectconfig.impl"/>
- <packages name="org.eclipse.emf.cdo.releng.projectconfig.util"/>
- </article:Plugin>
- <article:Plugin name="org.eclipse.emf.cdo.releng.projectconfig.edit" label="Project Configuration Edit Support">
- <packages name="org.eclipse.emf.cdo.releng.projectconfig.provider"/>
- </article:Plugin>
- <article:Plugin name="org.eclipse.emf.cdo.releng.projectconfig.editor" label="Project Configuration Editor"/>
- <article:Plugin name="org.eclipse.emf.cdo.releng.projectcopy" label="Project Copy"/>
- <article:Plugin name="org.eclipse.emf.cdo.releng.predicates" label="Project Predicates">
- <packages name="org.eclipse.emf.cdo.releng.predicates"/>
- <packages name="org.eclipse.emf.cdo.releng.predicates.impl"/>
- <packages name="org.eclipse.emf.cdo.releng.predicates.util"/>
- </article:Plugin>
- <article:Plugin name="org.eclipse.emf.cdo.releng.predicates.edit" label="Project Predicates Edit Support">
- <packages name="org.eclipse.emf.cdo.releng.predicates.provider"/>
- </article:Plugin>
<article:Plugin name="org.eclipse.emf.cdo.releng.relativepaths" label="Relative Path Creator"/>
<article:Plugin name="org.eclipse.emf.cdo.releng.ui" label="Version Management UI"/>
- <article:Plugin name="org.eclipse.emf.cdo.releng.winexplorer" label="Windows Explorer"/>
</xmi:XMI>
diff --git a/plugins/org.eclipse.emf.cdo.releng/.settings/org.eclipse.core.resources.prefs b/plugins/org.eclipse.emf.cdo.releng/.settings/org.eclipse.core.resources.prefs
index e2f6b5ce26..6ff3e4922a 100644
--- a/plugins/org.eclipse.emf.cdo.releng/.settings/org.eclipse.core.resources.prefs
+++ b/plugins/org.eclipse.emf.cdo.releng/.settings/org.eclipse.core.resources.prefs
@@ -2,7 +2,6 @@ eclipse.preferences.version=1
encoding/.project=UTF-8
encoding//exampleBuilderTemplates/template.project=UTF-8
encoding//hudson/target.xml=UTF-8
-encoding/buckminster.bom=UTF-8
encoding/buckminster.cspex=UTF-8
encoding/build.cquery=UTF-8
encoding/build.mspec=UTF-8
diff --git a/plugins/org.eclipse.emf.cdo.releng/build.xml b/plugins/org.eclipse.emf.cdo.releng/build.xml
index f6ee40ef51..fd133a8f61 100644
--- a/plugins/org.eclipse.emf.cdo.releng/build.xml
+++ b/plugins/org.eclipse.emf.cdo.releng/build.xml
@@ -366,15 +366,6 @@
<generate.product id="org.eclipse.emf.cdo.explorer.product" profile="CDOExplorer" priority="3" />
</then>
</if>
-
- <if>
- <not>
- <equals arg1="${skip.generate.products.setup}" arg2="true" />
- </not>
- <then>
- <generate.product id="org.eclipse.emf.cdo.releng.setup.installer.product" profile="Setup" priority="2" />
- </then>
- </if>
</sequential>
</macrodef>
@@ -537,13 +528,6 @@
<equals arg1="${build.type}" arg2="N" />
<then>
<if>
- <available file="${temp.products}/@{profile}-@{platform}/@{profile}@{extension}/setup-eclipse.ini" />
- <then>
- <echo file="${temp.products}/@{profile}-@{platform}/@{profile}@{extension}/setup-eclipse.ini" message="-Dreleng.url=${env.JOB_URL}lastSuccessfulBuild/artifact" append="true" />
- <replaceregexp file="${temp.products}/@{profile}-@{platform}/@{profile}@{extension}/setup-eclipse.ini" match="-Dreleng.url=https://" replace="-Dreleng.url=http://" byline="true" />
- </then>
- </if>
- <if>
<available file="${temp.products}/@{profile}-@{platform}/@{profile}@{extension}/Contents/MacOS/@{profile}-eclipse.ini" />
<then>
<echo file="${temp.products}/@{profile}-@{platform}/@{profile}@{extension}/Contents/MacOS/@{profile}-eclipse.ini" message="-Dreleng.url=${env.JOB_URL}lastSuccessfulBuild/artifact" append="true" />
@@ -973,7 +957,6 @@
<replace.product.version feature="org.eclipse.emf.cdo.explorer.product" profile="CDOExplorer" version="${build.version}" />
<replace.product.version feature="org.eclipse.emf.cdo.server.product" profile="CDOServer" version="${build.version}" />
- <replace.product.version feature="org.eclipse.emf.cdo.releng.setup.installer" profile="Setup" version="${build.version}" />
</then>
</if>
</target>
diff --git a/plugins/org.eclipse.emf.cdo.releng/local.properties.template b/plugins/org.eclipse.emf.cdo.releng/local.properties.template
index c1c5f16d4d..bb723e11a3 100644
--- a/plugins/org.eclipse.emf.cdo.releng/local.properties.template
+++ b/plugins/org.eclipse.emf.cdo.releng/local.properties.template
@@ -18,7 +18,7 @@ build.type = N
p2.mirrors = true
loglevel = INFO
-# Set the following properties to true to speed up repeated builds
+# Set the following properties to true to speed up repeated builds
keep.tools = false
keep.git = false
keep.tp = false
@@ -38,7 +38,6 @@ skip.generate.apireports = false
skip.generate.products = false
skip.generate.products.server = false
skip.generate.products.explorer = false
-skip.generate.products.setup = false
skip.generate.products.windows = false
skip.generate.products.linux = false
skip.generate.products.macos = false

Back to the top