Author: nickboldt Date: 2012-08-22 11:22:51 -0400 (Wed, 22 Aug 2012) New Revision: 43174 Modified: trunk/build/target-platform/build.xml trunk/build/target-platform/local.target trunk/build/target-platform/pom.xml trunk/build/target-platform/publish.sh trunk/build/target-platform/targetUpdateFromRepo.xml trunk/build/target-platform/unified.target trunk/build/target-platform/unified.target.p2mirror.xml Log: fix paths: 3.4 -> 4.0 (JBDS-1987) Modified: trunk/build/target-platform/build.xml =================================================================== --- trunk/build/target-platform/build.xml 2012-08-22 15:22:42 UTC (rev 43173) +++ trunk/build/target-platform/build.xml 2012-08-22 15:22:51 UTC (rev 43174) @@ -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\&amp;file=/eclipse/downloads/drops4/R-4.2-201206081400/ -Dunified.URL=http://download.jboss.org/jbosstools/updates/target-platform_3.4.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\&amp;file=/eclipse/downloads/drops4/R-4.2-201206081400/ -Dunified.URL=http://download.jboss.org/jbosstools/updates/target-platform_4.0.juno.SR0/latest/ To build an alternate target platform (eg., Juno) for JBDS: Modified: trunk/build/target-platform/local.target =================================================================== --- trunk/build/target-platform/local.target 2012-08-22 15:22:42 UTC (rev 43173) +++ trunk/build/target-platform/local.target 2012-08-22 15:22:51 UTC (rev 43174) @@ -6,7 +6,7 @@ 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 --> + <!-- for trunk use _composite_/core/trunk; for 3.4_stable_branch, use _composite_/core/4.0.juno --> <locations> <location includeAllPlatforms="false" includeMode="planner" includeSource="true" type="InstallableUnit"> <!-- don't forget to increment these files when moving up a version: Modified: trunk/build/target-platform/pom.xml =================================================================== --- trunk/build/target-platform/pom.xml 2012-08-22 15:22:42 UTC (rev 43173) +++ trunk/build/target-platform/pom.xml 2012-08-22 15:22:51 UTC (rev 43174) @@ -14,7 +14,7 @@ <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-platfo... + <unified.URL>http://download.jboss.org/jbosstools/updates/target-platfo... <eclipse.version>4.2</eclipse.version> <eclipse.type>platform</eclipse.type> <eclipse.URL>http://www.eclipse.org/downloads/download.php?r=1&amp;... Modified: trunk/build/target-platform/publish.sh =================================================================== --- trunk/build/target-platform/publish.sh 2012-08-22 15:22:42 UTC (rev 43173) +++ trunk/build/target-platform/publish.sh 2012-08-22 15:22:51 UTC (rev 43174) @@ -6,9 +6,9 @@ # 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_3.4.juno.SR0 -destinationPath=/home/hudson/static_build_env/jbds/target-platform_3.4.juno.SR0 -DESTINATION=tools@filemgmt.jboss.org:/downloads_htdocs/tools/updates/target-platform_3.4.juno.SR0 +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@filemgmt.jboss.org:/downloads_htdocs/tools/updates/target-platform_4.0.juno.SR0 include="*" exclude="--exclude '.blobstore'" # exclude the .blobstore @@ -23,22 +23,22 @@ '-include') include="$2"; shift 2;; '-exclude') exclude="$2"; shift 2;; - '-jbt_3.4.juno.SR0') + '-jbt_4.0.juno.SR0') # defaults for JBT (trunk) targetZipFile=e420-wtp340.target - repoDir=/home/hudson/static_build_env/jbds/tools/sources/REPO_3.4.juno.SR0 - destinationPath=/home/hudson/static_build_env/jbds/target-platform_3.4.juno.SR0 - DESTINATION=tools@filemgmt.jboss.org:/downloads_htdocs/tools/updates/target-platform_3.4.juno.SR0 + 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@filemgmt.jboss.org:/downloads_htdocs/tools/updates/target-platform_4.0.juno.SR0 include="*" exclude="--exclude '.blobstore'" # exclude the .blobstore shift 1;; - '-jbds_3.4.juno.SR0') + '-jbds_4.0.juno.SR0') # defaults for JBDS (trunk) targetZipFile=jbds600-e420-wtp340.target - repoDir=/home/hudson/static_build_env/jbds/tools/sources/JBDS-REPO_3.4.juno.SR0 - destinationPath=/home/hudson/static_build_env/jbds/jbds-target-platform_3.4.juno.SR0 - DESTINATION=/qa/services/http/binaries/RHDS/updates/jbds-target-platform_3.4.juno.SR0 + 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 include=".blobstore *" # include the .blobstore exclude="" shift 1;; Modified: trunk/build/target-platform/targetUpdateFromRepo.xml =================================================================== --- trunk/build/target-platform/targetUpdateFromRepo.xml 2012-08-22 15:22:42 UTC (rev 43173) +++ trunk/build/target-platform/targetUpdateFromRepo.xml 2012-08-22 15:22:51 UTC (rev 43174) @@ -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 2012-08-22 15:22:42 UTC (rev 43173) +++ trunk/build/target-platform/unified.target 2012-08-22 15:22:51 UTC (rev 43174) @@ -10,8 +10,8 @@ <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 --> - <!-- for trunk use _composite_/core/trunk; for 3.4_stable_branch, use _composite_/core/3.4.juno --> - <repository location="http://download.jboss.org/jbosstools/updates/target-platfo... + <!-- for trunk use _composite_/core/trunk; for 3.4_stable_branch, use _composite_/core/4.0.juno --> + <repository location="http://download.jboss.org/jbosstools/updates/target-platfo... <!-- 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-08-22 15:22:42 UTC (rev 43173) +++ trunk/build/target-platform/unified.target.p2mirror.xml 2012-08-22 15:22:51 UTC (rev 43174) @@ -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-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=""/>