nitlanguage
/
nit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
catalog: fix warnings
[nit.git]
/
src
/
git-gen-version.sh
diff --git
a/src/git-gen-version.sh
b/src/git-gen-version.sh
index
ada2d60
..
9395647
100755
(executable)
--- a/
src/git-gen-version.sh
+++ b/
src/git-gen-version.sh
@@
-20,34
+20,42
@@
# The version number is stored in a dedicated Nit module.
gen_version() {
# The version number is stored in a dedicated Nit module.
gen_version() {
- if ! grep "$*" nit_version.nit >/dev/null 2>&1; then
- cat > nit_version.nit<<END
+ if ! grep "$*" version.nit >/dev/null 2>&1; then
+ cat > version.nit <<END
# This file was generated by git-gen-version.sh
# This file was generated by git-gen-version.sh
-package nit_version
-meth nit_version: String do return "$*"
+module version
+fun nit_version: String do return "$*"
END
echo "Version $*"
fi
}
END
echo "Version $*"
fi
}
-# Are we in the nitc.nit directory?
-if [ ! -f nitc.nit ]; then
- if [ -f src/nitc.nit ]; then
+# Are we in the nit.nit directory?
+if [ ! -f nit.nit ]; then
+ if [ -f src/nit.nit ]; then
cd src
else
cd src
else
- echo "Error: no nitc.nit found." >&2
+ echo "Error: no nit.nit found." >&2
exit 1
fi
fi
exit 1
fi
fi
-VN=$(git describe --always HEAD 2>/dev/null)
+VN=`git describe --always HEAD 2>/dev/null`
+if [ "$?" != "0" ]; then
+ if [ -r ../VERSION ]; then
+ VN="$(cat ../VERSION)"
+ else
+ echo >&2 "Error: no VERSION file and not a .git repository."
+ exit 1
+ fi
+fi
if [ -z "$VN" ]; then
VN="undefined"
fi
if [ -n "$1" ]; then
VN="${VN}_$1"
fi
if [ -z "$VN" ]; then
VN="undefined"
fi
if [ -n "$1" ]; then
VN="${VN}_$1"
fi
-if [ -n "$(git diff HEAD)" ]; then
+if [ -n "$(git diff HEAD 2>/dev/null)" ]; then
VN="${VN}_dirty"
fi
VN="${VN}_dirty"
fi