Create src/com/tedpearson/ypp/market/Version.java automatically from git revision

[jarrg-ian.git] / build-sh

diff --git a/build-sh b/build-sh
index eb3d1e2e2da1e38324cfa60e0ddfcc96b3670839..1c0a975f1b12620db510f8f1040122fa1a1f9aec 100755 (executable)
--- a/build-sh
+++ b/build-sh
@@ -5,7 +5,7 @@
 set -e
 
 case "$#.$1" in
-0)     ;;
+0.)    ;;
 *.-*)  echo >&2 'no options allowed'; exit 1;;
 *)     echo >&2 'no arguments allowed'; exit 1;;
 esac
@@ -13,13 +13,23 @@ esac
 : ${JAVA_HOME:=/usr/lib/jvm/java-6-sun}
 export JAVA_HOME
 
-(set -e; cd src; ant -f PCTB.xml)
+revision=`git describe --always || echo '(unknown revision)'`
+cat >src/com/tedpearson/ypp/market/Version.java <<END
+  package com.tedpearson.ypp.market;
+  public class Version {
+      public final static String version = "$revision";
+  }
+END
+
+cd src
+ant -f PCTB.xml
+cd ..
 
 echo "
 Building tarball
 "
 
-GZIP=-9v tar --exclude=\*{~,.tar.gz,.exe} --exclude='#*#' \
+GZIP='-9v --rsyncable' tar --exclude=\*{~,.tar.gz,.exe} --exclude='#*#' \
   --transform='s/^./jpctb/' --exclude=jpctb/{src/build,tmp} \
   -zcf jpctb.tar.gz .
 
@@ -31,8 +41,7 @@ Generated OK:
 ls -al $files
 
 pubbase="${JPCTB_PUBLISH_BASE-login.chiark.greenend.org.uk}"
-pubdir="${JPCTB_PUBLISH_DIR-/home/yarrgweb/public-html/jpctb}"
-revision=`git describe --always`
+pubdir="${JPCTB_PUBLISH_DIR-/home/yarrgweb/public-html/download/jpctb}"
 
 echo "
 Install with: