From 61d10b04c761e94da4c4501a31bee9f1e163f49c Mon Sep 17 00:00:00 2001 From: Martin Oberhuber < martin.oberhuber@windriver.com> Date: Mon, 3 Jan 2011 21:30:41 +0000 Subject: [PATCH] [releng] Build on tools - fix download and update site references --- .../bin/mkTestUpdates.sh | 34 +++++++++---------- releng/org.eclipse.rse.updatesite/index.html | 10 +++--- releng/org.eclipse.rse.updatesite/site.xml | 8 ++--- 3 files changed, 26 insertions(+), 26 deletions(-) diff --git a/releng/org.eclipse.rse.updatesite/bin/mkTestUpdates.sh b/releng/org.eclipse.rse.updatesite/bin/mkTestUpdates.sh index 9da567a69f9..ab000c76382 100755 --- a/releng/org.eclipse.rse.updatesite/bin/mkTestUpdates.sh +++ b/releng/org.eclipse.rse.updatesite/bin/mkTestUpdates.sh @@ -131,11 +131,11 @@ if [ ${TYPE} = test ]; then ## rm f1.$$.txt f2.$$.txt p1.$$.txt p2.$$.txt rm index.html site.xml web/site.xsl cvs -q update -dPR - sed -e "s,/dsdp/tm/updates/2.0,/dsdp/tm/${SITEDIR},g" \ + sed -e "s,/tm/updates/2.0,/tm/${SITEDIR},g" \ -e "s,Project 2.0 Update,Project ${TPTYPE} Update,g" \ index.html > index.html.new mv -f index.html.new index.html - sed -e "s,/dsdp/tm/updates/2.0,/dsdp/tm/${SITEDIR},g" \ + sed -e "s,/tm/updates/2.0,/tm/${SITEDIR},g" \ -e "s,Project 2.0 Update,Project ${TPTYPE} Update,g" \ -e '//,//d' \ -e '//,//d' \ @@ -265,11 +265,11 @@ elif [ ${TYPE} = testSigned ]; then fi rm index.html site.xml web/site.xsl cvs -q update -dPR - sed -e "s,/dsdp/tm/updates/2.0,/dsdp/tm/${SITEDIR},g" \ + sed -e "s,/tm/updates/2.0,/tm/${SITEDIR},g" \ -e "s,Project 2.0 Update,Project ${TPTYPE} Update,g" \ index.html > index.html.new mv -f index.html.new index.html - sed -e "s,/dsdp/tm/updates/2.0,/dsdp/tm/${SITEDIR},g" \ + sed -e "s,/tm/updates/2.0,/tm/${SITEDIR},g" \ -e "s,Project 2.0 Update,Project ${TPTYPE} Update,g" \ -e '//,//d' \ -e '//,//d' \ @@ -286,16 +286,16 @@ elif [ ${TYPE} = milestone ]; then stamp=`date +'%Y%m%d-%H%M'` rm index.html site.xml web/site.xsl cvs -q update -dPR - sed -e "s,/dsdp/tm/updates/2.0,/dsdp/tm/updates/${SITEDIR},g" \ + sed -e "s,/tm/updates/2.0,/tm/updates/${SITEDIR},g" \ -e "s,Project 2.0 Update,Project ${TPTYPE} Update,g" \ -e '\,,a\ This site contains Target Management Milestones (I-, S- and M- builds) which are \ -being contributed to the Galileo coordinated release train (Eclipse 3.5.x).' \ +being contributed to the Eclipse Indigo coordinated release train (Eclipse 3.7.x).' \ index.html > index.html.new mv -f index.html.new index.html ## keep 3.0.x features in site.xml ## -e '//,//d' \ - sed -e "s,/dsdp/tm/updates/2.0,/dsdp/tm/updates/${SITEDIR},g" \ + sed -e "s,/tm/updates/2.0,/tm/updates/${SITEDIR},g" \ -e "s,Project 2.0 Update,Project ${TPTYPE} Update,g" \ -e '//,//d' \ -e '//,//d' \ @@ -312,7 +312,7 @@ elif [ ${TYPE} = interim ]; then stamp=`date +'%Y%m%d-%H%M'` rm index.html site.xml web/site.xsl cvs -q update -dPR - sed -e "s,/dsdp/tm/updates/2.0,/dsdp/tm/updates/${SITEDIR},g" \ + sed -e "s,/tm/updates/2.0,/tm/updates/${SITEDIR},g" \ -e "s,Project 2.0 Update,Project ${TPTYPE} Update,g" \ -e '\,,a\ This site contains Target Management Interim Maintenance builds (I-, S-, and M-builds) in order \ @@ -321,7 +321,7 @@ to test them before going live.' \ mv -f index.html.new index.html ## keep 2.0.x features in site.xml ## -e '//,//d' \ - sed -e "s,/dsdp/tm/updates/2.0,/dsdp/tm/updates/${SITEDIR},g" \ + sed -e "s,/tm/updates/2.0,/tm/updates/${SITEDIR},g" \ -e "s,Project 2.0 Update,Project ${TPTYPE} Update,g" \ -e '//,//d' \ -e '//,//d' \ @@ -339,7 +339,7 @@ elif [ `basename $SITE` = 3.0 ]; then stamp=`date +'%Y%m%d-%H%M'` rm index.html site.xml web/site.xsl cvs -q update -dPR - sed -e "s,/dsdp/tm/updates/2.0,/dsdp/tm/updates/${SITEDIR},g" \ + sed -e "s,/tm/updates/2.0,/tm/updates/${SITEDIR},g" \ -e "s,Project 2.0 Update,Project ${TPTYPE} Update,g" \ -e '\,,a\ This site contains Target Management 3.0 Releases and Updates (R- builds) which are \ @@ -347,7 +347,7 @@ being contributed to the Ganymede coordinated release train (Eclipse 3.4).' \ index.html > index.html.new mv -f index.html.new index.html ## dont keep 2.0.x features in site.xml - sed -e "s,/dsdp/tm/updates/2.0,/dsdp/tm/updates/${SITEDIR},g" \ + sed -e "s,/tm/updates/2.0,/tm/updates/${SITEDIR},g" \ -e "s,Project 2.0 Update,Project ${TPTYPE} Update,g" \ -e '//,//d' \ -e '//,//d' \ @@ -366,7 +366,7 @@ elif [ `basename $SITE` = 3.1 ]; then stamp=`date +'%Y%m%d-%H%M'` rm index.html site.xml web/site.xsl cvs -q update -dPR - sed -e "s,/dsdp/tm/updates/2.0,/dsdp/tm/updates/${SITEDIR},g" \ + sed -e "s,/tm/updates/2.0,/tm/updates/${SITEDIR},g" \ -e "s,Project 2.0 Update,Project ${TPTYPE} Update,g" \ -e '\,,a\ This site contains Target Management 3.1 Releases and Updates (R- builds) which are \ @@ -374,7 +374,7 @@ being contributed to the Galileo coordinated release train (Eclipse 3.5).' \ index.html > index.html.new mv -f index.html.new index.html ## dont keep 2.0.x features in site.xml - sed -e "s,/dsdp/tm/updates/2.0,/dsdp/tm/updates/${SITEDIR},g" \ + sed -e "s,/tm/updates/2.0,/tm/updates/${SITEDIR},g" \ -e "s,Project 2.0 Update,Project ${TPTYPE} Update,g" \ -e '//,//d' \ -e '//,//d' \ @@ -393,15 +393,15 @@ elif [ `basename $SITE` = 3.2 ]; then stamp=`date +'%Y%m%d-%H%M'` rm index.html site.xml web/site.xsl cvs -q update -dPR - sed -e "s,/dsdp/tm/updates/2.0,/dsdp/tm/updates/${SITEDIR},g" \ + sed -e "s,/tm/updates/2.0,/tm/updates/${SITEDIR},g" \ -e "s,Project 2.0 Update,Project ${TPTYPE} Update,g" \ -e '\,,a\ This site contains Target Management 3.2 Releases and Updates (R- builds) which are \ -being contributed to the Helios coordinated release train (Eclipse 3.6).' \ +being contributed to the Eclipse Helios coordinated release train (Eclipse 3.6.x).' \ index.html > index.html.new mv -f index.html.new index.html ## dont keep 2.0.x features in site.xml - sed -e "s,/dsdp/tm/updates/2.0,/dsdp/tm/updates/${SITEDIR},g" \ + sed -e "s,/tm/updates/2.0,/tm/updates/${SITEDIR},g" \ -e "s,Project 2.0 Update,Project ${TPTYPE} Update,g" \ -e '//,//d' \ site.xml > site.xml.new @@ -499,7 +499,7 @@ if [ x${DO_STATS} = x1 ]; then -metadataRepository file:${SITE} \ -artifactRepository file:${SITE} \ -compress \ - -p2.statsURI http://download.eclipse.org/stats/dsdp/tm \ + -p2.statsURI http://download.eclipse.org/stats/tm \ -p2.statsTrackedFeatures org.eclipse.rse.sdk,org.eclipse.rse.dstore,org.eclipse.rse.core,org.eclipse.rse.useractions,org.eclipse.rse.examples,org.eclipse.rse.tests,org.eclipse.rse.wince,org.eclipse.tm.terminal.view,org.eclipse.tm.terminal.local \ -p2.statsTrackedBundles org.eclipse.rse.core,org.eclipse.rse.core.source,org.eclipse.tm.terminal \ -p2.statsSuffix _tm330 diff --git a/releng/org.eclipse.rse.updatesite/index.html b/releng/org.eclipse.rse.updatesite/index.html index 0bfdcea12cf..5b8756145be 100644 --- a/releng/org.eclipse.rse.updatesite/index.html +++ b/releng/org.eclipse.rse.updatesite/index.html @@ -55,14 +55,14 @@
- - [RSE Sample Screenshot] + + [RSE Sample Screenshot]

