prep for Galileo SR2
diff --git a/org.eclipse.wtp.releng.webupdatesite/build-home/featureFileCreate.jar b/org.eclipse.wtp.releng.webupdatesite/build-home/featureFileCreate.jar
index 0271dfc..84c01fd 100644
--- a/org.eclipse.wtp.releng.webupdatesite/build-home/featureFileCreate.jar
+++ b/org.eclipse.wtp.releng.webupdatesite/build-home/featureFileCreate.jar
Binary files differ
diff --git a/org.eclipse.wtp.releng.webupdatesite/featureFileUpdaterDescription.jardesc b/org.eclipse.wtp.releng.webupdatesite/featureFileUpdaterDescription.jardesc
index ee50a4b..4c839d7 100644
--- a/org.eclipse.wtp.releng.webupdatesite/featureFileUpdaterDescription.jardesc
+++ b/org.eclipse.wtp.releng.webupdatesite/featureFileUpdaterDescription.jardesc
@@ -25,9 +25,9 @@
<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/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/runCreatePack200s.sh"/>
+ <file path="/org.eclipse.wtp.releng.webupdatesite/build-home/parseSiteArg.shsource"/>
<file path="/org.eclipse.wtp.releng.webupdatesite/build-home/copyToFinalUpdateSite-siteFiles.sh"/>
<file path="/org.eclipse.wtp.releng.webupdatesite/build-home/updateMirrorProject.xml"/>
<folder path="/org.eclipse.wtp.releng.webupdatesite/META-INF"/>
@@ -35,9 +35,9 @@
<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/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/build-home/createMirrorFile.sh"/>
+ <file path="/org.eclipse.wtp.releng.webupdatesite/build-home/ant.sh"/>
<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.properties"/>
diff --git a/org.eclipse.wtp.releng.webupdatesite/src/org/eclipse/wtp/releng/tools/CreateFeatureUpdateFile.java b/org.eclipse.wtp.releng.webupdatesite/src/org/eclipse/wtp/releng/tools/CreateFeatureUpdateFile.java
index e6473eb..56286b5 100644
--- a/org.eclipse.wtp.releng.webupdatesite/src/org/eclipse/wtp/releng/tools/CreateFeatureUpdateFile.java
+++ b/org.eclipse.wtp.releng.webupdatesite/src/org/eclipse/wtp/releng/tools/CreateFeatureUpdateFile.java
@@ -186,11 +186,14 @@
String currentVersion = (String) currentFeatureVersions.get(featureID);
System.out.println("Substitutable value found: ");
System.out.println("featureID " + featureID);
- System.out.println("currentVersion " + currentVersion);
+
if (currentVersion != null && currentVersion.length() > 0) {
+ System.out.println("currentVersion " + currentVersion);
featureVersionNode.setNodeValue(currentVersion);
String newfeatureURL = featureURL.replace("${" + featureID + "}", currentVersion);
featureURLNode.setNodeValue(newfeatureURL);
+ } else {
+ System.out.println(" but no version in this build, so no substitution performed");
}
}