fix "uses test servers on windows" bug

[jarrg-ian.git] / build-sh

diff --git a/build-sh b/build-sh
index 24b8a0a54372cef7c9273437ed190c53b4b370d4..9bef7b3c7d78cd7b9459bc9023f999f6195ef864 100755 (executable)
--- a/build-sh
+++ b/build-sh
@@ -26,6 +26,7 @@ cat >src/net/chiark/yarrg/Version.java <<END
 END
 rm -f src/build/net/chiark/yarrg/Version.class
 rm -f src/build/net/chiark/yarrg/ControlPanel.class
+rm -f src/build/net/chiark/yarrg/MarketUploader.class
 rm -f *.jar
 
 cd src
@@ -33,14 +34,22 @@ ant -f Jarrg.xml
 cd ..
 
 echo "
-Building tarball
+Building tarballs
 "
 
-GZIP='-9v --rsyncable' tar --exclude=\*{~,.tar.gz,.exe} --exclude='#*#' \
-  --transform='s/^./jarrg/' --exclude=jarrg/{src/build,tmp} \
-  -zcf jarrg.tar.gz .
+tarball () {
+       output=$1; shift
+       GZIP='-9v --rsyncable' tar --exclude=\*{~,.tar.gz,.exe} --exclude='#*#' \
+         --transform='s/^./jarrg/' --exclude={src/build,tmp} "$@" \
+         -zcf "$output" .
+}
 
-files='jarrg.tar.gz jarrg-setup.exe'
+tarball jarrg-source.tar.gz
+
+tarball jarrg-linux.tar.gz \
+  --exclude={.git*,src,accessibility.properties,build-sh} \
+
+files='jarrg-source.tar.gz jarrg-linux.tar.gz jarrg-setup.exe'
 
 echo "
 Generated OK: