From ea054daea9fc3d422bd1fac3e2d6360b5fe397d0 Mon Sep 17 00:00:00 2001
From: david_williams <david_williams>
Date: Sun, 27 May 2007 02:45:55 +0000
Subject: [PATCH] small improvements
---
.../build-home/eclipseLocation.shsource | 1 +
.../build-home/runCreateDigests.sh | 7 +++----
.../build-home/runCreatePack200s.sh | 2 +-
.../build-home/runUpdateAllEuropaProjects.sh | 4 ++--
.../build-home/runUpdateAllProjects.sh | 6 +-----
5 files changed, 8 insertions(+), 12 deletions(-)
create mode 100644 org.eclipse.wtp.releng.webupdatesite/build-home/eclipseLocation.shsource
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 000000000..fd68d8249
--- /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 8e32abf47..09bdb45a5 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 56b278fa5..651a128e1 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 98ec8c9cc..ccbdea61e 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 f8db0a650..8f5d976b0 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
--
GitLab