Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Better handling of version when inside git repo #492

Merged
merged 2 commits into from
Feb 6, 2016
Merged

Better handling of version when inside git repo #492

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fb49734
Only use git for version if .git exists
vbraun Jan 18, 2016
951b812
Report the actual versions when there is a mismatch
vbraun Jan 18, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions cnf/mkversionheader.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,12 @@ TMP="$1".tmp
DST="$1"

# Determine build version and date
GAP_BUILD_VERSION=`git describe --tags --dirty || echo`
GAP_BUILD_DATE=`date +"%Y-%m-%d %H:%M:%S (%Z)"`
if test x"${GAP_BUILD_VERSION}" = x ; then
if test -d ../.git ; then
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This test is wrong. The path ../.git is taken relative to the to current working directory (cwd / pwd), not relative to the script. But the script is invoked from the Makefile, which is in the GAP root directory.

GAP_BUILD_VERSION=`git describe --tags --dirty || echo`
else
GAP_BUILD_VERSION=unknown
fi
GAP_BUILD_DATE=`date +"%Y-%m-%d %H:%M:%S (%Z)"`

# Generate the file
cat > "$TMP" <<EOF
Expand Down
2 changes: 2 additions & 0 deletions lib/init.g
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -362,6 +362,8 @@ CallAndInstallPostRestore( function()
haveint[i]:= IntHexString( have[i] );
needint[i]:= IntHexString( need[i] );
od;
Print( "Current kernel version: ", haveint[1], ".", haveint[2], ".", haveint[3], "\n" );
Print( "Library requires version: ", needint[1], ".", needint[2], ".", needint[3], "\n" );

if haveint > needint then
# kernel newer
Expand Down