@@ -1,3 +1,4 @@ *.pyc index.yaml .*.swp +*.zip .gitignore @@ -19,14 +19,14 @@ source version.sh -if [ ! "$tagged" ]; then +if [ ! "$git_tag" ]; then echo "This script must run on a tagged revision." >&2 echo "Current tags:" >&2 git tag | sed 's/^/ - /' >&2 exit 1 fi -package="AppEngineConsole-$app_version" +package="AppEngineConsole-$git_tag" target="$PWD/$package" zipfile="$PWD/$package.zip" @@ -37,9 +37,9 @@ set -e rm -vf "$zipfile" mkdir -p "$target" -allow_modified=1 +allow_modified=0 if [ -z "$allow_modified" ]; then - if ! git diff-index --quiet --cached "$app_version" --; then + if ! git diff-index --quiet --cached "$git_tag" --; then echo 'Error: This checkout has been modified from the tagged version' >&2 exit 1 fi @@ -58,4 +58,4 @@ cd "$target" zip -r "$zipfile" console cd .. -#rm -rf "$target" +rm -rf "$target" build.sh @@ -28,7 +28,7 @@ if [ -d "$PWD/google_appengine" ]; then PATH="$PATH:$PWD/google_appengine" fi -tagged='' +git_tag='' # For Git, the software "version" will be the timestamp of the latest # commit to the branch in the repository, unless it is a tagged version, @@ -40,7 +40,7 @@ for tag in .git/refs/tags/*; do if cat "$tag" | grep "$commit" >/dev/null; then # This is a tagged commit, so use the tag. app_version=`basename "$tag" | sed 's/\./-/g'` - tagged=yes + git_tag=`basename "$tag"` fi fi done version.sh 2d09199f8cfeb1f3ff746693f6045b96b61b2729 Jason Smith jhs@proven-corporation.com http://github.com/jhs/app-engine-console/commit/84c0bc0be5699dd319f41635040546e11389ba7d 84c0bc0be5699dd319f41635040546e11389ba7d 2008-09-05T10:59:31-07:00 2008-09-05T10:59:31-07:00 Fix the build script so the tag name is correct and unmodified 166c27ce2fbcd685015d12f6950071a38bbb7727 Jason Smith jhs@proven-corporation.com