Skip to content
Snippets Groups Projects
Commit b9f03b41 authored by david_williams's avatar david_williams
Browse files

prep for update site

parent cd426b7b
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 8 additions and 105 deletions
org.eclipse.wtp.releng.webupdatesite/build-home/featureFileCreate.jar
+ 0
− 0
View file @ b9f03b41
No preview for this file type
org.eclipse.wtp.releng.webupdatesite/build-home/runUpdateSiteXmlFiles.sh deleted 100644 → 0
+ 0
− 43
View file @ cd426b7b
#set variables
updateSiteFile=${1}
updateSite=${2}
source properties.shsource
# save away a clean version of this site file, produced during mirroring commands,
# with all the latest version numbers
mv ${updateSite}/site.xml ${updateSite}/.site.xml
if [ "$?" -ne "0" ]
then
exit $?
fi
# merge authored site.xml with the autogenerated one
in_authored=${HOME}/${updateToolsDir}/WebContent/${updateSiteFile}
# remember, this 'site.xml' is just the output of mirror command, when ran in context
in_newFeatures=${updateSite}/.site.xml
# merges newFeautes in to authored, back in original locaion
java -jar siteFileUpdater.jar ${in_authored} ${in_newFeatures}
if [ "$?" -ne "0" ]
then
exit $?
fi
# copy to discovery site
# Note: here we are changing names from site specific site file name, to generic site.xml
rsync -p ${in_authored} ${updateSite}/site.xml
if [ "$?" -ne "0" ]
then
exit $?
fi
rm ${in_newFeatures}
org.eclipse.wtp.releng.webupdatesite/build-home/siteFileUpdater.jar deleted 100644 → 0
+ 0
− 0
View file @ cd426b7b
File deleted
org.eclipse.wtp.releng.webupdatesite/featureFileUpdaterDescription.jardesc
+ 6
− 8
View file @ b9f03b41
......@@ -12,31 +12,29 @@
<selectedElements exportClassFiles="true" exportJavaFiles="true" exportOutputFolder="false">
<javaElement handleIdentifier="=org.eclipse.wtp.releng.webupdatesite/src"/>
<file path="/org.eclipse.wtp.releng.webupdatesite/.cvsignore"/>
<file path="/org.eclipse.wtp.releng.webupdatesite/siteFileUpdaterDescription.jardesc"/>
<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/createPack200s.xml"/>
<file path="/org.eclipse.wtp.releng.webupdatesite/build-home/copyToFinalUpdateSite-code.sh"/>
<file path="/org.eclipse.wtp.releng.webupdatesite/build-home/updateFinalSite.sh"/>
<folder path="/org.eclipse.wtp.releng.webupdatesite/WebContent"/>
<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/build-home/updateFinalSite.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/updateTestUpdateSite.sh"/>
<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/updateGanymedeMirrorPatches.xml"/>
<file path="/org.eclipse.wtp.releng.webupdatesite/build-home/createP2Repo.xml"/>
<file path="/org.eclipse.wtp.releng.webupdatesite/.classpath"/>
<file path="/org.eclipse.wtp.releng.webupdatesite/build-home/copyToFinalUpdateSite-siteFiles.sh"/>
<file path="/org.eclipse.wtp.releng.webupdatesite/build-home/updateMirrorProject.xml"/>
<file path="/org.eclipse.wtp.releng.webupdatesite/build-home/parseSiteArg.shsource"/>
<file path="/org.eclipse.wtp.releng.webupdatesite/build-home/runCreatePack200s.sh"/>
<file path="/org.eclipse.wtp.releng.webupdatesite/build-home/getWTPUpdateToolsFromCVS.sh"/>
<file path="/org.eclipse.wtp.releng.webupdatesite/build-home/copyToFinalUpdateSite-siteFiles.sh"/>
<file path="/org.eclipse.wtp.releng.webupdatesite/build-home/updateMirrorProject.xml"/>
<file path="/org.eclipse.wtp.releng.webupdatesite/build-home/copyToMilestoneDirectory-SiteFiles.sh"/>
<file path="/org.eclipse.wtp.releng.webupdatesite/build-home/createMirrorSite.xml"/>
<file path="/org.eclipse.wtp.releng.webupdatesite/build-home/properties.shsource"/>
<folder path="/org.eclipse.wtp.releng.webupdatesite/META-INF"/>
<file path="/org.eclipse.wtp.releng.webupdatesite/build-home/properties.shsource"/>
<file path="/org.eclipse.wtp.releng.webupdatesite/build-home/createMirrorSite.xml"/>
<file path="/org.eclipse.wtp.releng.webupdatesite/build-home/updateGanymedeMirrorAll.xml"/>
<file path="/org.eclipse.wtp.releng.webupdatesite/build-home/ant.sh"/>
<file path="/org.eclipse.wtp.releng.webupdatesite/build-home/createMirrorFile.sh"/>
......
org.eclipse.wtp.releng.webupdatesite/siteFileUpdaterDescription.jardesc deleted 100644 → 0
+ 0
− 52
View file @ cd426b7b
<?xml version="1.0" encoding="WINDOWS-1252"?><jardesc>
<jar path="org.eclipse.wtp.releng.webupdatesite/build-home/siteFileUpdater.jar"/>
<options buildIfNeeded="true" compress="false" descriptionLocation="/org.eclipse.wtp.releng.webupdatesite/siteFileUpdaterDescription.jardesc" exportErrors="true" exportWarnings="true" includeDirectoryEntries="false" overwrite="true" saveDescription="true" storeRefactorings="false" useSourceFolders="false"/>
<storedRefactorings deprecationInfo="true" structuralOnly="false"/>
<selectedProjects/>
<manifest generateManifest="true" mainClassHandleIdentifier="=org.eclipse.wtp.releng.webupdatesite/src&lt;org.eclipse.callisto.tools{SiteFileUpdater.java[SiteFileUpdater" manifestLocation="/org.eclipse.wtp.releng.webupdatesite/siteFileUpdaterManifest.mf" manifestVersion="1.0" reuseManifest="false" saveManifest="true" usesManifest="true">
<sealing sealJar="false">
<packagesToSeal/>
<packagesToUnSeal/>
</sealing>
</manifest>
<selectedElements exportClassFiles="true" exportJavaFiles="true" exportOutputFolder="false">
<file path="/org.eclipse.wtp.releng.webupdatesite/build-home/copyToMilestoneDirectory-code.sh"/>
<javaElement handleIdentifier="=org.eclipse.wtp.releng.webupdatesite/src"/>
<file path="/org.eclipse.wtp.releng.webupdatesite/siteFileUpdaterDescription.jardesc"/>
<file path="/org.eclipse.wtp.releng.webupdatesite/.cvsignore"/>
<file path="/org.eclipse.wtp.releng.webupdatesite/build-home/removeOutOfSynch.sh"/>
<file path="/org.eclipse.wtp.releng.webupdatesite/build-home/createPack200s.xml"/>
<file path="/org.eclipse.wtp.releng.webupdatesite/build-home/copyToFinalUpdateSite-code.sh"/>
<file path="/org.eclipse.wtp.releng.webupdatesite/build-home/updateFinalSite.sh"/>
<folder path="/org.eclipse.wtp.releng.webupdatesite/WebContent"/>
<file path="/org.eclipse.wtp.releng.webupdatesite/build-home/updateTestUpdateSite.sh"/>
<file path="/org.eclipse.wtp.releng.webupdatesite/build-home/runUpdateSiteXmlFiles.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/webtools.build"/>
<file path="/org.eclipse.wtp.releng.webupdatesite/instructions.txt"/>
<file path="/org.eclipse.wtp.releng.webupdatesite/build-home/updateGanymedeMirrorPatches.xml"/>
<file path="/org.eclipse.wtp.releng.webupdatesite/build-home/createP2Repo.xml"/>
<file path="/org.eclipse.wtp.releng.webupdatesite/.classpath"/>
<file path="/org.eclipse.wtp.releng.webupdatesite/build-home/getWTPUpdateToolsFromCVS.sh"/>
<file path="/org.eclipse.wtp.releng.webupdatesite/build-home/copyToFinalUpdateSite-siteFiles.sh"/>
<file path="/org.eclipse.wtp.releng.webupdatesite/build-home/updateMirrorProject.xml"/>
<file path="/org.eclipse.wtp.releng.webupdatesite/build-home/parseSiteArg.shsource"/>
<file path="/org.eclipse.wtp.releng.webupdatesite/build-home/runCreatePack200s.sh"/>
<file path="/org.eclipse.wtp.releng.webupdatesite/build-home/copyToMilestoneDirectory-SiteFiles.sh"/>
<file path="/org.eclipse.wtp.releng.webupdatesite/build-home/createMirrorSite.xml"/>
<file path="/org.eclipse.wtp.releng.webupdatesite/build-home/properties.shsource"/>
<file path="/org.eclipse.wtp.releng.webupdatesite/build-home/featureFileCreate.jar"/>
<folder path="/org.eclipse.wtp.releng.webupdatesite/.settings"/>
<folder path="/org.eclipse.wtp.releng.webupdatesite/META-INF"/>
<file path="/org.eclipse.wtp.releng.webupdatesite/build-home/updateGanymedeMirrorAll.xml"/>
<file path="/org.eclipse.wtp.releng.webupdatesite/build-home/ant.sh"/>
<file path="/org.eclipse.wtp.releng.webupdatesite/build-home/createMirrorFile.sh"/>
<file path="/org.eclipse.wtp.releng.webupdatesite/build-home/runUpdateAllProjects.sh"/>
<file path="/org.eclipse.wtp.releng.webupdatesite/siteFileUpdaterManifest.mf"/>
<file path="/org.eclipse.wtp.releng.webupdatesite/.project"/>
<file path="/org.eclipse.wtp.releng.webupdatesite/wtp.sc"/>
<file path="/org.eclipse.wtp.releng.webupdatesite/build-home/updateGalileoMirrorAll.xml"/>
<file path="/org.eclipse.wtp.releng.webupdatesite/build.properties"/>
</selectedElements>
</jardesc>
\ No newline at end of file
org.eclipse.wtp.releng.webupdatesite/src/org/eclipse/wtp/releng/tools/CreateFeatureUpdateFile.java
+ 2
− 2
View file @ b9f03b41
......@@ -106,7 +106,7 @@ public class CreateFeatureUpdateFile {
}
else if ("Helios".equals(stream)) {
String scfilename = rawUpdateSite + "webtools.build";
System.out.println("Creating short List for Galileo site");
System.out.println("Creating short List for Helios site");
System.out.println(" filename: " + scfilename);
doListForHelios(featuresDirectories, shortListOfInterest, scfilename);
}
......@@ -227,7 +227,7 @@ public class CreateFeatureUpdateFile {
}
private void doListForHelios(String[] featureDirectories, String[] featureOfFocus, String filename) throws IOException {
String galeleoTemplateFile = "heolios.webtools.build.xml";
String galeleoTemplateFile = "helios.webtools.build.xml";
createBuildFile(featureDirectories, featureOfFocus, filename, galeleoTemplateFile);
}
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Copyright © Eclipse Foundation, Inc. All Rights Reserved.     Privacy Policy | Terms of Use | Copyright Agent