[jbosstools-commits] JBoss Tools SVN: r43423 - in trunk/build: target-platform and 1 other directory.
jbosstools-commits at lists.jboss.org
jbosstools-commits at lists.jboss.org
Wed Sep 5 12:32:39 EDT 2012
Author: nickboldt
Date: 2012-09-05 12:32:39 -0400 (Wed, 05 Sep 2012)
New Revision: 43423
Modified:
trunk/build/parent/pom.xml
trunk/build/target-platform/build.xml
trunk/build/target-platform/jbds.target
trunk/build/target-platform/jbds.target.p2mirror.xml
trunk/build/target-platform/local.target
trunk/build/target-platform/multiple.target
trunk/build/target-platform/multiple.target.p2mirror.xml
trunk/build/target-platform/pom.xml
trunk/build/target-platform/publish.sh
trunk/build/target-platform/target2p2mirror.xml
trunk/build/target-platform/targetUpdateFromRepo.xml
trunk/build/target-platform/unified.target
trunk/build/target-platform/unified.target.p2mirror.xml
Log:
JBDS-2250, JBIDE-12516, JBIDE-12517 prepare for new target platform SR0a to include Eclipse 4.2.1.RC2 and WTP 3.4.1, as well as new jeeeyurl theme stuff and m2e 1.2 / m2e-wtp 0.16
Modified: trunk/build/parent/pom.xml
===================================================================
--- trunk/build/parent/pom.xml 2012-09-05 15:54:29 UTC (rev 43422)
+++ trunk/build/parent/pom.xml 2012-09-05 16:32:39 UTC (rev 43423)
@@ -43,7 +43,7 @@
<target.platform.classifier.local>local</target.platform.classifier.local>
<!-- 1a. URL of latest JBT target platform site -->
- <jbosstools-target-site>http://download.jboss.org/jbosstools/updates/target-platform_4.0.juno.SR0/latest/</jbosstools-target-site>
+ <jbosstools-target-site>http://download.jboss.org/jbosstools/updates/target-platform_4.0.juno.SR0a/latest/</jbosstools-target-site>
<!-- 1b. or use -Plocal.site -Dlocal.site=file:///${HOME}/trunk/build/target-platform/REPO/ -->
<!-- TODO: don't forget to update JBDS .updatesite jobs when this value changes! -->
Modified: trunk/build/target-platform/build.xml
===================================================================
--- trunk/build/target-platform/build.xml 2012-09-05 15:54:29 UTC (rev 43422)
+++ trunk/build/target-platform/build.xml 2012-09-05 16:32:39 UTC (rev 43423)
@@ -67,7 +67,7 @@
To build an alternate target platform (eg., Juno) for JBT:
- $ ant -DtargetFile=multiple.target -DrepoDir=${WORKINGDIR}/JBT_REPO/ -Declipse.version=4.2 -Declipse.type=platform -Declipse.URL=http://www.eclipse.org/downloads/download.php?r=1\&file=/eclipse/downloads/drops4/R-4.2-201206081400/ -Dunified.URL=http://download.jboss.org/jbosstools/updates/target-platform_4.0.juno.SR0/latest/
+ $ ant -DtargetFile=multiple.target -DrepoDir=${WORKINGDIR}/JBT_REPO/ -Declipse.version=4.2 -Declipse.type=platform -Declipse.URL=http://www.eclipse.org/downloads/download.php?r=1\&file=/eclipse/downloads/drops4/R-4.2-201206081400/ -Dunified.URL=http://download.jboss.org/jbosstools/updates/target-platform_4.0.juno.SR0a/latest/
To build an alternate target platform (eg., Juno) for JBDS:
@@ -156,9 +156,12 @@
<!-- http://mirror.csclub.uwaterloo.ca/eclipse/eclipse/downloads/drops4/R-4.2-201206081400/eclipse-platform-4.2-linux-gtk-x86_64.tar.gz -->
<!-- eclipse-platform-3.8M6-linux-gtk-x86_64.tar.gz -->
<!-- eclipse-platform-3.7.2-linux-gtk-x86_64.tar.gz -->
- <property name="eclipse.version" value="4.2" />
+ <!-- <property name="eclipse.version" value="4.2" />
<property name="eclipse.type" value="platform" />
- <property name="eclipse.URL" value="http://www.eclipse.org/downloads/download.php?r=1&file=/eclipse/downloads/drops/R-4.2-201206081400/"/>
+ <property name="eclipse.URL" value="http://www.eclipse.org/downloads/download.php?r=1&file=/eclipse/downloads/drops/R-4.2-201206081400/"/> -->
+ <property name="eclipse.version" value="M20120829-1200" />
+ <property name="eclipse.type" value="platform" />
+ <property name="eclipse.URL" value="http://www.eclipse.org/downloads/download.php?r=1&file=/eclipse/downloads/drops/M20120829-1200/"/>
<if>
<equals arg1="${arch}" arg2="x86" />
Modified: trunk/build/target-platform/jbds.target
===================================================================
--- trunk/build/target-platform/jbds.target 2012-09-05 15:54:29 UTC (rev 43422)
+++ trunk/build/target-platform/jbds.target 2012-09-05 16:32:39 UTC (rev 43423)
@@ -10,7 +10,7 @@
<location includeAllPlatforms="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<!-- don't forget to increment these files when moving up a version:
build.xml, *.target*, publish.sh, target2p2mirror.xml -->
- <repository location="http://download.jboss.org/jbosstools/updates/juno/SR0/"/>
+ <repository location="http://download.jboss.org/jbosstools/updates/juno/SR0a/"/>
<!-- for these IUs we need multiple versions -->
<unit id="javax.wsdl" version="1.6.2.v201012040545"/>
Modified: trunk/build/target-platform/jbds.target.p2mirror.xml
===================================================================
--- trunk/build/target-platform/jbds.target.p2mirror.xml 2012-09-05 15:54:29 UTC (rev 43422)
+++ trunk/build/target-platform/jbds.target.p2mirror.xml 2012-09-05 16:32:39 UTC (rev 43423)
@@ -28,7 +28,7 @@
<p2.mirror destination="file://${repoDir}" verbose="${verbose}">
<slicingOptions includeFeatures="true" followStrict="${followStrict}"/>
<source>
-<repository location="http://download.jboss.org/jbosstools/updates/juno/SR0/"/>
+<repository location="http://download.jboss.org/jbosstools/updates/juno/SR0a/"/>
</source>
<iu id="javax.wsdl" version="1.6.2.v201012040545"/>
<iu id="javax.wsdl" version="1.5.1.v201012040544"/>
@@ -336,6 +336,7 @@
<iu id="org.eclipse.birt.chart.integration.wtp.feature.group" version="4.2.0.v20120613-1143-51-7w3123172402254"/>
<iu id="com.google.gdt.eclipse.suite.e42.feature.feature.group" version="3.0.1.v201206290132-rel-r42"/>
<iu id="com.google.gwt.eclipse.sdkbundle.e42.feature.feature.group" version="2.4.0.v201206290132-rel-r42"/>
+<iu id="net.jeeeyul.eclipse.themes.feature.feature.group" version="1.5.0.201209040005"/>
</p2.mirror>
</target>
</project>
Modified: trunk/build/target-platform/local.target
===================================================================
--- trunk/build/target-platform/local.target 2012-09-05 15:54:29 UTC (rev 43422)
+++ trunk/build/target-platform/local.target 2012-09-05 16:32:39 UTC (rev 43423)
@@ -315,4 +315,4 @@
<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>
\ No newline at end of file
+</target>
Modified: trunk/build/target-platform/multiple.target
===================================================================
--- trunk/build/target-platform/multiple.target 2012-09-05 15:54:29 UTC (rev 43422)
+++ trunk/build/target-platform/multiple.target 2012-09-05 16:32:39 UTC (rev 43423)
@@ -10,7 +10,7 @@
<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit" includeSource="true">
<!-- don't forget to increment these files when moving up a version:
build.xml, *.target*, publish.sh, target2p2mirror.xml -->
- <repository location="http://download.jboss.org/jbosstools/updates/juno/SR0/"/>
+ <repository location="http://download.jboss.org/jbosstools/updates/juno/SR0a/"/>
<!-- for these IUs we need multiple versions -->
<unit id="javax.wsdl" version="1.6.2.v201012040545"/>
Modified: trunk/build/target-platform/multiple.target.p2mirror.xml
===================================================================
--- trunk/build/target-platform/multiple.target.p2mirror.xml 2012-09-05 15:54:29 UTC (rev 43422)
+++ trunk/build/target-platform/multiple.target.p2mirror.xml 2012-09-05 16:32:39 UTC (rev 43423)
@@ -28,7 +28,7 @@
<p2.mirror destination="file://${repoDir}" verbose="${verbose}">
<slicingOptions includeFeatures="true" followStrict="${followStrict}"/>
<source>
-<repository location="http://download.jboss.org/jbosstools/updates/juno/SR0/"/>
+<repository location="http://download.jboss.org/jbosstools/updates/juno/SR0a/"/>
</source>
<iu id="javax.wsdl" version="1.6.2.v201012040545"/>
<iu id="javax.wsdl" version="1.5.1.v201012040544"/>
@@ -336,6 +336,7 @@
<iu id="org.eclipse.birt.chart.integration.wtp.feature.group" version="4.2.0.v20120613-1143-51-7w3123172402254"/>
<iu id="com.google.gdt.eclipse.suite.e42.feature.feature.group" version="3.0.1.v201206290132-rel-r42"/>
<iu id="com.google.gwt.eclipse.sdkbundle.e42.feature.feature.group" version="2.4.0.v201206290132-rel-r42"/>
+<iu id="net.jeeeyul.eclipse.themes.feature.feature.group" version="1.5.0.201209040005"/>
</p2.mirror>
</target>
</project>
Modified: trunk/build/target-platform/pom.xml
===================================================================
--- trunk/build/target-platform/pom.xml 2012-09-05 15:54:29 UTC (rev 43422)
+++ trunk/build/target-platform/pom.xml 2012-09-05 16:32:39 UTC (rev 43423)
@@ -14,10 +14,16 @@
<target.platform.classifier.multiple.name>multiple</target.platform.classifier.multiple.name>
<target.platform.classifier.unified.name>unified</target.platform.classifier.unified.name>
<target.platform.classifier.local.name>local</target.platform.classifier.local.name>
- <unified.URL>http://download.jboss.org/jbosstools/updates/target-platform_4.0.juno.SR0/latest/</unified.URL>
+ <unified.URL>http://download.jboss.org/jbosstools/updates/target-platform_4.0.juno.SR0a/latest/</unified.URL>
+ <eclipse.type>platform</eclipse.type>
+
+ <!--
<eclipse.version>4.2</eclipse.version>
- <eclipse.type>platform</eclipse.type>
<eclipse.URL>http://www.eclipse.org/downloads/download.php?r=1&file=/eclipse/downloads/drops4/R-4.2-201206081400/</eclipse.URL>
+ -->
+ <eclipse.version>M20120829-1200</eclipse.version>
+ <eclipse.URL>http://www.eclipse.org/downloads/download.php?r=1&file=/eclipse/downloads/drops4/M20120829-1200/</eclipse.URL>
+
<!-- Temporary before release of Tycho 0.16 -->
<!-- JBIDE-12003 -->
<tychoVersion>0.16.0-SNAPSHOT</tychoVersion>
Modified: trunk/build/target-platform/publish.sh
===================================================================
--- trunk/build/target-platform/publish.sh 2012-09-05 15:54:29 UTC (rev 43422)
+++ trunk/build/target-platform/publish.sh 2012-09-05 16:32:39 UTC (rev 43423)
@@ -5,10 +5,10 @@
# don't forget to increment these files when moving up a version:
# build.xml, *.target*, publish.sh, target2p2mirror.xml; also jbds/trunk/releng/org.jboss.ide.eclipse.releng/requirements/jbds-target-platform/build.properties;
# also all devstudio-6.0_*.updatesite jobs (4) need to be pointed at the new Target Platform URL
-targetZipFile=e420-wtp340.target
-repoDir=/home/hudson/static_build_env/jbds/tools/sources/REPO_4.0.juno.SR0
-destinationPath=/home/hudson/static_build_env/jbds/target-platform_4.0.juno.SR0
-DESTINATION=tools at filemgmt.jboss.org:/downloads_htdocs/tools/updates/target-platform_4.0.juno.SR0
+targetZipFile=e421RC2-wtp341M.target
+repoDir=/home/hudson/static_build_env/jbds/tools/sources/REPO_4.0.juno.SR0a
+destinationPath=/home/hudson/static_build_env/jbds/target-platform_4.0.juno.SR0a
+DESTINATION=tools at filemgmt.jboss.org:/downloads_htdocs/tools/updates/target-platform_4.0.juno.SR0a
include="*"
exclude="--exclude '.blobstore'" # exclude the .blobstore
@@ -23,22 +23,22 @@
'-include') include="$2"; shift 2;;
'-exclude') exclude="$2"; shift 2;;
- '-jbt_4.0.juno.SR0')
+ '-jbt_4.0.juno.SR0a')
# defaults for JBT (trunk)
- targetZipFile=e420-wtp340.target
- repoDir=/home/hudson/static_build_env/jbds/tools/sources/REPO_4.0.juno.SR0
- destinationPath=/home/hudson/static_build_env/jbds/target-platform_4.0.juno.SR0
- DESTINATION=tools at filemgmt.jboss.org:/downloads_htdocs/tools/updates/target-platform_4.0.juno.SR0
+ targetZipFile=e421RC2-wtp341M.target
+ repoDir=/home/hudson/static_build_env/jbds/tools/sources/REPO_4.0.juno.SR0a
+ destinationPath=/home/hudson/static_build_env/jbds/target-platform_4.0.juno.SR0a
+ DESTINATION=tools at filemgmt.jboss.org:/downloads_htdocs/tools/updates/target-platform_4.0.juno.SR0a
include="*"
exclude="--exclude '.blobstore'" # exclude the .blobstore
shift 1;;
- '-jbds_4.0.juno.SR0')
+ '-jbds_4.0.juno.SR0a')
# defaults for JBDS (trunk)
- targetZipFile=jbds600-e420-wtp340.target
- repoDir=/home/hudson/static_build_env/jbds/tools/sources/JBDS-REPO_4.0.juno.SR0
- destinationPath=/home/hudson/static_build_env/jbds/jbds-target-platform_4.0.juno.SR0
- DESTINATION=/qa/services/http/binaries/RHDS/updates/jbds-target-platform_4.0.juno.SR0
+ targetZipFile=jbds600-e421RC2-wtp341M.target
+ repoDir=/home/hudson/static_build_env/jbds/tools/sources/JBDS-REPO_4.0.juno.SR0a
+ destinationPath=/home/hudson/static_build_env/jbds/jbds-target-platform_4.0.juno.SR0a
+ DESTINATION=/qa/services/http/binaries/RHDS/updates/jbds-target-platform_4.0.juno.SR0a
include=".blobstore *" # include the .blobstore
exclude=""
shift 1;;
Modified: trunk/build/target-platform/target2p2mirror.xml
===================================================================
--- trunk/build/target-platform/target2p2mirror.xml 2012-09-05 15:54:29 UTC (rev 43422)
+++ trunk/build/target-platform/target2p2mirror.xml 2012-09-05 16:32:39 UTC (rev 43423)
@@ -3,7 +3,7 @@
build.xml, *.target*, publish.sh, target2p2mirror.xml; also jbds/trunk/releng/org.jboss.ide.eclipse.releng/requirements/jbds-target-platform/build.properties;
also all devstudio-5.0_*.updatesite jobs (4) need to be pointed at the new Target Platform URL -->
- <property name="targetFile" value="e420-wtp340.target" />
+ <property name="targetFile" value="e421RC2-wtp341M.target" />
<!-- if useLatest = true, omit versions from p2.mirror script to fetch latest version available;
if useLatest = false, include versions and fetch specific versions requested. -->
Modified: trunk/build/target-platform/targetUpdateFromRepo.xml
===================================================================
--- trunk/build/target-platform/targetUpdateFromRepo.xml 2012-09-05 15:54:29 UTC (rev 43422)
+++ trunk/build/target-platform/targetUpdateFromRepo.xml 2012-09-05 16:32:39 UTC (rev 43423)
@@ -12,7 +12,7 @@
<!-- create a second .target file which replaces all URLs with a single unified (published) one
(eg., for jbosstools target platform site), set these properties too -->
<property name="unified.targetFile" value="unified.target" />
- <property name="unified.URL" value="http://download.jboss.org/jbosstools/updates/target-platform_4.0.juno.SR0/latest/" />
+ <property name="unified.URL" value="http://download.jboss.org/jbosstools/updates/target-platform_4.0.juno.SR0a/latest/" />
<property name="local.targetFile" value="local.target" />
<property name="local.URL" value="file://${repoDir}" />
Modified: trunk/build/target-platform/unified.target
===================================================================
--- trunk/build/target-platform/unified.target 2012-09-05 15:54:29 UTC (rev 43422)
+++ trunk/build/target-platform/unified.target 2012-09-05 16:32:39 UTC (rev 43423)
@@ -11,7 +11,7 @@
<!-- don't forget to increment these files when moving up a version:
build.xml, *.target*, publish.sh, target2p2mirror.xml -->
<!-- for trunk use _composite_/core/trunk; for 4.0_stable_branch, use _composite_/core/4.0.juno -->
- <repository location="http://download.jboss.org/jbosstools/updates/target-platform_4.0.juno.SR0/latest/"/>
+ <repository location="http://download.jboss.org/jbosstools/updates/target-platform_4.0.juno.SR0a/latest/"/>
<!-- for these IUs we need multiple versions -->
<unit id="javax.wsdl" version="1.6.2.v201012040545"/>
Modified: trunk/build/target-platform/unified.target.p2mirror.xml
===================================================================
--- trunk/build/target-platform/unified.target.p2mirror.xml 2012-09-05 15:54:29 UTC (rev 43422)
+++ trunk/build/target-platform/unified.target.p2mirror.xml 2012-09-05 16:32:39 UTC (rev 43423)
@@ -28,7 +28,7 @@
<p2.mirror destination="file://${repoDir}" verbose="${verbose}">
<slicingOptions includeFeatures="true" followStrict="${followStrict}"/>
<source>
-<repository location="http://download.jboss.org/jbosstools/updates/target-platform_4.0.juno.SR0/latest/"/>
+<repository location="http://download.jboss.org/jbosstools/updates/target-platform_4.0.juno.SR0a/latest/"/>
</source>
<iu id="org.eclipse.m2e.sdk.feature.feature.group" version=""/>
<iu id="org.eclipse.m2e.feature.feature.group" version=""/>
More information about the jbosstools-commits
mailing list