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.

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

Better handling of version when inside git repo #492

Merged
merged 2 commits into from
Feb 6, 2016

Conversation

vbraun
Copy link
Contributor

@vbraun vbraun commented Jan 18, 2016

Fix for building the gap tarball inside a git repo (as is the case in Sage)

Do not indiscriminately go up in search for .git, otherwise people get
strange gap versions if they build the tarball somewhere in a git
tree.
@vbraun vbraun changed the title Better version Better handling of version when inside git repo Jan 18, 2016
@olexandr-konovalov olexandr-konovalov added the gapsagedays2016 Issues and PRs that arose at https://www.gapdays.de/gap-sage-days2016 label Jan 19, 2016
@ChrisJefferson
Copy link
Contributor

This patch seems good to me. The extra printing only happens when we have already got inconsistent library & kernel.

@olexandr-konovalov
Copy link
Member

Thanks! @markuspf, are you happy to merge this (it was you who created mkversionheader.sh)?

markuspf added a commit that referenced this pull request Feb 6, 2016
Better handling of version when inside git repo
@markuspf markuspf merged commit e6576c1 into gap-system:master Feb 6, 2016
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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
gapsagedays2016 Issues and PRs that arose at https://www.gapdays.de/gap-sage-days2016
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants