Tweak release template and push the new tag

diff --git a/build.xml b/build.xml
index c70d57ebe232889165be0c4473b3033b72e45be9..1f13859b6b15d40c587917e1e4e192f654e1d4a3 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -251,10 +251,11 @@
                <!-- release -->\r
                <property name="dryrun" value="false" />\r
                <mx:version stage="release" dryrun="${dryrun}" />               \r
-               <!-- commit build.moxie & releases.moxie (automatic) and maven artifacts -->\r
+               <property name="project.tag" value="v${project.version}" />\r
+               <!-- commit build.moxie & releases.moxie (automatic) -->\r
                <mx:commit showtitle="no">\r
                    <message>Prepare ${project.version} release</message>\r
-                       <tag name="v${project.version}">\r
+                       <tag name="${project.tag}">\r
                                <message>${project.name} ${project.version} release</message>\r
                        </tag>\r
                </mx:commit>\r
@@ -279,6 +280,7 @@
                        <filterset begintoken="${dollar}{" endtoken="}">\r
                                <filter token="project.version" value="${project.version}" />\r
                                <filter token="project.commitId" value="${project.commitId}" />\r
+                               <filter token="project.tag" value="${project.tag}" />\r
                        </filterset>\r
                </copy>\r
 \r

diff --git a/release.template b/release.template
index 7b5460dedd0fbcb30bea01ed2edacb416480a6fe..0c08660719aedb06060e73c0e3ed4ced8f079e35 100644 (file)
--- a/release.template
+++ b/release.template
@@ -5,17 +5,17 @@
 \r
 # go back one commit to RELEASE commit\r
 echo ""\r
-echo "************************************************************************"\r
+echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"\r
 echo "Checking out ${project.version} RELEASE commit ${project.commitId}"\r
-echo "************************************************************************"\r
+echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"\r
 echo ""\r
 git checkout ${project.commitId}\r
 \r
 # submodules operate on a detached HEAD so we first checkout and pull master\r
 echo ""\r
-echo "************************************************************************"\r
+echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"\r
 echo "Preparing Maven submodule"\r
-echo "************************************************************************"\r
+echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"\r
 echo ""\r
 cd maven\r
 git checkout master\r
@@ -24,17 +24,17 @@ cd ..
 \r
 # build RELEASE artifacts, this will deploy artifacts into maven folder\r
 echo ""\r
-echo "************************************************************************"\r
+echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"\r
 echo "Building ${project.version} RELEASE artifacts"\r
-echo "************************************************************************"\r
+echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"\r
 echo ""\r
 ant\r
 \r
 # commit all generated artifacts and metadata in submodule\r
 echo ""\r
-echo "************************************************************************"\r
+echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"\r
 echo "Committing Maven submodule ${project.version} RELEASE artifacts"\r
-echo "************************************************************************"\r
+echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"\r
 echo ""\r
 cd  maven\r
 git add .\r
@@ -43,9 +43,9 @@ cd ..
 \r
 # Update master branch Maven submodule repository reference\r
 echo ""\r
-echo "************************************************************************"\r
+echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"\r
 echo "Updating master for Maven submodule ${project.version} RELEASE artifacts"\r
-echo "************************************************************************"\r
+echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"\r
 echo ""\r
 git checkout master\r
 git add maven\r
@@ -53,9 +53,9 @@ git commit -m "updated Maven submodule repository to ${project.version}"
 \r
 # Update gh-pages branch Maven submodule repository reference\r
 echo ""\r
-echo "************************************************************************"\r
+echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"\r
 echo "Updating gh-pages for Maven submodule ${project.version} RELEASE artifacts"\r
-echo "************************************************************************"\r
+echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"\r
 echo ""\r
 git checkout gh-pages\r
 git add maven\r
@@ -63,41 +63,41 @@ git commit -m "updated Maven submodule repository to ${project.version}"
 \r
 # return to release commit\r
 echo ""\r
-echo "************************************************************************"\r
+echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"\r
 echo "Checking out ${project.version} RELEASE commit ${project.commitId}"\r
-echo "************************************************************************"\r
+echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"\r
 echo ""\r
 git checkout ${project.commitId}\r
 \r
 # upload artifacts\r
 echo ""\r
-echo "************************************************************************"\r
+echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"\r
 echo "Uploading ${project.version} artifacts"\r
-echo "************************************************************************"\r
+echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"\r
 echo ""\r
 ant uploadArtifacts\r
 \r
 # build site, update gh-pages, and ftp upload site to hosting provider\r
 echo ""\r
-echo "************************************************************************"\r
+echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"\r
 echo "Building ${project.version} website"\r
-echo "************************************************************************"\r
+echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"\r
 echo ""\r
 ant publishSite\r
 \r
 # return to project master\r
 echo ""\r
-echo "************************************************************************"\r
+echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"\r
 echo "Checking out master"\r
-echo "************************************************************************"\r
+echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"\r
 echo ""\r
 git checkout master\r
 \r
 # push Maven submodule to origin\r
 echo ""\r
-echo "************************************************************************"\r
+echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"\r
 echo "Pushing Maven submodule"\r
-echo "************************************************************************"\r
+echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"\r
 echo ""\r
 cd maven\r
 git push origin master\r
@@ -105,11 +105,11 @@ cd ..
 \r
 # push project branches\r
 echo ""\r
-echo "************************************************************************"\r
-echo "Pushing master and gh-pages"\r
-echo "************************************************************************"\r
+echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"\r
+echo "Pushing master, gh-pages, and tag ${project.tag}"\r
+echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"\r
 echo ""\r
-git push origin master gh-pages\r
+git push origin master gh-pages tag ${project.tag}\r
 \r
 # update the Maven submodule reference\r
 git submodule update\r