diff --git a/org.eclipse.wtp.releng.webupdatesite/build-home/createDigests.xml b/org.eclipse.wtp.releng.webupdatesite/build-home/createDigests.xml index 3ce6222549ef05ac6e6ebf5a643f7aca13ce7720..cfce395a5f596eb4bf173ddf0e4c7ad4ea6eaddd 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 aac01a00fcfd4aee9ef6976c3491b7b0ebf46ff7..7a033b048da1930935228adb762a90b99be42640 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 943e96e8364e49d1d0a3c9132d6d43528e5b5354..0e5471e08777e58f10afedc718fb7e83b0f9df0e 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 167dfd810568d228eb00b8fded6d822c663da8be..6ed2385169edd456ccc93f008f678f30ed6ecb2f 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 efb64723fb4d36753e2055a3923e02439c802860..172eaa7cf9d0e154937a6dae863cad32e2d98663 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}