small improvements

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"

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 ""

org.eclipse.wtp.releng.webupdatesite/build-home/runCreateDigests.sh

 #!/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}  
 

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}
 

org.eclipse.wtp.releng.webupdatesite/build-home/runUpdateAllCallistoProjects.sh

-#!/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}  

org.eclipse.wtp.releng.webupdatesite/build-home/runUpdateAllEuropaProjects.sh → 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/