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

Update version handling #1408

Merged
merged 1 commit into from
Mar 22, 2018
Merged

Update version handling #1408

merged 1 commit into from
Mar 22, 2018

Conversation

stweil
Copy link
Member

@stweil stweil commented Mar 22, 2018

ccutil/version.h is now no longer needed.

Signed-off-by: Stefan Weil sw@weilnetz.de

ccutil/version.h is now no longer needed.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
@zdenop
Copy link
Contributor

zdenop commented Mar 22, 2018

Will this work also for Visual studio builds?

@stweil
Copy link
Member Author

stweil commented Mar 22, 2018

Appveyor says yes. Cmake handles the necessary preparations. I cannot test it myself as I don't have Visual Studio.

@amitdo
Copy link
Collaborator

amitdo commented Mar 22, 2018

So git-rev info is dropped?

@stweil
Copy link
Member Author

stweil commented Mar 22, 2018

Yes, that's my plan. GIT_REV (and also vs2010/port/vcsversion.h) will be removed in a follow-up pull request.

The current code for autoconf in configure.ac already uses the Git information if it is available (not only for the debug case as the old code did). For CMake, this still needs an implementation which first checks Git and then looks in file VERSION if Git is unavailable.

@stweil
Copy link
Member Author

stweil commented Mar 22, 2018

@zdenop, making a new Tesseract release will require updating and committing the VERSION file, then adding a Git tag with some descriptive text, then describing the new release in GitHub.

@amitdo
Copy link
Collaborator

amitdo commented Mar 22, 2018

I want this feature:

Have a variable is_stable. Its value will be set to false during development. Just before tagging a final (non alpha/beta/rc) it should be set to true. If false, then the the git revision will be appended to the version info in PACKAGE_VERSION.

What do you think about this proposal?

@stweil
Copy link
Member Author

stweil commented Mar 22, 2018

I‌ think it is not needed. The git revision is only appended if last tagged revision and current revision differ. It is automatically omitted if you are working on a tagged revision.

@amitdo
Copy link
Collaborator

amitdo commented Mar 22, 2018

Sounds good, thanks!

@stweil
Copy link
Member Author

stweil commented Mar 22, 2018

@zdenop, do you have more questions, or can this PR be merged?

@zdenop
Copy link
Contributor

zdenop commented Mar 22, 2018

I just wantted to test it. It seems to work with Visual Studio 15 2017 Win64

@zdenop zdenop merged commit b94bbd6 into tesseract-ocr:master Mar 22, 2018
@stweil stweil deleted the version branch March 22, 2018 21:05
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.

3 participants