Skip to content

Version tag at top of progs#195

Merged
lucc merged 3 commits intomasterfrom
version-tag-top
Jun 20, 2016
Merged

Version tag at top of progs#195
lucc merged 3 commits intomasterfrom
version-tag-top

Conversation

@rkitover
Copy link
Copy Markdown
Owner

@lucc what do you think? I added the Makefile stuff.

vimcat Outdated
if ! version="$(cd "$project_dir" && git describe 2>/dev/null) (git)"; then version=$fallback_version; fi
if ! version="$(cd "$project_dir" && git describe 2>/dev/null) (git)"; then
version="$version_tag (checkout)"
fi
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

We can simplify that:

version="$(cd ...; git foo bar) (git)" || version="$version_tag (chekout)"

same for vimpager

Set the latest version tag as version_tag=XXX at the top of vimpager and
vimcat.

If version assignment fails due to not having .git or a shallow clone,
use the version_tag var with the postfix '(checkout)'.

On make for the all recipe, update the version_tag var from either git
or the ChangeLog files.

For make recipes that used `git describe`, write out a XXX-version.txt
file instead with the output of `git describe`, or the latest tag from
ChangeLog if `git describe` has failed.

This allows building from a source tarball (rather than only a git
clone.)
@rkitover
Copy link
Copy Markdown
Owner Author

@lucc updated, thanks!

Also, I updated the Makefile to build outside of git.

@rkitover
Copy link
Copy Markdown
Owner Author

@lucc can you please review/merge this and update split-vimcat so that I can finally merge split-vimcat?

@lucc
Copy link
Copy Markdown
Collaborator

lucc commented Jun 20, 2016

I added some small changes.

The tests from #194 pass, the makefile works if I remove the .git dir and travis passes. So I will merge it now.

Will rebase #183 next.

@lucc lucc merged commit d7088cf into master Jun 20, 2016
@rkitover
Copy link
Copy Markdown
Owner Author

@lucc awesome thanks!

@rkitover rkitover deleted the version-tag-top branch June 20, 2016 10:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants