From 9329256a74ef21a652604781bedd6468cc2ae90b Mon Sep 17 00:00:00 2001 From: david_williams <david_williams> Date: Sun, 27 May 2007 06:19:42 +0000 Subject: [PATCH] small improvements --- .../build-home/copyToRelease-SiteFiles.sh | 8 ++++---- .../build-home/runUpdateAllCallistoProjects.sh | 3 ++- .../build-home/runUpdateAllEuropaProjects.sh | 3 ++- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/org.eclipse.wtp.releng.webupdatesite/build-home/copyToRelease-SiteFiles.sh b/org.eclipse.wtp.releng.webupdatesite/build-home/copyToRelease-SiteFiles.sh index 88e29b0e5..6a8bc272c 100644 --- a/org.eclipse.wtp.releng.webupdatesite/build-home/copyToRelease-SiteFiles.sh +++ b/org.eclipse.wtp.releng.webupdatesite/build-home/copyToRelease-SiteFiles.sh @@ -6,12 +6,12 @@ source ./parseSiteArg.shsource # important: make sure digest is updated same time as site.xml's # TODO: should digest be recreated on final site? No for "exact" sites, yes, if "merged" sites. -rsync -v -p ${fromDir}/digest.zip ${toDir} +rsync -p ${fromDir}/digest.zip ${toDir} -rsync -v -p ${fromDir}/*.html ${toDir} -rsync -v -p ${fromDir}/*.jpg ${toDir} -rsync -v -p ${fromDir}/*.xml ${toDir} +rsync -p ${fromDir}/*.html ${toDir} +rsync -p ${fromDir}/*.jpg ${toDir} +rsync -p ${fromDir}/*.xml ${toDir} # Typically, as of this writing # Europa: 'declaredUpdates' to 'milestones' diff --git a/org.eclipse.wtp.releng.webupdatesite/build-home/runUpdateAllCallistoProjects.sh b/org.eclipse.wtp.releng.webupdatesite/build-home/runUpdateAllCallistoProjects.sh index a9d394fd1..6e264cb2a 100644 --- a/org.eclipse.wtp.releng.webupdatesite/build-home/runUpdateAllCallistoProjects.sh +++ b/org.eclipse.wtp.releng.webupdatesite/build-home/runUpdateAllCallistoProjects.sh @@ -6,6 +6,7 @@ updateSite=${HOME}/downloads/webtools/testUpdates mainSiteFileName=siteCallisto.xml mainIndexFileName=indexCallisto.html +fileListFile=updateCallistoMirrorAll.xml source properties.shsource @@ -26,7 +27,7 @@ if [ "${1}" == "-clean" ] ; then fi -ant -f updateCallistoMirrorAll.xml -Declipse.home=${eclipseLocation} -Dupdate.site=${updateSite} +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} diff --git a/org.eclipse.wtp.releng.webupdatesite/build-home/runUpdateAllEuropaProjects.sh b/org.eclipse.wtp.releng.webupdatesite/build-home/runUpdateAllEuropaProjects.sh index beea70cd9..0e7a50fe9 100644 --- a/org.eclipse.wtp.releng.webupdatesite/build-home/runUpdateAllEuropaProjects.sh +++ b/org.eclipse.wtp.releng.webupdatesite/build-home/runUpdateAllEuropaProjects.sh @@ -6,6 +6,7 @@ updateSite=${HOME}/downloads/webtools/declaredUpdates mainSiteFileName=siteEuropa.xml mainIndexFileName=indexEuropa.html +fileListFile=updateEuropaMirrorAll.xml source properties.shsource @@ -27,7 +28,7 @@ if [ "${1}" == "-clean" ] ; then fi -ant -f updateEuropaMirrorAll.xml -Declipse.home=${eclipseLocation} -Dupdate.site=${updateSite} +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} -- GitLab