X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?a=blobdiff_plain;f=build-sh;h=3aae4b23d512d61beadcc65df5586bede739081c;hb=fdf8031c1556b47f0e3e4cefb9f49b1ea247f32b;hp=a58670428bcec4f3d8ec0e162e816a5927daa85f;hpb=7123e1d34f67a8613926f3bc18691a77db040d42;p=jarrg-ian.git

diff --git a/build-sh b/build-sh
index a586704..3aae4b2 100755
--- a/build-sh
+++ b/build-sh
@@ -14,15 +14,22 @@ esac
 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
+ant -f Jarrg.xml
 cd ..
 
 echo "
@@ -30,20 +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}"
+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/test/
 "