Preparing 0.1.6 for release

This commit is contained in:
Simon Brooke 2017-12-04 18:05:23 +00:00
parent 4a0c10fb7a
commit 0ad32c66ef
2 changed files with 13 additions and 8 deletions

View file

@ -17,6 +17,7 @@ release=""
tmp=buildall.tmp.$$ tmp=buildall.tmp.$$
trial="FALSE" trial="FALSE"
webappsdir="/var/lib/tomcat8/webapps" webappsdir="/var/lib/tomcat8/webapps"
gitremote="origin"
# Builds the build signature properties in the manifest map file # Builds the build signature properties in the manifest map file
# expected arguments: old version tag, version tag, full name of user, # expected arguments: old version tag, version tag, full name of user,
@ -77,7 +78,8 @@ then
-docker Build and push a Docker image. -docker Build and push a Docker image.
-email [ADDRESS] Your email address, to be recorded in the build signature. -email [ADDRESS] Your email address, to be recorded in the build signature.
-fullname [NAME] Your full name, to be recorded in the build signature. -fullname [NAME] Your full name, to be recorded in the build signature.
-pull Pull from remote git repository -git-remote [NAME] Use the specified git remote
-pull Pull from remote git repository
-release [LABEL] Build all components, branch for release on old label, then -release [LABEL] Build all components, branch for release on old label, then
upversion to new LABEL and commit to master. upversion to new LABEL and commit to master.
-trial Trial build only, do not commit. -trial Trial build only, do not commit.
@ -102,9 +104,12 @@ do
-f|-fullname) -f|-fullname)
shift; shift;
fullname=$1;; fullname=$1;;
-p|-pull) -p|-pull)
# pull from remote Git origin # pull from remote Git origin
git pull origin master;; git pull ${gitremote} master;;
-g|-git-remote)
shift;
gitremote=$1;;
-r|-release) -r|-release)
# release is branch a release and upversion to new label # release is branch a release and upversion to new label
shift; shift;
@ -229,7 +234,7 @@ do
else else
git commit -a -m "$message" git commit -a -m "$message"
fi fi
git push origin master git push ${gitremote} master
fi fi
if [ "${release}" != "" ] if [ "${release}" != "" ]
@ -238,7 +243,7 @@ do
if [ "${trial}" = "FALSE" ] if [ "${trial}" = "FALSE" ]
then then
git branch "${branch}" git branch "${branch}"
git push origin "${branch}" git push ${gitremote} "${branch}"
fi fi
cat project.clj > ${tmp}/project.bak.3 cat project.clj > ${tmp}/project.bak.3
@ -267,7 +272,7 @@ do
then then
git commit -a -m "${message}" git commit -a -m "${message}"
echo ${message} echo ${message}
git push origin master git push ${gitremote} master
fi fi
fi fi

View file

@ -1,4 +1,4 @@
(defproject mw-engine "0.1.6-SNAPSHOT" (defproject mw-engine "0.1.6"
:description "Cellular automaton world builder." :description "Cellular automaton world builder."
:url "http://www.journeyman.cc/microworld/" :url "http://www.journeyman.cc/microworld/"
:manifest { :manifest {