[525759] Use traditional qualifier format in scriptsPhoton_M3

2 files changed, 27 insertions, 25 deletions

diff --git a/releng/org.eclipse.qvto.releng.build-site/downloads.sh b/releng/org.eclipse.qvto.releng.build-site/downloads.sh
index 2fb1ddaeb..ad11a1aba 100644
--- a/releng/org.eclipse.qvto.releng.build-site/downloads.sh
+++ b/releng/org.eclipse.qvto.releng.build-site/downloads.sh
@@ -2,11 +2,11 @@
 #
 #	Promote the PUBLISH__URL to the downloads 'page'.
 #
-#	PUBLISH__URL			The zip to be published e.g. https://hudson.eclipse.org/ocl/job/ocl-photon-master/38/artifact/releng/org.eclipse.ocl.releng.build-site/target/org.eclipse.ocl-6.4.0.201710211702.zip
-#	PUBLISH__VERSION		Unqualified version e.g. 6.4.0
-#	PUBLISH__BUILD_T		Build type N/I/S, blank suppresses promotion
-#	PUBLISH__QUALIFIER		Version qualifier e.g. 201710201234
-#	PUBLISH__ALIAS			Non blank to use alias as part of final name
+#    PUBLISH__URL            The zip to be published e.g. https://hudson.eclipse.org/qvt-oml/job/qvto-photon-master/25/artifact/releng/org.eclipse.qvto.releng.build-site/target/org.eclipse.qvto-3.8.0.v20171025-1600.zip
+#    PUBLISH__VERSION        Unqualified version e.g. 3.8.0
+#    PUBLISH__BUILD_T        Build type N/I/S, blank suppresses promotion
+#    PUBLISH__QUALIFIER      Version qualifier e.g. v20171025-1600
+#    PUBLISH__ALIAS          Non blank to use alias as part of final name
 #
 dropsFolder="/home/data/httpd/download.eclipse.org/mmt/qvto/downloads/drops/"
 group="modeling.mmt.qvt-oml"
@@ -15,13 +15,14 @@ zipPrefix="mmt-qvto-Update-"
 if [ -n "${PUBLISH__BUILD_T}" ]
 then
 
-  versionFolder="${dropsFolder}${PUBLISH__VERSION}/${PUBLISH__BUILD_T}${PUBLISH__QUALIFIER}"
+  tQualifier="${PUBLISH__BUILD_T}${PUBLISH__QUALIFIER:1:8}${PUBLISH__QUALIFIER:10:4}"
+  versionFolder="${dropsFolder}${PUBLISH__VERSION}/${tQualifier}"
   if [ ! -d "${versionFolder}" ]
   then
     mkdir -p ${versionFolder}
   fi
 
-  fileStem="${PUBLISH__BUILD_T}${PUBLISH__QUALIFIER}"
+  fileStem="${tQualifier}"
   if [ -n "${PUBLISH__ALIAS}" ]
   then
     fileStem=${PUBLISH__ALIAS}
diff --git a/releng/org.eclipse.qvto.releng.build-site/updates.sh b/releng/org.eclipse.qvto.releng.build-site/updates.sh
index e26d73aa7..746bac41f 100644
--- a/releng/org.eclipse.qvto.releng.build-site/updates.sh
+++ b/releng/org.eclipse.qvto.releng.build-site/updates.sh
@@ -2,10 +2,10 @@
 #
 #    Promote the PUBLISH__URL to an updates repository.
 #
-#    PUBLISH__URL            The zip to be published e.g. https://hudson.eclipse.org/ocl/job/ocl-photon-master/38/artifact/releng/org.eclipse.ocl.releng.build-site/target/org.eclipse.ocl-6.4.0.201710211702.zip
-#    PUBLISH__VERSION        Unqualified version e.g. 6.4.0
+#    PUBLISH__URL            The zip to be published e.g. https://hudson.eclipse.org/qvt-oml/job/qvto-photon-master/25/artifact/releng/org.eclipse.qvto.releng.build-site/target/org.eclipse.qvto-3.8.0.v20171025-1600.zip
+#    PUBLISH__VERSION        Unqualified version e.g. 3.8.0
 #    PUBLISH__BUILD_T        Build type N/I/S, blank suppresses promotion
