X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?a=blobdiff_plain;f=build-sh;h=a58670428bcec4f3d8ec0e162e816a5927daa85f;hb=7123e1d34f67a8613926f3bc18691a77db040d42;hp=51c5dd1b267a418f448b6d44ce3ef48fc4d076f2;hpb=88e893f54f5eb4a2b7370d83761c790f6de37db0;p=jarrg-owen.git

diff --git a/build-sh b/build-sh
index 51c5dd1..a586704 100755
--- a/build-sh
+++ b/build-sh
@@ -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,10 +41,9 @@ 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:
- RSYNC_RSH=ssh rsync -vP $files $pubbase:$pubdir/$revision/
+ RSYNC_RSH=ssh rsync -vP $files $pubbase:$pubdir/test/
 "