X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=jarrg-ian.git;a=blobdiff_plain;f=build-sh;h=a60db93f5b52395605f3f9403e314da4bb8d96d6;hp=d4687dcc99401570ec92bc8f53bed0f6a0d5a962;hb=4fafee175ff0e0284f207f72aa203f9b6450aff5;hpb=e8459ec6e6842f98a1185dc0dce1e8f9b6712003

diff --git a/build-sh b/build-sh
index d4687dc..a60db93 100755
--- a/build-sh
+++ b/build-sh
@@ -13,6 +13,21 @@ esac
 : ${JAVA_HOME:=/usr/lib/jvm/java-6-sun}
 export JAVA_HOME
 
+revision=`git describe --always || echo '(unknown revision)'`
+if [ x"`git diff 2>/dev/null || echo x`" != x ]; then
+	revision="$revision-local"
+fi
+
+cat >src/com/tedpearson/ypp/market/Version.java <<END
+  package com.tedpearson.ypp.market;
+  public class Version {
+      public final static String version = "$revision";
+  }
+END
+rm -f src/build/com/tedpearson/ypp/market/Version.class
+rm -f src/build/com/tedpearson/ypp/market/ControlPanel.class
+rm -f *.jar
+
 cd src
 ant -f PCTB.xml
 cd ..
@@ -22,21 +37,22 @@ Building tarball
 "
 
 GZIP='-9v --rsyncable' tar --exclude=\*{~,.tar.gz,.exe} --exclude='#*#' \
-  --transform='s/^./jpctb/' --exclude=jpctb/{src/build,tmp} \
-  -zcf jpctb.tar.gz .
+  --transform='s/^./jarrg/' --exclude=jarrg/{src/build,tmp} \
+  -zcf jarrg.tar.gz .
 
-files='jpctb.tar.gz jpctb-setup.exe'
+files='jarrg.tar.gz jarrg-setup.exe'
 
 echo "
 Generated OK:
 "
 ls -al $files
 
-pubbase="${JPCTB_PUBLISH_BASE-login.chiark.greenend.org.uk}"
-pubdir="${JPCTB_PUBLISH_DIR-/home/yarrgweb/public-html/download/jpctb}"
-revision=`git describe --always`
+pubbase="${JARRG_PUBLISH_BASE-login.chiark.greenend.org.uk}"
+pubdir="${JARRG_PUBLISH_DIR-/home/yarrgweb/public-html/download/jarrg}"
 
 echo "
+Revision: $revision
+
 Install with:
- RSYNC_RSH=ssh rsync -vP $files $pubbase:$pubdir/$revision/
+ RSYNC_RSH=ssh rsync -vP $files $pubbase:$pubdir/test/
 "