Merge branch 'tidy' into 'main'

[jarrg-ian.git] / build-sh

diff --git a/build-sh b/build-sh
index 405e6d5a24ed9a09b17c0ce234043d45f1ab9535..39a2be28c43817499fa9548248e975f1535b637f 100755 (executable)
--- a/build-sh
+++ b/build-sh
@@ -10,13 +10,14 @@ case "$#.$1" in
 *)     echo >&2 'no arguments allowed'; exit 1;;
 esac
 
-: ${JAVA_HOME:=/usr/lib/jvm/java-6-sun}
+: ${JAVA_HOME:=/usr/lib/jvm/java-8-openjdk-amd64}
 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
+revision=${revision#jarrg-}
 
 cat >src/net/chiark/yarrg/Version.java <<END
   package net.chiark.yarrg;
@@ -26,6 +27,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
@@ -38,6 +40,7 @@ Building tarballs
 
 tarball () {
        output=$1; shift
+       >"$output"; # avoids rsync seeing that . changed
        GZIP='-9v --rsyncable' tar --exclude=\*{~,.tar.gz,.exe} --exclude='#*#' \
          --transform='s/^./jarrg/' --exclude={src/build,tmp} "$@" \
          -zcf "$output" .
@@ -55,12 +58,17 @@ Generated OK:
 "
 ls -al $files
 
-pubbase="${JARRG_PUBLISH_BASE-login.chiark.greenend.org.uk}"
+pubbase="${JARRG_PUBLISH_BASE-ijackson@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/
+Publish as test with:
+  RSYNC_RSH=ssh rsync -vP $files $pubbase:$pubdir/test/
+
+To actually publish a release, on $pubbase:
+  mkdir $revision
+  ln test/* $revision/.
+  ln -f test/* .
 "