diff --git a/org.eclipse.wtp.releng.webupdatesite/WebContent/siteGalileo.xml b/org.eclipse.wtp.releng.webupdatesite/WebContent/siteGalileo.xml index 77d57c138a15b872b29f2c83e6c9e37b26065b45..0823996aefcc8d31327b4d8b4a3c62c7848eb057 100644 --- a/org.eclipse.wtp.releng.webupdatesite/WebContent/siteGalileo.xml +++ b/org.eclipse.wtp.releng.webupdatesite/WebContent/siteGalileo.xml @@ -69,7 +69,7 @@ <category name="Web Tools Platform (WTP)"/> </feature> - <feature + <feature id="org.eclipse.wst.xsl.feature" url="features/org.eclipse.wst.xsl.feature_0.5.0.v200806220600-79871EC3wSUITbgY9SSF8.jar" version="0.5.0.v200806220600-79871EC3wSUITbgY9SSF8"> @@ -159,21 +159,21 @@ version="0.5.0.v200806220600-079-84DA_BHL9-VdLWdqkJcWXN4x"> <category name="Web Tools Platform (WTP)"/> - </feature> + </feature> <feature id="org.eclipse.jst.ws.cxf.feature" url="features/org.eclipse.jst.ws.cxf.feature_0.4.0.v200806220600-079-84DA_BHL9-VdLWdqkJcWXN4x.jar" version="0.4.0.v200806220600-079-84DA_BHL9-VdLWdqkJcWXN4x"> <category name="Web Tools Platform (WTP)"/> - </feature> + </feature> <feature id="org.eclipse.jst.ws.cxf_sdk.feature" url="features/org.eclipse.jst.ws.cxf_sdk.feature_0.4.0.v200806220600-079-84DA_BHL9-VdLWdqkJcWXN4x.jar" version="0.4.0.v200806220600-079-84DA_BHL9-VdLWdqkJcWXN4x"> <category name="Web Tools Platform (WTP)"/> - </feature> + </feature> <category-def label="Enabling Features" name="Enabling Features"> diff --git a/org.eclipse.wtp.releng.webupdatesite/build-home/runUpdateAllProjects.sh b/org.eclipse.wtp.releng.webupdatesite/build-home/runUpdateAllProjects.sh index 2ddf749591dccd3816d45e56233ddb84e891942b..eb71380bd0c0df863a5b892d46400032503692f9 100644 --- a/org.eclipse.wtp.releng.webupdatesite/build-home/runUpdateAllProjects.sh +++ b/org.eclipse.wtp.releng.webupdatesite/build-home/runUpdateAllProjects.sh @@ -78,6 +78,11 @@ fi ./ant.sh -f ${fileListFile} -Declipse.home=${eclipseLocation} -Dupdate.site=${testUpdateSite} +if [ "$?" -ne 0 ] +then + exit $? +fi + echo echo " merge authored site.xml files with the most recent auto generated one" echo " mainSiteFileName: " ${mainSiteFileName} @@ -85,11 +90,31 @@ echo " testUpdateSite: " ${testUpdateSite} ./runUpdateSiteXmlFiles.sh ${mainSiteFileName} ${testUpdateSite} echo +if [ "$?" -ne 0 ] +then + exit $? +fi + # do create pack's later ... takes a long time # ./ant.sh -f createPack200s.xml -Declipse.home=${eclipseLocation} -Dupdate.site=${testUpdateSite} +if [ "$?" -ne 0 ] +then + exit $? +fi + # run create Digests now, it's a good check if all is well ./ant.sh -f createDigests.xml -Declipse.home=${eclipseLocation} -Dupdate.site=${testUpdateSite} +if [ "$?" -ne 0 ] +then + exit $? +fi + # create P2 repository metadata ./ant.sh -f createP2Repo.xml -Declipse.home=${eclipseLocation} -Dupdate.site=${testUpdateSite} + +if [ "$?" -ne 0 ] +then + exit $? +fi \ No newline at end of file diff --git a/org.eclipse.wtp.releng.webupdatesite/build-home/siteFileUpdater.jar b/org.eclipse.wtp.releng.webupdatesite/build-home/siteFileUpdater.jar index dc6e7ff7abcae34170084ddc4ac02ba3313c48d2..06aaeeffecb54cddad113c8b09584be001416b68 100644 Binary files a/org.eclipse.wtp.releng.webupdatesite/build-home/siteFileUpdater.jar and b/org.eclipse.wtp.releng.webupdatesite/build-home/siteFileUpdater.jar differ diff --git a/org.eclipse.wtp.releng.webupdatesite/siteFileUpdaterDescription.jardesc b/org.eclipse.wtp.releng.webupdatesite/siteFileUpdaterDescription.jardesc index 8efeddb1994247983e39dbed34a0f69e5ad5f43b..2af3450160116e0f1310b607a3a73551d1719b34 100644 --- a/org.eclipse.wtp.releng.webupdatesite/siteFileUpdaterDescription.jardesc +++ b/org.eclipse.wtp.releng.webupdatesite/siteFileUpdaterDescription.jardesc @@ -11,18 +11,57 @@ </manifest> <selectedElements exportClassFiles="true" exportJavaFiles="true" exportOutputFolder="false"> <file path="/org.eclipse.wtp.releng.webupdatesite/.cvsignore"/> + <file path="/org.eclipse.wtp.releng.webupdatesite/build-home/features-galileo-wtp.xml"/> <javaElement handleIdentifier="=org.eclipse.wtp.releng.webupdatesite/src"/> - <folder path="/org.eclipse.wtp.releng.webupdatesite/META-INF"/> + <file path="/org.eclipse.wtp.releng.webupdatesite/siteFileUpdaterDescription.jardesc"/> + <file path="/org.eclipse.wtp.releng.webupdatesite/build-home/updateCallistoMirrorAll.xml"/> + <file path="/org.eclipse.wtp.releng.webupdatesite/build-home/createPack200s.xml"/> <folder path="/org.eclipse.wtp.releng.webupdatesite/WebContent"/> - <file path="/org.eclipse.wtp.releng.webupdatesite/plugin.properties"/> - <file path="/org.eclipse.wtp.releng.webupdatesite/siteFileUpdaterManifest.mf"/> + <file path="/org.eclipse.wtp.releng.webupdatesite/build-home/updateFinalSite.sh"/> + <file path="/org.eclipse.wtp.releng.webupdatesite/build-home/copyToFinalUpdateSite-code.sh"/> + <file path="/org.eclipse.wtp.releng.webupdatesite/build-home/features-ganymede-patches.xml"/> + <file path="/org.eclipse.wtp.releng.webupdatesite/instructions.txt"/> + <file path="/org.eclipse.wtp.releng.webupdatesite/webtools.build"/> + <file path="/org.eclipse.wtp.releng.webupdatesite/build-home/features-callisto-jem.xml"/> + <file path="/org.eclipse.wtp.releng.webupdatesite/build-home/parseSiteArg.shsource"/> + <file path="/org.eclipse.wtp.releng.webupdatesite/build-home/getWTPUpdateToolsFromCVS.sh"/> + <file path="/org.eclipse.wtp.releng.webupdatesite/build-home/features-callisto-wtp.xml"/> + <file path="/org.eclipse.wtp.releng.webupdatesite/build-home/runCreatePack200s.sh"/> + <folder path="/org.eclipse.wtp.releng.webupdatesite/META-INF"/> + <file path="/org.eclipse.wtp.releng.webupdatesite/build-home/copyToMileStone.sh"/> + <file path="/org.eclipse.wtp.releng.webupdatesite/build-home/copyToMilestoneDirectory-SiteFiles.sh"/> + <file path="/org.eclipse.wtp.releng.webupdatesite/build-home/updateEuropaMirrorAll.xml"/> + <file path="/org.eclipse.wtp.releng.webupdatesite/build-home/updateGanymedeMirrorAll.xml"/> + <file path="/org.eclipse.wtp.releng.webupdatesite/wtp.sc"/> + <file path="/org.eclipse.wtp.releng.webupdatesite/.project"/> + <file path="/org.eclipse.wtp.releng.webupdatesite/build-home/updateGalileoMirrorAll.xml"/> + <file path="/org.eclipse.wtp.releng.webupdatesite/build-home/build-featureFileCreate-Jar.xml"/> + <file path="/org.eclipse.wtp.releng.webupdatesite/build-home/copyToMilestoneDirectory-code.sh"/> + <file path="/org.eclipse.wtp.releng.webupdatesite/build-home/removeOutOfSynch.sh"/> + <file path="/org.eclipse.wtp.releng.webupdatesite/build-home/runUpdateSiteXmlFiles.sh"/> + <file path="/org.eclipse.wtp.releng.webupdatesite/build-home/updateTestUpdateSite.sh"/> <file path="/org.eclipse.wtp.releng.webupdatesite/features-galileo-wtp.xml"/> + <file path="/org.eclipse.wtp.releng.webupdatesite/plugin.properties"/> + <file path="/org.eclipse.wtp.releng.webupdatesite/build-home/createP2Repo.xml"/> + <file path="/org.eclipse.wtp.releng.webupdatesite/build-home/updateGanymedeMirrorPatches.xml"/> <file path="/org.eclipse.wtp.releng.webupdatesite/.classpath"/> - <file path="/org.eclipse.wtp.releng.webupdatesite/.project"/> + <file path="/org.eclipse.wtp.releng.webupdatesite/build-home/updateMirrorProject.xml"/> + <file path="/org.eclipse.wtp.releng.webupdatesite/build-home/copyToFinalUpdateSite-siteFiles.sh"/> + <file path="/org.eclipse.wtp.releng.webupdatesite/build-home/features-callisto-jpa.xml"/> + <folder path="/org.eclipse.wtp.releng.webupdatesite/.settings"/> + <file path="/org.eclipse.wtp.releng.webupdatesite/build-home/wtp.sc"/> + <file path="/org.eclipse.wtp.releng.webupdatesite/build-home/createMirrorSite.xml"/> + <file path="/org.eclipse.wtp.releng.webupdatesite/build-home/featureFileCreate.jar"/> + <file path="/org.eclipse.wtp.releng.webupdatesite/build-home/properties.shsource"/> + <file path="/org.eclipse.wtp.releng.webupdatesite/siteFileUpdaterManifest.mf"/> + <file path="/org.eclipse.wtp.releng.webupdatesite/build-home/runUpdateAllProjects.sh"/> + <file path="/org.eclipse.wtp.releng.webupdatesite/build-home/createMirrorFile.sh"/> + <file path="/org.eclipse.wtp.releng.webupdatesite/build-home/createDigests.xml"/> + <file path="/org.eclipse.wtp.releng.webupdatesite/build-home/ant.sh"/> + <file path="/org.eclipse.wtp.releng.webupdatesite/build-home/features-callisto-jsf.xml"/> + <file path="/org.eclipse.wtp.releng.webupdatesite/build-home/features-ganymede-wtp.xml"/> <file path="/org.eclipse.wtp.releng.webupdatesite/build.properties"/> - <file path="/org.eclipse.wtp.releng.webupdatesite/wtp.sc"/> - <file path="/org.eclipse.wtp.releng.webupdatesite/webtools.build"/> - <file path="/org.eclipse.wtp.releng.webupdatesite/instructions.txt"/> + <file path="/org.eclipse.wtp.releng.webupdatesite/build-home/features-europa-wtp.xml"/> </selectedElements> <fatjar builder="org.eclipse.jdt.ui.plain_jar_builder" launchConfig=""/> </jardesc> \ No newline at end of file diff --git a/org.eclipse.wtp.releng.webupdatesite/src/org/eclipse/wtp/releng/tools/webtools.build.xml b/org.eclipse.wtp.releng.webupdatesite/src/org/eclipse/wtp/releng/tools/webtools.build.xml index aa113b104f799d33ff1db3a92946267293c7ae63..bdaf7a2ccb5d1f07f6b082863787cba96fada77e 100644 --- a/org.eclipse.wtp.releng.webupdatesite/src/org/eclipse/wtp/releng/tools/webtools.build.xml +++ b/org.eclipse.wtp.releng.webupdatesite/src/org/eclipse/wtp/releng/tools/webtools.build.xml @@ -56,6 +56,13 @@ <category href="galileo.build#//@categories.2"/> </features> + <features + id="org.eclipse.wst.xml.feature" + version="1.0.2.v200809102023-6-7SBcMAAwAyIPHRNV" + repo="//@repositories.0"> + <category + href="galileo.build#//@categories.2"/> + </features> <features id="org.eclipse.wst.jsdt.feature" version="1.0.2.v200809102023-6-7SBcMAAwAyIPHRNV"