[jbosstools-commits] JBoss Tools SVN: r42556 - trunk/build/target-platform.
jbosstools-commits at lists.jboss.org
jbosstools-commits at lists.jboss.org
Thu Jul 12 19:49:19 EDT 2012
Author: nickboldt
Date: 2012-07-12 19:49:18 -0400 (Thu, 12 Jul 2012)
New Revision: 42556
Modified:
trunk/build/target-platform/jbds.target
trunk/build/target-platform/multiple.target
Log:
add missing features/IUs from Eclipse 3.8 to TP; merge jbds.target and multiple.target so they're the same file
Modified: trunk/build/target-platform/jbds.target
===================================================================
--- trunk/build/target-platform/jbds.target 2012-07-12 22:26:17 UTC (rev 42555)
+++ trunk/build/target-platform/jbds.target 2012-07-12 23:49:18 UTC (rev 42556)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?><?pde version="3.6"?>
-<target includeMode="feature" name="jbds6">
+<target includeMode="feature" name="e42-wtp34-jbds6">
<!-- Pro tip: to convert
from org.eclipse.foo_4.6.0.v201005032111-777K4AkF7B77R7c7N77.jar
to <unit version="4.6.0.v201005032111-777K4AkF7B77R7c7N77" id="org.eclipse.foo.feature.group"/>
@@ -107,6 +107,8 @@
<!-- Platform: CVS, JDT, RCP, PDE, Equinox, Help -->
<unit id="com.ibm.icu.base" version="4.4.2.v20110831"/>
+ <!-- need two versions here to include org.eclipse.update.ui, which is only on the 3.8 site -->
+ <unit id="org.eclipse.platform.feature.group" version="3.8.0.v20120607-071945-9gF7jI7nG5qByXMVdkhRMWBQlF4PnDCLybDCPQ"/>
<unit id="org.eclipse.platform.feature.group" version="4.2.0.v20120608-135145-9JF7BHV8FyMteji0Oi_ePMz0xuZ8TVo7lV0z0ecb"/>
<unit id="org.eclipse.platform.ide" version="4.2.0.I20120608-1400"/>
<unit id="org.eclipse.platform.sdk" version="4.2.0.I20120608-1400"/>
@@ -130,6 +132,13 @@
<unit id="org.eclipse.rcp.feature.group" version="4.2.0.v20120528-1648-7IAPA7BrHQicRpNdOz-Obz-rlRCA"/>
<unit id="org.eclipse.pde.feature.group" version="3.8.0.v20120525-1249-7c7vFitFFt6Zr5a12MM4IKMFZ"/>
<unit id="org.eclipse.help.feature.group" version="1.4.0.v20120608-133537-8P7vFOTFK_Qj4JmDIQXL8Tn"/>
+ <!-- update.ui is on the 3.8 site, not the 4.2 site -->
+ <unit id="org.eclipse.update.ui" version="3.3.0.v20120523-1742"/>
+ <!-- there are two versions of this IU -
+ 4.2 has ./org.eclipse.update.core_3.2.600.v20120530-1204.jar and
+ 3.8 has ./org.eclipse.update.core_3.2.600.v20120530-120908.jar
+ -->
+ <unit id="org.eclipse.update.core" version="3.2.600.v20120530-120908"/>
<unit id="org.eclipse.update.core" version="3.2.600.v20120530-1204"/>
<!-- DTP -->
@@ -354,4 +363,11 @@
<unit id="com.google.gwt.eclipse.sdkbundle.e42.feature.feature.group" version="2.4.0.v201206290132-rel-r42"/>
</location>
</locations>
+ <includeBundles>
+ <!-- JBIDE-12292 include m2e.wtp like a component, rather than an upstream dependency -->
+ <feature id="org.eclipse.m2e.wtp.feature"/>
+ <feature id="org.mozilla.xulrunner.feature"/>
+ <feature id="org.mozilla.xpcom.feature"/>
+ </includeBundles>
+ <targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
</target>
Modified: trunk/build/target-platform/multiple.target
===================================================================
--- trunk/build/target-platform/multiple.target 2012-07-12 22:26:17 UTC (rev 42555)
+++ trunk/build/target-platform/multiple.target 2012-07-12 23:49:18 UTC (rev 42556)
@@ -1,12 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?><?pde version="3.6"?>
-<target includeMode="feature" name="e42-wtp34">
+<target includeMode="feature" name="e42-wtp34-jbds6">
<!-- Pro tip: to convert
from org.eclipse.foo_4.6.0.v201005032111-777K4AkF7B77R7c7N77.jar
to <unit version="4.6.0.v201005032111-777K4AkF7B77R7c7N77" id="org.eclipse.foo.feature.group"/>
using vi, apply this transform:
:%s/.\+\/\(org.\+\)_\(\d\+.\+\)\.jar/\t\t\t<unit id="\1.feature.group" version="\2"\/>/g
-->
- <!-- for trunk use _composite_/core/trunk; for 3.4_stable_branch, use _composite_/core/3.4.juno -->
<locations>
<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
<!-- don't forget to increment these files when moving up a version:
@@ -108,6 +107,8 @@
<!-- Platform: CVS, JDT, RCP, PDE, Equinox, Help -->
<unit id="com.ibm.icu.base" version="4.4.2.v20110831"/>
+ <!-- need two versions here to include org.eclipse.update.ui, which is only on the 3.8 site -->
+ <unit id="org.eclipse.platform.feature.group" version="3.8.0.v20120607-071945-9gF7jI7nG5qByXMVdkhRMWBQlF4PnDCLybDCPQ"/>
<unit id="org.eclipse.platform.feature.group" version="4.2.0.v20120608-135145-9JF7BHV8FyMteji0Oi_ePMz0xuZ8TVo7lV0z0ecb"/>
<unit id="org.eclipse.platform.ide" version="4.2.0.I20120608-1400"/>
<unit id="org.eclipse.platform.sdk" version="4.2.0.I20120608-1400"/>
@@ -131,6 +132,13 @@
<unit id="org.eclipse.rcp.feature.group" version="4.2.0.v20120528-1648-7IAPA7BrHQicRpNdOz-Obz-rlRCA"/>
<unit id="org.eclipse.pde.feature.group" version="3.8.0.v20120525-1249-7c7vFitFFt6Zr5a12MM4IKMFZ"/>
<unit id="org.eclipse.help.feature.group" version="1.4.0.v20120608-133537-8P7vFOTFK_Qj4JmDIQXL8Tn"/>
+ <!-- update.ui is on the 3.8 site, not the 4.2 site -->
+ <unit id="org.eclipse.update.ui" version="3.3.0.v20120523-1742"/>
+ <!-- there are two versions of this IU -
+ 4.2 has ./org.eclipse.update.core_3.2.600.v20120530-1204.jar and
+ 3.8 has ./org.eclipse.update.core_3.2.600.v20120530-120908.jar
+ -->
+ <unit id="org.eclipse.update.core" version="3.2.600.v20120530-120908"/>
<unit id="org.eclipse.update.core" version="3.2.600.v20120530-1204"/>
<!-- DTP -->
@@ -356,6 +364,8 @@
</location>
</locations>
<includeBundles>
+ <!-- JBIDE-12292 include m2e.wtp like a component, rather than an upstream dependency -->
+ <feature id="org.eclipse.m2e.wtp.feature"/>
<feature id="org.mozilla.xulrunner.feature"/>
<feature id="org.mozilla.xpcom.feature"/>
</includeBundles>
More information about the jbosstools-commits
mailing list