Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2013-07-23 12:28:07 +0000
committerEike Stepper2013-07-23 12:28:07 +0000
commita6a8f6bd28cbee02b255e530182d0e6f03e33743 (patch)
tree31eda21d063ae2cd23a59aad1e0e3bffeec793fb
parent8530dd21c7450a229afc2a66bf0b21a87c4d582a (diff)
downloadcdo-a6a8f6bd28cbee02b255e530182d0e6f03e33743.tar.gz
cdo-a6a8f6bd28cbee02b255e530182d0e6f03e33743.tar.xz
cdo-a6a8f6bd28cbee02b255e530182d0e6f03e33743.zip
Fix product generation
-rw-r--r--features/org.eclipse.emf.cdo.releng.setup.product-feature/.settings/org.eclipse.core.resources.prefs2
-rw-r--r--features/org.eclipse.emf.cdo.releng.setup.product-feature/Setup.product8
-rw-r--r--features/org.eclipse.emf.cdo.releng.setup.product-feature/buckminster.cspex__6
-rw-r--r--features/org.eclipse.emf.cdo.releng.setup.product-feature/feature.xml32
-rw-r--r--plugins/org.eclipse.emf.cdo.releng/build.cquery3
5 files changed, 11 insertions, 40 deletions
diff --git a/features/org.eclipse.emf.cdo.releng.setup.product-feature/.settings/org.eclipse.core.resources.prefs b/features/org.eclipse.emf.cdo.releng.setup.product-feature/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 448fbcdb95..0000000000
--- a/features/org.eclipse.emf.cdo.releng.setup.product-feature/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-encoding/buckminster.cspex__=UTF-8
diff --git a/features/org.eclipse.emf.cdo.releng.setup.product-feature/Setup.product b/features/org.eclipse.emf.cdo.releng.setup.product-feature/Setup.product
index e3a84fd24e..377b935442 100644
--- a/features/org.eclipse.emf.cdo.releng.setup.product-feature/Setup.product
+++ b/features/org.eclipse.emf.cdo.releng.setup.product-feature/Setup.product
@@ -34,6 +34,14 @@ configuration</programArgs>
<features>
<feature id="org.eclipse.emf.cdo.releng.setup.product" version="1.0.0.qualifier"/>
+ <feature id="org.eclipse.emf.common" version="2.9.0.v20130528-0742"/>
+ <feature id="org.eclipse.emf.common.ui" version="2.8.0.v20130610-0406"/>
+ <feature id="org.eclipse.emf.ecore" version="2.9.0.v20130528-0742"/>
+ <feature id="org.eclipse.emf.edit" version="2.9.0.v20130610-0406"/>
+ <feature id="org.eclipse.emf.edit.ui" version="2.9.0.v20130610-0406"/>
+ <feature id="org.eclipse.e4.rcp" version="1.2.0.v20130605-1738"/>
+ <feature id="org.eclipse.rcp" version="4.3.0.v20130605-2000"/>
+ <feature id="org.eclipse.equinox.p2.core.feature" version="1.2.0.v20130604-2046"/>
</features>
diff --git a/features/org.eclipse.emf.cdo.releng.setup.product-feature/buckminster.cspex__ b/features/org.eclipse.emf.cdo.releng.setup.product-feature/buckminster.cspex__
deleted file mode 100644
index de6e4ebd59..0000000000
--- a/features/org.eclipse.emf.cdo.releng.setup.product-feature/buckminster.cspex__
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<cs:cspecExtension xmlns:cs="http://www.eclipse.org/buckminster/CSpec-1.0">
- <cs:dependencies>
- <cs:dependency name="org.eclipse.equinox.executable" componentType="eclipse.feature"/>
- </cs:dependencies>
-</cs:cspecExtension> \ No newline at end of file
diff --git a/features/org.eclipse.emf.cdo.releng.setup.product-feature/feature.xml b/features/org.eclipse.emf.cdo.releng.setup.product-feature/feature.xml
index 379c4cdf0e..ca7dd2c0ca 100644
--- a/features/org.eclipse.emf.cdo.releng.setup.product-feature/feature.xml
+++ b/features/org.eclipse.emf.cdo.releng.setup.product-feature/feature.xml
@@ -33,38 +33,6 @@
<discovery label="%updateSiteName" url="http://www.eclipse.org/modeling/updates/"/>
</url>
- <includes
- id="org.eclipse.rcp"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.e4.rcp"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.emf.ecore"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.emf.common"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.emf.edit"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.emf.edit.ui"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.emf.common.ui"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.equinox.p2.core.feature"
- version="0.0.0"/>
-
<plugin
id="org.eclipse.emf.cdo.releng.setup"
download-size="0"
diff --git a/plugins/org.eclipse.emf.cdo.releng/build.cquery b/plugins/org.eclipse.emf.cdo.releng/build.cquery
index 5d6f6fd178..1e0125bbf8 100644
--- a/plugins/org.eclipse.emf.cdo.releng/build.cquery
+++ b/plugins/org.eclipse.emf.cdo.releng/build.cquery
@@ -17,8 +17,11 @@
<!-- For unknown reasons source 1.0.4 gets included for 1.1.1 -->
<cq:advisorNode namePattern="org\.apache\.commons\.logging\.source" skipComponent="true"/>
+ <!--
<cq:advisorNode namePattern="^org\.eclipse\.swt\.(?:gtk\.(?:linux\.s390x|aix\.ppc(?:64)?)|motif\.solaris\.sparc|photon\.qnx\.x86)\.source$" skipComponent="true"/>
<cq:advisorNode namePattern="^org\.eclipse\.swt\.(?:gtk\.aix\.ppc(?:64)?|motif\.solaris\.sparc|photon\.qnx\.x86)$" skipComponent="true"/>
<cq:advisorNode namePattern="^org\.eclipse\.equinox\.launcher\.gtk\.aix\.ppc(?:64)?$" skipComponent="true"/>
+ -->
+
<cq:advisorNode namePattern=".*" useMaterialization="false" useTargetPlatform="false"/>
</cq:componentQuery>

Back to the top