[jbosstools-commits] JBoss Tools SVN: r37375 - trunk/build/target-platform.

Author: nickboldt Date: 2011-12-15 16:05:29 -0500 (Thu, 15 Dec 2011) New Revision: 37375 Modified: trunk/build/target-platform/build.xml trunk/build/target-platform/jbds.target trunk/build/target-platform/jbds.target.p2mirror.xml trunk/build/target-platform/multiple.target trunk/build/target-platform/multiple.target.p2mirror.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: JBIDE-10289 new TP using Indigo SR1-M (maintenance and nightly builds AFTER SR1 toward SR2) Modified: trunk/build/target-platform/build.xml =================================================================== --- trunk/build/target-platform/build.xml 2011-12-15 20:29:30 UTC (rev 37374) +++ trunk/build/target-platform/build.xml 2011-12-15 21:05:29 UTC (rev 37375) @@ -145,8 +145,9 @@ <!-- NOTE: must use same platform (50M) or SDK (103M - 168M) version as feature version on target platform, or will get install/update conflicts --> <!-- don't forget to increment these files when moving up a version: build.xml, *.target*, publish.sh, target2p2mirror.xml --> - <property name="eclipse.version" value="3.7.1" /> - <property name="eclipse.URL" value="http://www.eclipse.org/downloads/download.php?r=1&amp;fil... + <!-- http://download.eclipse.org/eclipse/downloads/drops/M20111201-1437/downlo... --> + <property name="eclipse.version" value="M20111201-1437" /> + <property name="eclipse.URL" value="http://www.eclipse.org/downloads/download.php?r=1&amp;fil... <if> <equals arg1="${arch}" arg2="x86" /> Modified: trunk/build/target-platform/jbds.target =================================================================== --- trunk/build/target-platform/jbds.target 2011-12-15 20:29:30 UTC (rev 37374) +++ trunk/build/target-platform/jbds.target 2011-12-15 21:05:29 UTC (rev 37375) @@ -11,9 +11,9 @@ <!-- 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/indigo/SR1/&q... - <!-- <repository location="file:///qa/services/http/binaries/RHDS/updates/indigo/SR1/"/> --> - <!-- <repository location="http://www.qa.jboss.com/binaries/RHDS/updates/indigo/SR1/&... --> + <repository location="http://download.jboss.org/jbosstools/updates/indigo/SR1-M/... + <!-- <repository location="file:///qa/services/http/binaries/RHDS/updates/indigo/SR1-M/"/> --> + <!-- <repository location="http://www.qa.jboss.com/binaries/RHDS/updates/indigo/SR1-M... --> <!-- m2e, m2e-wtp + deps --> <unit id="org.eclipse.m2e.sdk.feature.feature.group" version="1.0.0.201106061504"/> Modified: trunk/build/target-platform/jbds.target.p2mirror.xml =================================================================== --- trunk/build/target-platform/jbds.target.p2mirror.xml 2011-12-15 20:29:30 UTC (rev 37374) +++ trunk/build/target-platform/jbds.target.p2mirror.xml 2011-12-15 21:05:29 UTC (rev 37375) @@ -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/indigo/SR1/&q... +<repository location="http://download.jboss.org/jbosstools/updates/indigo/SR1-M/... </source> <iu id="org.eclipse.m2e.sdk.feature.feature.group" version=""/> <iu id="org.eclipse.m2e.feature.feature.group" version=""/> Modified: trunk/build/target-platform/multiple.target =================================================================== --- trunk/build/target-platform/multiple.target 2011-12-15 20:29:30 UTC (rev 37374) +++ trunk/build/target-platform/multiple.target 2011-12-15 21:05:29 UTC (rev 37375) @@ -15,7 +15,7 @@ <location includeAllPlatforms="false" includeMode="planner" 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/indigo/SR1/&q... + <repository location="http://download.jboss.org/jbosstools/updates/indigo/SR1-M/... <!-- m2e, m2e-wtp + deps --> <unit id="org.eclipse.m2e.sdk.feature.feature.group" version="1.0.0.201106061504"/> Modified: trunk/build/target-platform/multiple.target.p2mirror.xml =================================================================== --- trunk/build/target-platform/multiple.target.p2mirror.xml 2011-12-15 20:29:30 UTC (rev 37374) +++ trunk/build/target-platform/multiple.target.p2mirror.xml 2011-12-15 21:05:29 UTC (rev 37375) @@ -29,7 +29,7 @@ <slicingOptions includeFeatures="true" followStrict="${followStrict}"/> <source> <repository location="http://download.jboss.org/jbosstools/builds/staging/_compo... -<repository location="http://download.jboss.org/jbosstools/updates/indigo/SR1/&q... +<repository location="http://download.jboss.org/jbosstools/updates/indigo/SR1-M/... </source> <iu id="org.eclipse.m2e.sdk.feature.feature.group" version=""/> <iu id="org.eclipse.m2e.feature.feature.group" version=""/> Modified: trunk/build/target-platform/publish.sh =================================================================== --- trunk/build/target-platform/publish.sh 2011-12-15 20:29:30 UTC (rev 37374) +++ trunk/build/target-platform/publish.sh 2011-12-15 21:05:29 UTC (rev 37375) @@ -4,10 +4,10 @@ # defaults for JBoss Tools # 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 -targetZipFile=e371-wtp331.target -repoDir=/home/hudson/static_build_env/jbds/tools/sources/REPO -destinationPath=/home/hudson/static_build_env/jbds/target-platform -DESTINATION=tools@filemgmt.jboss.org:/downloads_htdocs/tools/updates/target-platform +targetZipFile=e372M-wtp332M.target +repoDir=/home/hudson/static_build_env/jbds/tools/sources/REPO_3.3.indigo.SR1-M +destinationPath=/home/hudson/static_build_env/jbds/target-platform_3.3.indigo.SR1-M +DESTINATION=tools@filemgmt.jboss.org:/downloads_htdocs/tools/updates/target-platform_3.3.indigo.SR1-M include="*" exclude="--exclude '.blobstore'" # exclude the .blobstore @@ -21,39 +21,41 @@ '-DESTINATION') DESTINATION="$2"; shift 2;; '-include') include="$2"; shift 2;; '-exclude') exclude="$2"; shift 2;; - '-jbt_3.3.indigo') + + '-jbt_3.3.indigo.SR1-M') # defaults for JBT (trunk) - targetZipFile=e371-wtp331.target - repoDir=/home/hudson/static_build_env/jbds/tools/sources/REPO_3.3.indigo - destinationPath=/home/hudson/static_build_env/jbds/target-platform_3.3.indigo - DESTINATION=tools@filemgmt.jboss.org:/downloads_htdocs/tools/updates/target-platform_3.3.indigo + targetZipFile=e372M-wtp332M.target + repoDir=/home/hudson/static_build_env/jbds/tools/sources/REPO_3.3.indigo.SR1-M + destinationPath=/home/hudson/static_build_env/jbds/target-platform_3.3.indigo.SR1-M + DESTINATION=tools@filemgmt.jboss.org:/downloads_htdocs/tools/updates/target-platform_3.3.indigo.SR1-M include="*" exclude="--exclude '.blobstore'" # exclude the .blobstore shift 1;; - '-jbt') + '-jbt_3.3.indigo') # defaults for JBT (stable branch) targetZipFile=e371-wtp331.target - repoDir=/home/hudson/static_build_env/jbds/tools/sources/REPO - destinationPath=/home/hudson/static_build_env/jbds/target-platform - DESTINATION=tools@filemgmt.jboss.org:/downloads_htdocs/tools/updates/target-platform + repoDir=/home/hudson/static_build_env/jbds/tools/sources/REPO_3.3.indigo + destinationPath=/home/hudson/static_build_env/jbds/target-platform_3.3.indigo + DESTINATION=tools@filemgmt.jboss.org:/downloads_htdocs/tools/updates/target-platform_3.3.indigo include="*" exclude="--exclude '.blobstore'" # exclude the .blobstore shift 1;; - '-jbds_3.3.indigo') + + '-jbds_3.3.indigo.SR1-M') # defaults for JBDS (trunk) - targetZipFile=jbds500-e371-wtp331.target - repoDir=/home/hudson/static_build_env/jbds/tools/sources/JBDS-REPO_3.3.indigo - destinationPath=/home/hudson/static_build_env/jbds/jbds-target-platform_3.3.indigo - DESTINATION=/qa/services/http/binaries/RHDS/updates/jbds-target-platform_3.3.indigo + targetZipFile=jbds500-e372M-wtp332M.target + repoDir=/home/hudson/static_build_env/jbds/tools/sources/JBDS-REPO_3.3.indigo.SR1-M + destinationPath=/home/hudson/static_build_env/jbds/jbds-target-platform_3.3.indigo.SR1-M + DESTINATION=/qa/services/http/binaries/RHDS/updates/jbds-target-platform_3.3.indigo.SR1-M include=".blobstore *" # include the .blobstore exclude="" shift 1;; - '-jbds') + '-jbds_3.3.indigo') # defaults for JBDS (stable branch) targetZipFile=jbds500-e371-wtp331.target - repoDir=/home/hudson/static_build_env/jbds/tools/sources/JBDS-REPO - destinationPath=/home/hudson/static_build_env/jbds/jbds-target-platform - DESTINATION=/qa/services/http/binaries/RHDS/updates/jbds-target-platform + repoDir=/home/hudson/static_build_env/jbds/tools/sources/JBDS-REPO_3.3.indigo + destinationPath=/home/hudson/static_build_env/jbds/jbds-target-platform_3.3.indigo + DESTINATION=/qa/services/http/binaries/RHDS/updates/jbds-target-platform_3.3.indigo include=".blobstore *" # include the .blobstore exclude="" shift 1;; Modified: trunk/build/target-platform/target2p2mirror.xml =================================================================== --- trunk/build/target-platform/target2p2mirror.xml 2011-12-15 20:29:30 UTC (rev 37374) +++ trunk/build/target-platform/target2p2mirror.xml 2011-12-15 21:05:29 UTC (rev 37375) @@ -1,7 +1,7 @@ <project default="custom.build" name="jbosstools target platform p2.mirror generator"> <!-- 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 --> - <property name="targetFile" value="e371-wtp331.target" /> + <property name="targetFile" value="e372M-wtp332M.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 2011-12-15 20:29:30 UTC (rev 37374) +++ trunk/build/target-platform/targetUpdateFromRepo.xml 2011-12-15 21:05:29 UTC (rev 37375) @@ -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_... /> + <property name="unified.URL" value="http://download.jboss.org/jbosstools/updates/target-platform_... /> <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 2011-12-15 20:29:30 UTC (rev 37374) +++ trunk/build/target-platform/unified.target 2011-12-15 21:05:29 UTC (rev 37375) @@ -9,13 +9,13 @@ <locations> <location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit"> <!-- for trunk use _composite_/trunk; for 3.3_stable_branch, use _composite_/3.3.indigo --> - <repository location="http://download.jboss.org/jbosstools/updates/target-platfo... + <repository location="http://download.jboss.org/jbosstools/updates/target-platfo... </location> <location includeAllPlatforms="false" includeMode="planner" 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/target-platfo... + <repository location="http://download.jboss.org/jbosstools/updates/target-platfo... <!-- m2e, m2e-wtp + deps --> <unit id="org.eclipse.m2e.sdk.feature.feature.group" version="1.0.0.201106061504"/> Modified: trunk/build/target-platform/unified.target.p2mirror.xml =================================================================== --- trunk/build/target-platform/unified.target.p2mirror.xml 2011-12-15 20:29:30 UTC (rev 37374) +++ trunk/build/target-platform/unified.target.p2mirror.xml 2011-12-15 21:05:29 UTC (rev 37375) @@ -28,8 +28,8 @@ <p2.mirror destination="file://${repoDir}" verbose="${verbose}"> <slicingOptions includeFeatures="true" followStrict="${followStrict}"/> <source> -<repository location="http://download.jboss.org/jbosstools/updates/target-platfo... -<repository location="http://download.jboss.org/jbosstools/updates/target-platfo... +<repository location="http://download.jboss.org/jbosstools/updates/target-platfo... +<repository location="http://download.jboss.org/jbosstools/updates/target-platfo... </source> <iu id="org.eclipse.m2e.sdk.feature.feature.group" version=""/> <iu id="org.eclipse.m2e.feature.feature.group" version=""/>