Merge pull request #1266 from jim-parry/admin/prep3

Adjusting the release build scripts

admin/post_release

@@ -61,21 +61,28 @@ Version |release|
 Release Date: Not Released
 ' user_guide_src/source/changelog.rst
 
-#---------------------------------------------------
-# Merge away
-echo -e "${BOLD}Setup the develop branch${NORMAL}"
 git add .
 git commit -S -m "Post ${branch} cleanup"
+
+#---------------------------------------------------
+# Cleanup master
+echo -e "${BOLD}Cleanup the master branch${NORMAL}"
+git checkout master
+git merge ${branch}
 git push origin master
-git push UPSTREAM master
+#git push UPSTREAM master
 
+#---------------------------------------------------
+# Cleanup develop
+echo -e "${BOLD}Cleanup the develop branch${NORMAL}"
 git checkout develop
 git merge ${branch}
 git push origin develop
-git push UPSTREAM develop
+#git push UPSTREAM develop
 
 # keep or delete the release branch? up to you
-#git branch -d $branch
+# at this point, you should have uptodate develop and master,
+# as well as the release and post-release branches
 
 #---------------------------------------------------
 # Phew!

admin/release

@@ -83,6 +83,7 @@ echo -e "${BOLD}Generate the user guide${NORMAL}"
 cd user_guide_src
 
 # make the UG & embed it in the project root
+rm -rf build/*
 make html
 rm -Rf ../docs
 mv build/html ../docs
@@ -113,7 +114,6 @@ done
 git add .
 git commit -m "Release ${version}${qualifier}"
 
-
 #---------------------------------------------------
 # Done for now
 echo -e "${BOLD}Your $branch branch is ready to inspect.${NORMAL}"

admin/release.md

@@ -91,4 +91,4 @@ Complete the next few steps of the release manually:
 Once the release branch has been vetted, and you have
 completed the manual steps, clean up with:
 
-    `admin/post_release`
+    `admin/post_release version [qualifier]`

user_guide_src/source/changelog.rst

@@ -3,7 +3,7 @@ Change Log
 ##########
 
 Version |release|
-=================
+=================================
 
 Release Date: Not Released