Raymond Toy pushed to branch sparc64-dev at cmucl / cmucl Commits: 50f850e4 by Raymond Toy at 2016-12-27T10:57:52-08:00 Make sure version is specified. The version must either be computed using the defaults or must be given by the -V option. Otherwise make-main-dist doesn't know what to do without a version. - - - - - 1 changed file: - bin/make-dist.sh Changes: ===================================== bin/make-dist.sh ===================================== --- a/bin/make-dist.sh +++ b/bin/make-dist.sh @@ -93,15 +93,17 @@ def_arch_os () { # Figure out the architecture and OS in case options aren't given def_arch_os -# Choose a version based on the git hash as the default version. +# Choose a version based on the git hash as the default version. We +# only compute a default if the git hash looks like a snapshot +# ("snapshot-yyyy-mm") or a release number.. GIT_HASH="`(cd src; git describe --dirty 2>/dev/null)`" if expr "X${GIT_HASH}" : 'Xsnapshot-[0-9][0-9][0-9][0-9]-[01][0-9]' > /dev/null; then - VERSION=`expr "${GIT_HASH}" : "snapshot-\(.*\)"` + DEFAULT_VERSION=`expr "${GIT_HASH}" : "snapshot-\(.*\)"` fi if expr "X${GIT_HASH}" : 'X[0-9][0-9][a-f]' > /dev/null; then - VERSION="${GIT_HASH}" + DEFAULT_VERSION="${GIT_HASH}" fi while getopts "G:O:I:M:bghSA:o:V:?" arg @@ -128,6 +130,12 @@ if [ $# -lt 1 ]; then usage fi +# Either VERSION or DEFAULT_VERSION must be non-empty +if [ -z "$VERSION" -a -z "${DEFAULT_VERSION}" ]; then + echo "Version (-V) must be specified because default version cannot be determined." + usage +fi + if [ ! -d "$1" ] then echo "$1 isn't a directory" @@ -152,6 +160,7 @@ if [ -n "$INSTALL_DIR" ]; then VERSION="today" fi +echo cmucl-$VERSION-$ARCH-$OS ROOT=`dirname $0` # If no compression options given, default to bzip View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/commit/50f850e408d6749ff3f986d090...