Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2011-07-12 23:45:34 -0400
committerEike Stepper2011-07-12 23:45:34 -0400
commit16c143fcfc90946e8987ca7b0cf65eccf32ec162 (patch)
tree9e05e155c6491f129d07e43916ca113f18bde466
parentf666794e58f52be6c30e1b04b35b4fb64c11a573 (diff)
downloadcdo-16c143fcfc90946e8987ca7b0cf65eccf32ec162.tar.gz
cdo-16c143fcfc90946e8987ca7b0cf65eccf32ec162.tar.xz
cdo-16c143fcfc90946e8987ca7b0cf65eccf32ec162.zip
[351616] [releng] Provide platform-specific CDOServer + CDOExplorer downloads
https://bugs.eclipse.org/bugs/show_bug.cgi?id=351616
-rw-r--r--features/org.eclipse.emf.cdo.explorer.product-feature/.settings/org.eclipse.core.resources.prefs3
-rw-r--r--features/org.eclipse.emf.cdo.explorer.product-feature/buckminster.cspex6
-rw-r--r--features/org.eclipse.emf.cdo.explorer.product-feature/feature.xml18
-rw-r--r--features/org.eclipse.emf.cdo.server.product-feature/.settings/org.eclipse.core.resources.prefs3
-rw-r--r--features/org.eclipse.emf.cdo.server.product-feature/buckminster.cspex6
-rw-r--r--features/org.eclipse.emf.cdo.server.product-feature/feature.xml145
-rw-r--r--plugins/org.eclipse.emf.cdo.explorer/META-INF/MANIFEST.MF3
-rw-r--r--plugins/org.eclipse.emf.cdo.releng/build.properties1
-rw-r--r--plugins/org.eclipse.emf.cdo.releng/build.xml32
9 files changed, 62 insertions, 155 deletions
diff --git a/features/org.eclipse.emf.cdo.explorer.product-feature/.settings/org.eclipse.core.resources.prefs b/features/org.eclipse.emf.cdo.explorer.product-feature/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000000..ec2dff833b
--- /dev/null
+++ b/features/org.eclipse.emf.cdo.explorer.product-feature/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,3 @@
+#Wed Jul 13 04:47:44 CEST 2011
+eclipse.preferences.version=1
+encoding/buckminster.cspex=UTF-8
diff --git a/features/org.eclipse.emf.cdo.explorer.product-feature/buckminster.cspex b/features/org.eclipse.emf.cdo.explorer.product-feature/buckminster.cspex
new file mode 100644
index 0000000000..de6e4ebd59
--- /dev/null
+++ b/features/org.eclipse.emf.cdo.explorer.product-feature/buckminster.cspex
@@ -0,0 +1,6 @@
+<?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.explorer.product-feature/feature.xml b/features/org.eclipse.emf.cdo.explorer.product-feature/feature.xml
index 6f2858cb07..fdfded89a9 100644
--- a/features/org.eclipse.emf.cdo.explorer.product-feature/feature.xml
+++ b/features/org.eclipse.emf.cdo.explorer.product-feature/feature.xml
@@ -33,10 +33,6 @@
<discovery label="%updateSiteName" url="http://www.eclipse.org/modeling/updates/"/>
</url>
- <includes
- id="org.eclipse.equinox.executable"
- version="0.0.0"/>
-
<plugin
id="org.eclipse.emf.cdo.explorer"
download-size="0"
@@ -44,4 +40,18 @@
version="0.0.0"
unpack="false"/>
+ <plugin
+ id="org.eclipse.emf.cdo.examples.company"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.emf.cdo.examples.company.edit"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
</feature>
diff --git a/features/org.eclipse.emf.cdo.server.product-feature/.settings/org.eclipse.core.resources.prefs b/features/org.eclipse.emf.cdo.server.product-feature/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000000..7bb26ed31c
--- /dev/null
+++ b/features/org.eclipse.emf.cdo.server.product-feature/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,3 @@
+#Wed Jul 13 04:46:51 CEST 2011
+eclipse.preferences.version=1
+encoding/buckminster.cspex=UTF-8
diff --git a/features/org.eclipse.emf.cdo.server.product-feature/buckminster.cspex b/features/org.eclipse.emf.cdo.server.product-feature/buckminster.cspex
new file mode 100644
index 0000000000..de6e4ebd59
--- /dev/null
+++ b/features/org.eclipse.emf.cdo.server.product-feature/buckminster.cspex
@@ -0,0 +1,6 @@
+<?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.server.product-feature/feature.xml b/features/org.eclipse.emf.cdo.server.product-feature/feature.xml
index a92ebb55f2..9a0b81d5d8 100644
--- a/features/org.eclipse.emf.cdo.server.product-feature/feature.xml
+++ b/features/org.eclipse.emf.cdo.server.product-feature/feature.xml
@@ -33,60 +33,6 @@
<discovery label="%updateSiteName" url="http://www.eclipse.org/modeling/updates/"/>
</url>
- <includes
- id="org.eclipse.equinox.executable"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.core.contenttype"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.core.jobs"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.core.runtime"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.core.runtime.compatibility.registry"
- download-size="0"
- install-size="0"
- version="0.0.0"
- fragment="true"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.emf.cdo"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.emf.cdo.common"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.emf.cdo.server"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
<plugin
id="org.eclipse.emf.cdo.server.db"
download-size="0"
@@ -102,76 +48,6 @@
unpack="false"/>
<plugin
- id="org.eclipse.emf.common"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.emf.ecore"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.emf.ecore.change"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.emf.ecore.xmi"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.equinox.app"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.equinox.common"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.equinox.preferences"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.equinox.registry"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.net4j"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.net4j.db"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
id="org.eclipse.net4j.db.h2"
download-size="0"
install-size="0"
@@ -185,25 +61,4 @@
version="0.0.0"
unpack="false"/>
- <plugin
- id="org.eclipse.net4j.util"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.osgi"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.h2"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
</feature>
diff --git a/plugins/org.eclipse.emf.cdo.explorer/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.explorer/META-INF/MANIFEST.MF
index 4ef15b8577..91300966f7 100644
--- a/plugins/org.eclipse.emf.cdo.explorer/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.explorer/META-INF/MANIFEST.MF
@@ -13,7 +13,6 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
org.eclipse.ui.intro;bundle-version="[3.4.0,4.0.0)",
org.eclipse.emf.cdo.ui.ide;bundle-version="[4.0.0,5.0.0)",
org.eclipse.emf.cdo.net4j;bundle-version="[4.0.0,5.0.0)",
- org.eclipse.net4j.tcp;bundle-version="[4.0.0,5.0.0)",
- org.eclipse.emf.cdo.examples.company.edit;bundle-version="[4.0.0,5.0.0)"
+ org.eclipse.net4j.tcp;bundle-version="[4.0.0,5.0.0)"
Export-Package: org.eclipse.emf.cdo.internal.explorer;version="4.1.0";x-internal:=true,
org.eclipse.emf.cdo.internal.explorer.bundle;version="4.1.0";x-internal:=true
diff --git a/plugins/org.eclipse.emf.cdo.releng/build.properties b/plugins/org.eclipse.emf.cdo.releng/build.properties
index 28f2fa48ee..5df0bcbbe3 100644
--- a/plugins/org.eclipse.emf.cdo.releng/build.properties
+++ b/plugins/org.eclipse.emf.cdo.releng/build.properties
@@ -9,6 +9,7 @@
stream=4.1
branch=trunk
+train=indigo
weekly.build.type=I
svn.repository=http://dev.eclipse.org/svnroot/modeling/org.eclipse.emf.cdo
diff --git a/plugins/org.eclipse.emf.cdo.releng/build.xml b/plugins/org.eclipse.emf.cdo.releng/build.xml
index 68637a775f..3fe4553da2 100644
--- a/plugins/org.eclipse.emf.cdo.releng/build.xml
+++ b/plugins/org.eclipse.emf.cdo.releng/build.xml
@@ -94,6 +94,8 @@
<args>
<arg value="-r" />
<arg value="file:${hudson.WORKSPACE}" />
+ <arg value="-r" />
+ <arg value="${eclipse.downloads}/releases/${train}" />
<arg value="-d" />
<arg value="${temp.product}" />
<arg value="-p" />
@@ -140,6 +142,7 @@
<target name="-init.properties">
<echo message="stream = ${stream}" />
<echo message="branch = ${branch}" />
+ <echo message="train = ${train}" />
<condition property="no.proxy" value="${hudson.no_proxy}, dev.eclipse.org" else="dev.eclipse.org">
<isset property="hudson.no_proxy" />
@@ -148,10 +151,13 @@
<property name="checkout" value="/dev/null" />
<property name="releng" location="${checkout}/plugins/org.eclipse.emf.cdo.releng" />
<property name="test.report" location="${hudson.WORKSPACE}/test-report.xml" />
+
<property name="tools" location="${hudson.WORKSPACE}/tools" />
<property name="result" location="${hudson.WORKSPACE}/result" />
+
<property name="ws" location="${result}/ws" />
<property name="tp" location="${result}/tp" />
+
<property name="buckminster.output.root" location="${result}/output" />
<property name="buckminster.temp.root" location="${result}/temp" />
</target >
@@ -455,10 +461,7 @@
</fileset>
</copy>
- <antcall target="-generate.index" />
- <antcall target="-generate.bookmarks" />
- <antcall target="-generate.dropins" />
- <antcall target="-generate.products" />
+ <antcall target="-generate.all" />
</target>
<!-- ==== -->
@@ -479,6 +482,27 @@
</buckminster>
</target>
+ <!-- ============= -->
+ <!-- Generate Only -->
+ <!-- ============= -->
+
+ <target name="generate.only" depends="-init.properties" description="Runs the post-site.p2 generators">
+ <xmlproperty file="${hudson.WORKSPACE}/build-info.xml" prefix="build." keeproot="false" />
+ <echoproperties />
+ <antcall target="-generate.all" />
+ </target>
+
+ <!-- ============ -->
+ <!-- Generate All -->
+ <!-- ============ -->
+
+ <target name="-generate.all">
+ <antcall target="-generate.index" />
+ <antcall target="-generate.bookmarks" />
+ <antcall target="-generate.dropins" />
+ <antcall target="-generate.products" />
+ </target>
+
<!-- ============== -->
<!-- Generate Index -->
<!-- ============== -->

Back to the top