Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarkus Knauer2010-05-19 20:23:06 +0000
committerMarkus Knauer2010-05-19 20:23:06 +0000
commit1482adf169a110807ba3d8d9c381d02756b08127 (patch)
tree96e615e2eaecfa4fd4dc7141c287ede56cc3c49f /features
parentfd89f9d1691d4f30da03b2288ecdea8e4cf0fdc6 (diff)
downloadorg.eclipse.epp.packages-1482adf169a110807ba3d8d9c381d02756b08127.tar.gz
org.eclipse.epp.packages-1482adf169a110807ba3d8d9c381d02756b08127.tar.xz
org.eclipse.epp.packages-1482adf169a110807ba3d8d9c381d02756b08127.zip
reverting + simple copy task
Diffstat (limited to 'features')
-rw-r--r--features/org.eclipse.epp.allpackages.helios.feature/build.xml10
-rw-r--r--features/org.eclipse.epp.allpackages.helios.feature/epp-tp.cquery7
2 files changed, 6 insertions, 11 deletions
diff --git a/features/org.eclipse.epp.allpackages.helios.feature/build.xml b/features/org.eclipse.epp.allpackages.helios.feature/build.xml
index e98f8185..cda9bf66 100644
--- a/features/org.eclipse.epp.allpackages.helios.feature/build.xml
+++ b/features/org.eclipse.epp.allpackages.helios.feature/build.xml
@@ -15,9 +15,7 @@
<property name="targetPlatformPath" location="${build.root}/TP" />
<property name="cquery.url" location="${basedir}/epp.cquery" />
<property name="tp.mspec" location="${basedir}/epp-tp.mspec" />
- <!--
<property name="tp-mpc.mspec" location="${basedir}/epp-tp-mpc.mspec" />
- -->
<!-- This macro executes the default application of an eclipse installation that resides
in the folder ${buildtools}/@app
@@ -104,7 +102,6 @@
<arg value="${tp.mspec}" />
</args>
</eclipse.launch>
- <!--
<eclipse.launch app="buckminster">
<args>
<jvmarg value="-Dplatform.site=${platform.site}" />
@@ -116,7 +113,12 @@
<arg value="${tp-mpc.mspec}" />
</args>
</eclipse.launch>
- -->
+ <copy todir="${targetPlatformPath}/plugins">
+ <fileset dir="${staging.site}">
+ <include name="**/plugins/org.eclipse*intro*"/>
+ <include name="**/plugins/org.eclipse*capabilities*"/>
+ </fileset>
+ </copy>
</target>
<target name="build.workspace" depends="build.tp">
diff --git a/features/org.eclipse.epp.allpackages.helios.feature/epp-tp.cquery b/features/org.eclipse.epp.allpackages.helios.feature/epp-tp.cquery
index 7a6a9c8a..620bebd7 100644
--- a/features/org.eclipse.epp.allpackages.helios.feature/epp-tp.cquery
+++ b/features/org.eclipse.epp.allpackages.helios.feature/epp-tp.cquery
@@ -1,13 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<cq:componentQuery xmlns:cq="http://www.eclipse.org/buckminster/CQuery-1.0" resourceMap="epp.rmap">
<cq:rootRequest name="org.eclipse.platform" componentType="eclipse.feature"/>
- <cq:rootRequest name="org.eclipse.epp.mpc" componentType="eclipse.feature"/>
- <cq:rootRequest name="org.eclipse.wtp.epp.package.jee.intro" componentType="osgi.bundle"/>
- <cq:rootRequest name="org.eclipse.wtp.javascript.capabilities" componentType="osgi.bundle"/>
- <cq:rootRequest name="org.eclipse.wtp.jee.capabilities" componentType="osgi.bundle"/>
- <cq:rootRequest name="org.eclipse.wtp.web.capabilities" componentType="osgi.bundle"/>
- <cq:rootRequest name="org.eclipse.wtp.xml.capabilities" componentType="osgi.bundle"/>
- <cq:rootRequest name="org.eclipse.wtp.epp.package.capabilities" componentType="osgi.bundle"/>
<cq:property key="target.arch" value="*"/>
<cq:property key="target.os" value="*"/>
<cq:property key="target.ws" value="*"/>

Back to the top