Target Management Project 2.0 Updates

Just getting started?

-

See http://www.eclipse.org/dsdp/tm/tutorial/

+

See http://www.eclipse.org/tm/tutorial/

For getting the software on this site, you need to use the Eclipse @@ -70,12 +70,12 @@ in Eclipse 3.3 or later).
Define a new remote update site named "Target Management Updates", and specify

-

   http://download.eclipse.org/dsdp/tm/updates/2.0/

+

   http://download.eclipse.org/tm/updates/2.0/

as the URL to use. See Eclipse Help for general information about using Update Manager.

If you do not have Eclipse installed yet, better use the - downloads from this site.

+ downloads from this site.

diff --git a/releng/org.eclipse.rse.updatesite/site.xml b/releng/org.eclipse.rse.updatesite/site.xml index cfc2e732784..71e9917ec1d 100644 --- a/releng/org.eclipse.rse.updatesite/site.xml +++ b/releng/org.eclipse.rse.updatesite/site.xml @@ -11,10 +11,10 @@ --> - - + mirrorsURL="http://www.eclipse.org/downloads/download.php?file=/tm/updates/2.0/site.xml&format=xml&protocol=http" + digestURL="http://download.eclipse.org/tm/updates/2.0/"> + + This is the Target Management Project 2.0 Update Site.