Changed interim Javadocs folder to prevent deletion
diff --git a/Jenkinsfile b/Jenkinsfile
index 0c56c54..526375a 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -90,6 +90,7 @@
sshagent (['projects-storage.eclipse.org-bot-ssh']) {
sh '''
INTERIM=/home/data/httpd/download.eclipse.org/epsilon/interim
+ JAVADOC=/home/data/httpd/download.eclipse.org/epsilon/interim-javadoc
SITEDIR="$WORKSPACE/releng/org.eclipse.epsilon.updatesite/target"
if [ -d "$SITEDIR" ]; then
ssh genie.epsilon@projects-storage.eclipse.org rm -rf $INTERIM
@@ -98,8 +99,8 @@
fi
JAVADOCDIR="$WORKSPACE/target/site/apidocs"
if [ -d "$JAVADOCDIR" ]; then
- ssh genie.epsilon@projects-storage.eclipse.org "rm -rf $INTERIM/javadoc"
- scp -r "$JAVADOCDIR" genie.epsilon@projects-storage.eclipse.org:$INTERIM/javadoc
+ ssh genie.epsilon@projects-storage.eclipse.org "rm -rf $JAVADOC"
+ scp -r "$JAVADOCDIR" genie.epsilon@projects-storage.eclipse.org:$JAVADOC
fi
'''
}
diff --git a/build-and-test.sh b/build-and-test.sh
index da043b0..9fe3c6e 100755
--- a/build-and-test.sh
+++ b/build-and-test.sh
@@ -14,9 +14,10 @@
# mvn -f releng verify -P updatesite
# Bump versions (replace X.Y.Z with appropriate numbers)
-#mvn versions:set-property -Dproperty=epsilon.version -DnewVersion=X.Y.Z-SNAPSHOT
#mvn org.eclipse.tycho:tycho-versions-plugin:set-version -DnewVersion=X.Y.Z-SNAPSHOT
+#mvn versions:set-property -Dproperty=epsilon.version -DnewVersion=X.Y.Z-SNAPSHOT
#mvn -f pom-plain.xml versions:set -DnewVersion=X.Y.Z-SNAPSHOT
+# Remember to manually bump the MANIFEST.MF of o.e.e.target and o.e.e.test
# Query project version
#mvn help:evaluate -Dexpression=project.version -q -DforceStdout
\ No newline at end of file
diff --git a/releng/org.eclipse.epsilon.releng/new_version_tasks.sh b/releng/org.eclipse.epsilon.releng/new_version_tasks.sh
index 0441e6f..4b4f39e 100644
--- a/releng/org.eclipse.epsilon.releng/new_version_tasks.sh
+++ b/releng/org.eclipse.epsilon.releng/new_version_tasks.sh
@@ -2,33 +2,31 @@
Downloads=/home/data/httpd/download.eclipse.org/epsilon
Archives=/home/data/httpd/archive.eclipse.org/epsilon
-
+UpdatesName=updates
+JavadocsName=javadocs
+InterimVersion=interim
+InterimJavadocs=$InterimVersion-$JavadocsName
NewVersion=2.2
OldVersion=2.1
-InterimVersion=interim
echo "Moving $OldVersion..." &&
mkdir -p $Archives/$OldVersion &&
-cp -r $Downloads/updates/$OldVersion/* $Archives/$OldVersion &&
+cp -r $Downloads/$UpdatesName/$OldVersion/* $Archives/$OldVersion &&
mv $Downloads/$OldVersion/* $Archives/$OldVersion &&
rm -rf $Downloads/$OldVersion
cd $Downloads &&
-echo "Copying $InterimVersion to $NewVersion" &&
-mkdir $NewVersion &&
-cp -r $InterimVersion/* updates/$NewVersion
-if [ -e updates/$NewVersion/epsilon-${InterimVersion}-site.zip ]; then
- mv updates/$NewVersion/epsilon-${InterimVersion}-site.zip updates/$NewVersion/epsilon-${NewVersion}-site.zip
-fi
-declare -a NewFolders=("javadoc" "jars");
-for folder in "${NewFolders[@]}"; do
- if [ -d updates/$NewVersion/$folder ]; then
- mv updates/$NewVersion/$folder $NewVersion/$folder &&
- rm -rf updates/$NewVersion/$folder
- fi
-done
-
-cd updates &&
+echo "Copying update site..." &&
+mkdir -p $UpdatesName/$NewVersion &&
+cp -r $InterimVersion/* $UpdatesName/$NewVersion
+if [ -e $UpdatesName/$NewVersion/epsilon-${InterimVersion}-site.zip ]; then
+ mv $UpdatesName/$NewVersion/epsilon-${InterimVersion}-site.zip $UpdatesName/$NewVersion/epsilon-${NewVersion}-site.zip
+fi &&
+echo "Copying $JavadocsName..." &&
+mkdir -p $NewVersion/$JavadocsName &&
+cp -r $InterimJavadocs/* $NewVersion/$JavadocsName &&
+echo "Adding $NewVersion to composite..." &&
+cd $UpdatesName &&
rm -rf $NewVersion/interim &&
ant -f /shared/modeling/tools/promotion/manage-composite.xml add -Dchild.repository=$NewVersion
