chiark
/
gitweb
/
~yarrgweb
/
jarrg-ian.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
pctb: print output from server to stderr too
[jarrg-ian.git]
/
build-sh
diff --git
a/build-sh
b/build-sh
index 1496b6462b6e9c9806a7e366a562a351d1f9a463..222429695e908c17d4400970252ae6de47ac7dba 100755
(executable)
--- a/
build-sh
+++ b/
build-sh
@@
-14,6
+14,10
@@
esac
export JAVA_HOME
revision=`git describe --always || echo '(unknown revision)'`
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 {
cat >src/com/tedpearson/ypp/market/Version.java <<END
package com.tedpearson.ypp.market;
public class Version {
@@
-21,6
+25,7
@@
cat >src/com/tedpearson/ypp/market/Version.java <<END
}
END
rm -f src/build/com/tedpearson/ypp/market/Version.class
}
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
rm -f *.jar
cd src
@@
-46,6
+51,8
@@
pubbase="${JPCTB_PUBLISH_BASE-login.chiark.greenend.org.uk}"
pubdir="${JPCTB_PUBLISH_DIR-/home/yarrgweb/public-html/download/jpctb}"
echo "
pubdir="${JPCTB_PUBLISH_DIR-/home/yarrgweb/public-html/download/jpctb}"
echo "
+Revision: $revision
+
Install with:
RSYNC_RSH=ssh rsync -vP $files $pubbase:$pubdir/test/
"
Install with:
RSYNC_RSH=ssh rsync -vP $files $pubbase:$pubdir/test/
"