diff --git a/org.eclipse.wtp.releng.webupdatesite/build-home/eclipseLocation.shsource b/org.eclipse.wtp.releng.webupdatesite/build-home/eclipseLocation.shsource new file mode 100644 index 0000000000000000000000000000000000000000..fd68d8249658c36ee16f046182a5ece181eb613b --- /dev/null +++ b/org.eclipse.wtp.releng.webupdatesite/build-home/eclipseLocation.shsource @@ -0,0 +1 @@ +eclipseLocation=${HOME}/eclipse-ppc-33M7 diff --git a/org.eclipse.wtp.releng.webupdatesite/build-home/runCreateDigests.sh b/org.eclipse.wtp.releng.webupdatesite/build-home/runCreateDigests.sh index 8e32abf47b03cf2680bcd39dbdb22662f796d7cc..09bdb45a5aa260aac649fb2b58e97b605f451931 100644 --- a/org.eclipse.wtp.releng.webupdatesite/build-home/runCreateDigests.sh +++ b/org.eclipse.wtp.releng.webupdatesite/build-home/runCreateDigests.sh @@ -2,14 +2,13 @@ # script to run update, setting properties, for all projects -updateSite=${HOME}/downloads/webtools/testUpdates -#updateSite=${HOME}/downloads/webtools/declaredUpdates +#updateSite=${HOME}/downloads/webtools/testUpdates +updateSite=${HOME}/downloads/webtools/declaredUpdates mainSiteFileName=site.xml -#mainSiteFileName=siteEuropa.xml -eclipseLocation=${HOME}/eclipse-ppc-33M7 +source eclipseLocation.shsource ant -f createDigests.xml -Declipse.home=$eclipseLocation -DupdateSite=$updateSite -DmainSiteFileName=$mainSiteFileName diff --git a/org.eclipse.wtp.releng.webupdatesite/build-home/runCreatePack200s.sh b/org.eclipse.wtp.releng.webupdatesite/build-home/runCreatePack200s.sh index 56b278fa56dd5b96617eda68c70491780332ea24..651a128e19de9aba33770f4e19eecf8dcd20d90b 100644 --- a/org.eclipse.wtp.releng.webupdatesite/build-home/runCreatePack200s.sh +++ b/org.eclipse.wtp.releng.webupdatesite/build-home/runCreatePack200s.sh @@ -5,7 +5,7 @@ updateSite=${HOME}/downloads/webtools/testUpdates #updateSite=${HOME}/downloads/webtools/declaredUpdates -eclipseLocation=${HOME}/eclipse-ppc-33M7 +source eclipseLocation.shsource ant -f createPack200s.xml -Declipse.home=$eclipseLocation -DupdateSite=$updateSite diff --git a/org.eclipse.wtp.releng.webupdatesite/build-home/runUpdateAllEuropaProjects.sh b/org.eclipse.wtp.releng.webupdatesite/build-home/runUpdateAllEuropaProjects.sh index 98ec8c9ccd0865c6501c499aadb5a3e1113474ee..ccbdea61ef1a1420cd45bff93ff0e9b555c73a4e 100644 --- a/org.eclipse.wtp.releng.webupdatesite/build-home/runUpdateAllEuropaProjects.sh +++ b/org.eclipse.wtp.releng.webupdatesite/build-home/runUpdateAllEuropaProjects.sh @@ -6,7 +6,7 @@ updateToolsDir=org.eclipse.wtp.releng.webupdatesite updateSite=${HOME}/downloads/webtools/declaredUpdates -eclipseLocation=${HOME}/eclipse-ppc-33M7 +source eclipseLocation.shsource mainSiteFileName=siteEuropa.xml @@ -37,4 +37,4 @@ ant -f updateEuropaMirrorAll.xml -Declipse.home=${eclipseLocation} -DlocalUpdat # ant -f createPack200s.xml -Declipse.home=${eclipseLocation} -DupdateSite=${updateSite} # run create Digests now, it's a good check if all is well -ant -f createDigests.xml -Declipse.home=${eclipseLocation} -DupdateSite=${updateSite} -DmainSiteFileName=${mainSiteFileName} +ant -f createDigests.xml -Declipse.home=${eclipseLocation} -DupdateSite=${updateSite} -DmainSiteFileName=site.xml diff --git a/org.eclipse.wtp.releng.webupdatesite/build-home/runUpdateAllProjects.sh b/org.eclipse.wtp.releng.webupdatesite/build-home/runUpdateAllProjects.sh index f8db0a650819773215db5bf31e9ffd83695334d1..8f5d976b07c2e56c060f4b62af5d05fac8765a3f 100644 --- a/org.eclipse.wtp.releng.webupdatesite/build-home/runUpdateAllProjects.sh +++ b/org.eclipse.wtp.releng.webupdatesite/build-home/runUpdateAllProjects.sh @@ -8,11 +8,7 @@ mainSiteFileName=siteWTPCallisto.xml updateToolsDir=org.eclipse.wtp.releng.webupdatesite - - -eclipseLocation=${HOME}/eclipse-ppc-33M7 - - +source eclipseLocation.shsource if [ "$1" == "-clean" ] ; then