diff --git a/buildall.sh b/buildall.sh index b6e2506..de9af1a 100755 --- a/buildall.sh +++ b/buildall.sh @@ -130,9 +130,11 @@ for dir in mw-* do pushd ${dir} + old=`cat project.clj | grep 'defproject mw' | sed 's/.*defproject mw-[a-z]* "\([A-Za-z0-9_.-]*\)".*/\1/'` + cat project.clj > target/project.bak.1 + if [ "${release}" != "" ] then - old=`cat project.clj | grep 'defproject mw' | sed 's/.*defproject mw-[a-z]* "\([A-Za-z0-9_.-]*\)".*/\1/'` message="Preparing ${old} for release" # Does the 'old' version tag end with the token "-SNAPSHOT"? it probably does! @@ -146,13 +148,17 @@ do echo "Failed to compute interim version tag from '${old}'" 1>&2 exit 1; fi - cat project.clj > project.bak.1 setup-build-sig "${old}" "${interim}" "${fullname}" "${email}" - sed -f target/manifest.sed project.bak.1 > project.clj message="Upversioned from ${old} to ${interim} for release" old=${interim} + else + setup-build-sig "${old}" "${old}" "${fullname}" "${email}" fi + else + setup-build-sig "${old}" "${old}" "${fullname}" "${email}" fi + + sed -f target/manifest.sed target/project.bak.1 > project.clj echo $message @@ -174,9 +180,9 @@ do lein marg lein install - cat project.clj > project.bak.2 + cat project.clj > target/project.bak.2 setup-build-sig "${old}" - sed -f target/manifest.sed project.bak.2 > project.clj + sed -f target/manifest.sed target/project.bak.2 > project.clj if [ "${trial}" = "FALSE" ] then @@ -198,9 +204,9 @@ do git push origin "${branch}" fi - cat project.clj > project.bak.3 + cat project.clj > target/project.bak.3 setup-build-sig "${old}" "${release}-SNAPSHOT" "${fullname}" "${email}" - sed -f target/manifest.sed project.bak.3 > project.clj + sed -f target/manifest.sed target/project.bak.3 > project.clj message="Upversioned from ${interim} to ${release}-SNAPSHOT" echo $message @@ -215,9 +221,9 @@ do lein marg lein install - cat project.clj > project.bak.4 + cat project.clj > target/project.bak.4 setup-build-sig "${release}-SNAPSHOT" - sed -f target/manifest.sed project.bak.4 > project.clj + sed -f target/manifest.sed target/project.bak.4 > project.clj if [ "${trial}" = "FALSE" ] then diff --git a/project.clj b/project.clj index 1f55623..6b96967 100644 --- a/project.clj +++ b/project.clj @@ -1,13 +1,13 @@ -(defproject mw-engine "0.1.2-SNAPSHOT" +(defproject mw-engine "unset" :description "Cellular automaton world builder." :url "http://www.journeyman.cc/microworld/" :manifest { ;; do not reformat this! It is important for the buildall script ;; that each of these properties is on a line with nothing else. "build-signature-version" "unset" - "build-signature-user" "unset" - "build-signature-email" "unset" - "build-signature-timestamp" "unset" + "build-signature-user" "Simon Brooke" + "build-signature-email" "simon@journeyman.cc" + "build-signature-timestamp" "2014-07-27 11:19:57+01:00" } :license {:name "GNU General Public License v2"