Update JDK version in build-sh to OpenJDK 8

[jarrg-ian.git] / build-sh

diff --git a/build-sh b/build-sh
index 405e6d5a24ed9a09b17c0ce234043d45f1ab9535..887f236df8b671f2893d1618acd2d8bf32e9aeec 100755 (executable)
--- a/build-sh
+++ b/build-sh
@@ -10,7 +10,7 @@ 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)'`
@@ -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