-#    PUBLISH__QUALIFIER        Version qualifier e.g. 201710201234
+#    PUBLISH__QUALIFIER        Version qualifier e.g. v20171025-1600
 #
 updatesFolder="/home/data/httpd/download.eclipse.org/mmt/qvto/updates/"
 group="modeling.mmt.qvt-oml"
@@ -42,31 +42,33 @@ then
     if [ ! -d "${PUBLISH__VERSION}" ]
     then
       mkdir ${PUBLISH__VERSION}
-      versionCompositeName="${projectName} ${buildRepoName} Repository"
+      versionCompositeName="${projectRepoName} ${buildRepoName} Repository"
       ${manageComposite} add -Dchild.repository=${PUBLISH__VERSION} -Dcomposite.name="${versionCompositeName}"
     fi
 
     if [ "${PUBLISH__BUILD_T}" = "N" ]
     then
       curl -s -k ${PUBLISH__URL} > ${localZip}
-      unzip -ou ${localZip} -d ${PUBLISH__VERSION}
-      rm ${localZip}
-
-      chgrp -R ${group} ${PUBLISH__VERSION}
-      chmod -R g+w ${PUBLISH__VERSION}
+      unzip -ou ${localZip} -d new${PUBLISH__VERSION}
+      chgrp -R ${group} new${PUBLISH__VERSION}
+      chmod -R g+w new${PUBLISH__VERSION}
+      mv ${PUBLISH__VERSION} old${PUBLISH__VERSION}
+      mv new${PUBLISH__VERSION} ${PUBLISH__VERSION}
+      rm -rf old${PUBLISH__VERSION} ${localZip}
     elif [ "${PUBLISH__BUILD_T}" = "I" ]
     then
       curl -s -k ${PUBLISH__URL} > ${localZip}
-      unzip -ou ${localZip} -d ${PUBLISH__VERSION}
-      rm ${localZip}
-
-      chgrp -R ${group} ${PUBLISH__VERSION}
-      chmod -R g+w ${PUBLISH__VERSION}
+      unzip -ou ${localZip} -d new${PUBLISH__VERSION}
+      chgrp -R ${group} new${PUBLISH__VERSION}
+      chmod -R g+w new${PUBLISH__VERSION}
+      mv ${PUBLISH__VERSION} old${PUBLISH__VERSION}
+      mv new${PUBLISH__VERSION} ${PUBLISH__VERSION}
+      rm -rf old${PUBLISH__VERSION} ${localZip}
     elif [ "${PUBLISH__BUILD_T}" = "S" ]
     then
       pushd ${buildFolder}/${PUBLISH__VERSION}
 
-        tQualifier="${PUBLISH__BUILD_T}${PUBLISH__QUALIFIER}"
+        tQualifier="${PUBLISH__BUILD_T}${PUBLISH__QUALIFIER:1:8}${PUBLISH__QUALIFIER:10:4}"
         versionFolder="${buildFolder}/${tQualifier}"
         if [ ! -d "${tQualifier}" ]
         then
@@ -77,11 +79,10 @@ then
         unzip ${localZip} -d ${tQualifier}
         rm ${localZip}
 
-        versionName="${tQualifier}"
-        ${manageComposite} add -Dchild.repository=${versionName} -Dcomposite.name="${projectName} ${PUBLISH__VERSION} ${buildRepoName} Repository"
-
         chgrp -R ${group} ${tQualifier}
         chmod -R g+w ${tQualifier}
+        ${manageComposite} add -Dchild.repository=${tQualifier} -Dcomposite.name="${projectRepoName} ${PUBLISH__VERSION} ${buildRepoName} Repository"
+
       popd
     fi