simon/mw-engine
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Still working on getting the build signature properties into the manifest.

Browse source
This commit is contained in:
Simon Brooke 2014-07-27 11:20:20 +01:00
parent 0652a9ba61
commit b500d90719
2 changed files with 19 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
buildall.sh
View file

@ -130,9 +130,11 @@ for dir in mw-*
do do
pushd ${dir} 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}" != "" ] if [ "${release}" != "" ]
then then
old=`cat project.clj | grep 'defproject mw' | sed 's/.*defproject mw-[a-z]* "\([A-Za-z0-9_.-]*\)".*/\1/'`
message="Preparing ${old} for release" message="Preparing ${old} for release"
# Does the 'old' version tag end with the token "-SNAPSHOT"? it probably does! # Does the 'old' version tag end with the token "-SNAPSHOT"? it probably does!
@ -146,14 +148,18 @@ do
echo "Failed to compute interim version tag from '${old}'" 1>&2 echo "Failed to compute interim version tag from '${old}'" 1>&2
exit 1; exit 1;
fi fi
cat project.clj > project.bak.1
setup-build-sig "${old}" "${interim}" "${fullname}" "${email}" 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" message="Upversioned from ${old} to ${interim} for release"
old=${interim} old=${interim}
else
setup-build-sig "${old}" "${old}" "${fullname}" "${email}"
fi fi
else
setup-build-sig "${old}" "${old}" "${fullname}" "${email}"
fi fi
sed -f target/manifest.sed target/project.bak.1 > project.clj
echo $message echo $message
lein clean lein clean
@ -174,9 +180,9 @@ do
lein marg lein marg
lein install lein install
cat project.clj > project.bak.2 cat project.clj > target/project.bak.2
setup-build-sig "${old}" 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" ] if [ "${trial}" = "FALSE" ]
then then
@ -198,9 +204,9 @@ do
git push origin "${branch}" git push origin "${branch}"
fi fi
cat project.clj > project.bak.3 cat project.clj > target/project.bak.3
setup-build-sig "${old}" "${release}-SNAPSHOT" "${fullname}" "${email}" 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" message="Upversioned from ${interim} to ${release}-SNAPSHOT"
echo $message echo $message
@ -215,9 +221,9 @@ do
lein marg lein marg
lein install lein install
cat project.clj > project.bak.4 cat project.clj > target/project.bak.4
setup-build-sig "${release}-SNAPSHOT" 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" ] if [ "${trial}" = "FALSE" ]
then then

8
project.clj
View file

@ -1,13 +1,13 @@
(defproject mw-engine "0.1.2-SNAPSHOT" (defproject mw-engine "unset"
:description "Cellular automaton world builder." :description "Cellular automaton world builder."
:url "http://www.journeyman.cc/microworld/" :url "http://www.journeyman.cc/microworld/"
:manifest { :manifest {
;; do not reformat this! It is important for the buildall script ;; do not reformat this! It is important for the buildall script
;; that each of these properties is on a line with nothing else. ;; that each of these properties is on a line with nothing else.
"build-signature-version" "unset" "build-signature-version" "unset"
"build-signature-user" "unset" "build-signature-user" "Simon Brooke"
"build-signature-email" "unset" "build-signature-email" "simon@journeyman.cc"
"build-signature-timestamp" "unset" "build-signature-timestamp" "2014-07-27 11:19:57+01:00"
} }
:license {:name "GNU General Public License v2" :license {:name "GNU General Public License v2"