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

GRASS_VERSION_SVN -> GRASS_VERSION_GIT + update g.version #9

Merged
merged 2 commits into from May 30, 2019

Conversation

@landam
Copy link
Member

landam commented May 19, 2019

This PR:

  • changes GRASS_VERSION_SVN compilation variable to GRASS_VERSION_GIT
  • changes VERSION from 7.7.svn to more generic 7.7.dev
  • updates g.version -g in order to print git reference commit
> g.version --help
...
  -g   Print info in shell script style (including Git reference commit)
...
> g.version -g
...
revision=3ff058709
...

(revision tag not changed due to backward compatibility)

Note: this PR does not solve WinGRASS-related GRASS_VERSION_SVN issue (see mswindows/GRASS-Installer.nsi.tmpl). This should be fixed by separate PR.

@landam landam added the bug label May 19, 2019
@landam landam requested a review from neteler May 19, 2019
@landam

This comment has been minimized.

Copy link
Member Author

landam commented May 19, 2019

Also wxGUI System Info updated to more generic 'Code revision'.

Screenshot from 2019-05-19 18-11-14

@neteler

This comment has been minimized.

Copy link
Member

neteler commented May 19, 2019

Thanks, still a change here is needed:

lib/init/grass.py
383:    config_detail=_("options: arch,build,compiler,path,revision,svn_revision,version"),
1905:        elif arg == 'svn_revision':

I suggest to keep svn_revision for backwards compatibility but add also a new code_revision with the same output.

In addition, svn_revision also appears here:

  • lib/python/gunittest/multireport.py
  • lib/python/gunittest/reporters.py
  • mswindows/GRASS-Installer.nsi.tmpl

A new bug is there:

grass77 --config
--> IndexError: list index out of range

grass77 --config revision
--> IndexError: list index out of range
@landam

This comment has been minimized.

Copy link
Member Author

landam commented May 22, 2019

--config problem is related to SVN keywords substitution, see https://github.com/OSGeo/grass/blob/master/include/gis.h#L41. See also #11.

For keyword substitution see eg. https://github.com/turon/git-rcs-keywords (or https://github.com/rsmith-nl/git-keywords for Python scripts)

@landam

This comment has been minimized.

Copy link
Member Author

landam commented May 27, 2019

Since --config problem is an another issue (related to svn keyword substitution) I suggest to split the tasks. Let's finish (merge) this PR and open a new issue (trac) for svn keyword substitution. @neteler do you agree?

@landam landam self-assigned this May 27, 2019
@landam landam merged commit b971933 into OSGeo:master May 30, 2019
1 check passed
1 check passed
Travis CI - Pull Request Build Passed
Details
@landam landam deleted the landam:g_version_git branch May 30, 2019
@landam

This comment has been minimized.

Copy link
Member Author

landam commented May 30, 2019

@landam

This comment has been minimized.

Copy link
Member Author

landam commented Jul 14, 2019

For record: PR backported to relbr76 in 59225e7 / relbr74 in bfe3794.

landam added a commit that referenced this pull request Jul 14, 2019
GRASS_VERSION_SVN -> GRASS_VERSION_GIT + update g.version
landam added a commit that referenced this pull request Jul 14, 2019
GRASS_VERSION_SVN -> GRASS_VERSION_GIT + update g.version
@landam landam removed the backport_needed label Jul 16, 2019
landam added a commit to landam/grass that referenced this pull request Jul 26, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
2 participants
You can’t perform that action at this time.