From 2b925b10492c0f45cc97feda3efdf585197f5055 Mon Sep 17 00:00:00 2001
From: david_williams <david_williams>
Date: Sun, 27 May 2007 06:38:35 +0000
Subject: [PATCH] small improvements
---
.../build-home/getWTPUpdateToolsFromCVS.sh | 4 +-
.../build-home/parseSiteArg.shsource | 8 ++++
.../build-home/runCreateDigests.sh | 5 +--
.../build-home/runCreatePack200s.sh | 4 +-
.../runUpdateAllCallistoProjects.sh | 39 -------------------
...opaProjects.sh => runUpdateAllProjects.sh} | 10 +----
6 files changed, 14 insertions(+), 56 deletions(-)
delete mode 100644 org.eclipse.wtp.releng.webupdatesite/build-home/runUpdateAllCallistoProjects.sh
rename org.eclipse.wtp.releng.webupdatesite/build-home/{runUpdateAllEuropaProjects.sh => runUpdateAllProjects.sh} (84%)
diff --git a/org.eclipse.wtp.releng.webupdatesite/build-home/getWTPUpdateToolsFromCVS.sh b/org.eclipse.wtp.releng.webupdatesite/build-home/getWTPUpdateToolsFromCVS.sh
index 7a2260299..68402de91 100644
--- a/org.eclipse.wtp.releng.webupdatesite/build-home/getWTPUpdateToolsFromCVS.sh
+++ b/org.eclipse.wtp.releng.webupdatesite/build-home/getWTPUpdateToolsFromCVS.sh
@@ -30,9 +30,9 @@ echo " "
echo " screen -D -RR -h 5000"
echo " cd ${updateToolsDir}/build-home/"
echo " #for Callisto"
-echo " ./runUpdateAllCallistoProjects.sh -clean | tee out.txt"
+echo " ./runUpdateAllProjects.sh Europa -clean | tee out.txt"
echo " #for Europa"
-echo " ./runUpdateAllEuropaProjects.sh -clean | tee out.txt"
+echo " ./runUpdateAllProjects.sh Callisto -clean | tee out.txt"
echo " "
echo " When complete, be sure to inspect or at least grep the out.txt file for anomilies, e.g. "
echo " grep failed out.txt"
diff --git a/org.eclipse.wtp.releng.webupdatesite/build-home/parseSiteArg.shsource b/org.eclipse.wtp.releng.webupdatesite/build-home/parseSiteArg.shsource
index a240c8a6c..f4b8205da 100644
--- a/org.eclipse.wtp.releng.webupdatesite/build-home/parseSiteArg.shsource
+++ b/org.eclipse.wtp.releng.webupdatesite/build-home/parseSiteArg.shsource
@@ -16,11 +16,19 @@ elif [ "${1}" = "Europa" ]
then
fromDir=${HOME}/downloads/webtools/declaredUpdates
toDir=${HOME}/downloads/webtools/milestones
+ updateSite=${HOME}/downloads/webtools/declaredUpdates
+ mainSiteFileName=siteEuropa.xml
+ mainIndexFileName=indexEuropa.html
+ fileListFile=updateEuropaMirrorAll.xml
elif [ "${1}" = "Callisto" ]
then
fromDir=${HOME}/downloads/webtools/testUpdates
toDir=${HOME}/downloads/webtools/updates
+ updateSite=${HOME}/downloads/webtools/testUpdates
+ mainSiteFileName=siteCallisto.xml
+ mainIndexFileName=indexCallisto.html
+ fileListFile=updateCallistoMirrorAll.xml
else
echo ""
diff --git a/org.eclipse.wtp.releng.webupdatesite/build-home/runCreateDigests.sh b/org.eclipse.wtp.releng.webupdatesite/build-home/runCreateDigests.sh
index 7a033b048..0f77fabf7 100644
--- a/org.eclipse.wtp.releng.webupdatesite/build-home/runCreateDigests.sh
+++ b/org.eclipse.wtp.releng.webupdatesite/build-home/runCreateDigests.sh
@@ -1,12 +1,9 @@
#!/bin/sh
# script to run update, setting properties, for all projects
-
-#updateSite=${HOME}/downloads/webtools/testUpdates
-
-updateSite=${HOME}/downloads/webtools/declaredUpdates
source properties.shsource
+source parseSiteArg.shsource
ant -f createDigests.xml -Declipse.home=${eclipseLocation} -Dupdate.site=${updateSite}
diff --git a/org.eclipse.wtp.releng.webupdatesite/build-home/runCreatePack200s.sh b/org.eclipse.wtp.releng.webupdatesite/build-home/runCreatePack200s.sh
index 228334df9..3412c11db 100644
--- a/org.eclipse.wtp.releng.webupdatesite/build-home/runCreatePack200s.sh
+++ b/org.eclipse.wtp.releng.webupdatesite/build-home/runCreatePack200s.sh
@@ -2,10 +2,8 @@
# script to run update, setting properties, for all projects
-updateSite=${HOME}/downloads/webtools/testUpdates
-#updateSite=${HOME}/downloads/webtools/declaredUpdates
-
source properties.shsource
+source parseSiteArg.shsource
ant -f createPack200s.xml -Declipse.home=${eclipseLocation} -Dupdate.site=${updateSite}
diff --git a/org.eclipse.wtp.releng.webupdatesite/build-home/runUpdateAllCallistoProjects.sh b/org.eclipse.wtp.releng.webupdatesite/build-home/runUpdateAllCallistoProjects.sh
deleted file mode 100644
index 0e5471e08..000000000
--- a/org.eclipse.wtp.releng.webupdatesite/build-home/runUpdateAllCallistoProjects.sh
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/sh
-
-# script to run update, setting properties, for all projects
-
-updateSite=${HOME}/downloads/webtools/testUpdates
-
-mainSiteFileName=siteCallisto.xml
-mainIndexFileName=indexCallisto.html
-fileListFile=updateCallistoMirrorAll.xml
-
-source properties.shsource
-
-if [ "${1}" == "-clean" ] ; then
-
- echo " Removing ${updateSite}/features/"
- rm -fr ${updateSite}/features/
-
- echo " Removing ${updateSite}/plugins/"
- rm -fr ${updateSite}/plugins/
-
- echo " Removing index and site xml files"
- rm -fr ${updateSite}/*
-
- echo " Updating index and web site files, but not site xml files (yet)"
- rsync -p ${HOME}/${updateToolsDir}/WebContent/${mainIndexFileName} ${updateSite}/index.html
- rsync -p ${HOME}/${updateToolsDir}/WebContent/*.jpg ${updateSite}
-fi
-
-
-ant -f ${fileListFile} -Declipse.home=${eclipseLocation} -Dupdate.site=${updateSite}
-
-# merge authored site.xml files with the most recent auto generated one
-./runUpdateSiteXmlFiles.sh ${mainSiteFileName} ${updateSite}
-
-# do create pack's later ... takes a long time
-#ant -f createPack200s.xml -Declipse.home=${eclipseLocation} -Dupdate.site=${updateSite}
-
-# run create Digests now, it's a good check if all is well
-ant -f createDigests.xml -Declipse.home=${eclipseLocation} -Dupdate.site=${updateSite}
diff --git a/org.eclipse.wtp.releng.webupdatesite/build-home/runUpdateAllEuropaProjects.sh b/org.eclipse.wtp.releng.webupdatesite/build-home/runUpdateAllProjects.sh
similarity index 84%
rename from org.eclipse.wtp.releng.webupdatesite/build-home/runUpdateAllEuropaProjects.sh
rename to org.eclipse.wtp.releng.webupdatesite/build-home/runUpdateAllProjects.sh
index 6ed238516..48a6efaa5 100644
--- a/org.eclipse.wtp.releng.webupdatesite/build-home/runUpdateAllEuropaProjects.sh
+++ b/org.eclipse.wtp.releng.webupdatesite/build-home/runUpdateAllProjects.sh
@@ -2,16 +2,10 @@
# script to run update, setting properties, for all projects
-updateSite=${HOME}/downloads/webtools/declaredUpdates
-
-mainSiteFileName=siteEuropa.xml
-mainIndexFileName=indexEuropa.html
-fileListFile=updateEuropaMirrorAll.xml
-
source properties.shsource
+source parseSiteArg.shsource
-
-if [ "${1}" == "-clean" ] ; then
+if [ "${2}" == "-clean" ] ; then
echo " Removing ${updateSite}/features/"
rm -fr ${updateSite}/features/
--
GitLab