From 2fec631d04d6b16f45ba91c23c30ee584cecd42b Mon Sep 17 00:00:00 2001
From: david_williams <david_williams>
Date: Sun, 27 May 2007 06:24:24 +0000
Subject: [PATCH] small improvements
---
.../build-home/createDigests.xml | 2 +-
.../build-home/runCreateDigests.sh | 4 +---
.../build-home/runUpdateAllCallistoProjects.sh | 2 +-
.../build-home/runUpdateAllEuropaProjects.sh | 2 +-
.../build-home/runUpdateSiteXmlFiles.sh | 2 +-
5 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/org.eclipse.wtp.releng.webupdatesite/build-home/createDigests.xml b/org.eclipse.wtp.releng.webupdatesite/build-home/createDigests.xml
index 3ce622254..cfce395a5 100644
--- a/org.eclipse.wtp.releng.webupdatesite/build-home/createDigests.xml
+++ b/org.eclipse.wtp.releng.webupdatesite/build-home/createDigests.xml
@@ -35,7 +35,7 @@
<arg
line="-application org.eclipse.update.core.siteOptimizer" />
<arg
- line="-digestBuilder -digestOutputDir=${update.site} -siteXML=${update.site}/${mainSiteFileName}" />
+ line="-digestBuilder -digestOutputDir=${update.site} -siteXML=${update.site}/site.xml" />
</java>
</target>
diff --git a/org.eclipse.wtp.releng.webupdatesite/build-home/runCreateDigests.sh b/org.eclipse.wtp.releng.webupdatesite/build-home/runCreateDigests.sh
index aac01a00f..7a033b048 100644
--- a/org.eclipse.wtp.releng.webupdatesite/build-home/runCreateDigests.sh
+++ b/org.eclipse.wtp.releng.webupdatesite/build-home/runCreateDigests.sh
@@ -3,12 +3,10 @@
# script to run update, setting properties, for all projects
#updateSite=${HOME}/downloads/webtools/testUpdates
-#mainSiteFileName=siteCallisto.xml
updateSite=${HOME}/downloads/webtools/declaredUpdates
-mainSiteFileName=siteEuropa.xml
source properties.shsource
-ant -f createDigests.xml -Declipse.home=${eclipseLocation} -Dupdate.site=${updateSite} -DmainSiteFileName=${mainSiteFileName}
+ant -f createDigests.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
index 943e96e83..0e5471e08 100644
--- a/org.eclipse.wtp.releng.webupdatesite/build-home/runUpdateAllCallistoProjects.sh
+++ b/org.eclipse.wtp.releng.webupdatesite/build-home/runUpdateAllCallistoProjects.sh
@@ -36,4 +36,4 @@ ant -f ${fileListFile} -Declipse.home=${eclipseLocation} -Dupdate.site=${updat
#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} -DmainSiteFileName=${mainSiteFileName}
+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/runUpdateAllEuropaProjects.sh
index 167dfd810..6ed238516 100644
--- a/org.eclipse.wtp.releng.webupdatesite/build-home/runUpdateAllEuropaProjects.sh
+++ b/org.eclipse.wtp.releng.webupdatesite/build-home/runUpdateAllEuropaProjects.sh
@@ -37,4 +37,4 @@ ant -f ${fileListFile} -Declipse.home=${eclipseLocation} -Dupdate.site=${update
# 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} -DmainSiteFileName=${mainSiteFileName}
+ant -f createDigests.xml -Declipse.home=${eclipseLocation} -Dupdate.site=${updateSite}
diff --git a/org.eclipse.wtp.releng.webupdatesite/build-home/runUpdateSiteXmlFiles.sh b/org.eclipse.wtp.releng.webupdatesite/build-home/runUpdateSiteXmlFiles.sh
index efb64723f..172eaa7cf 100644
--- a/org.eclipse.wtp.releng.webupdatesite/build-home/runUpdateSiteXmlFiles.sh
+++ b/org.eclipse.wtp.releng.webupdatesite/build-home/runUpdateSiteXmlFiles.sh
@@ -24,6 +24,6 @@ java -jar siteFileUpdater.jar ${in_authored} ${in_newFeatures}
# copy to discovery site
# Note: here we are changing names from site specific site file name, to generic site.xml
-rsync -v -p ${in_authored} ${updateSite}/site.xml
+rsync -p ${in_authored} ${updateSite}/site.xml
rm ${in_newFeatures}
--
GitLab