Fix setup.py to remove the double '/' when building man pages. #96
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…as resulting in 'share/man//...' showing in the file list generated for system packages.
| src = build_cmd.build_base + '/data/man/' + lang + '/gramps.1.gz' | ||
| target = 'share/man/' + lang + '/man1' | ||
| src = build_cmd.build_base + '/data/man' + lang + '/gramps.1.gz' | ||
| target = 'share/man' + lang + '/man1' |
There was a problem hiding this comment.
It would be better to use os.path.join, though I guess man pages will not be built on Windows, anyway.
There was a problem hiding this comment.
Yes they have been built on windows by me and by the looks of it others.
fdb8704 Update Sphinx files - includes make.bat for windows
There was a problem hiding this comment.
In that case, it makes even more sense to use os.path.join to use the right path separators, right?
|
Yes, using path.join() makes sense. Thanks! |
|
Be careful. The distutils package requires some paths to be in Unix form. |
|
@uxcq Just out of curiosity, how do you "build" manpages on Windows? |
|
@uxcq @Paul-Franklin On windows you only need to change to the /docs/ directory and run the make.bat file eg: On master this currently spits out about 83 warnings, but it does complete. @Paul-Franklin Your right was thinking Sphinix Gramps API documents and not manpages! |
|
@sam-m888 It seems we are talking about different conditions. I think |
uqs
pushed a commit
to freebsd/freebsd-ports
that referenced
this pull request
May 19, 2016
- Take maintainership - Convert to USE_GITHUB (new location of main upstream repository) - Update dependencies for new version (namely python 3.2+ and GTK3) [1] - Convert "strongly recommended" options to dependencies (removing option) [1] - Add "optional" dependencies as OPTIONS [1] - Remove pkg-plist and convert build to USE_PYTHON=autoplist distutils - Remove pre-extract upgrade warning as it is ineffective for pkg upgrades and now only applies for systems which have not been upgraded in 1.5 years. - Add post-stage hack to fix staging support, copied from Arch Linux [2] - Delete files/patch-src_gramps.py as the offending file has been removed - Add files/patch-setup.py to allow "--single-version-externally-managed" [3] - Add files/patch-setup.py to fix double slashes in generated by autoplist [4] Changes: https://github.com/gramps-project/gramps/blob/v4.2.3/NEWS [1] https://github.com/gramps-project/gramps/blob/v4.2.3/README [2] https://projects.archlinux.org/svntogit/community.git/tree/trunk/PKGBUILD?h=packages/gramps&id=ee1c7fae15872481d8f55868f4211efcbce15314 [3] gramps-project/gramps@ab67c78 [4] gramps-project/gramps#96 PR: 207005 Reviewed by: mat (mentor) Approved by: adamw (mentor) Differential Revision: https://reviews.freebsd.org/D6439 git-svn-id: svn+ssh://svn.freebsd.org/ports/head@415529 35697150-7ecd-e111-bb59-0022644237b5
uqs
pushed a commit
to freebsd/freebsd-ports
that referenced
this pull request
May 19, 2016
- Take maintainership - Convert to USE_GITHUB (new location of main upstream repository) - Update dependencies for new version (namely python 3.2+ and GTK3) [1] - Convert "strongly recommended" options to dependencies (removing option) [1] - Add "optional" dependencies as OPTIONS [1] - Remove pkg-plist and convert build to USE_PYTHON=autoplist distutils - Remove pre-extract upgrade warning as it is ineffective for pkg upgrades and now only applies for systems which have not been upgraded in 1.5 years. - Add post-stage hack to fix staging support, copied from Arch Linux [2] - Delete files/patch-src_gramps.py as the offending file has been removed - Add files/patch-setup.py to allow "--single-version-externally-managed" [3] - Add files/patch-setup.py to fix double slashes in generated by autoplist [4] Changes: https://github.com/gramps-project/gramps/blob/v4.2.3/NEWS [1] https://github.com/gramps-project/gramps/blob/v4.2.3/README [2] https://projects.archlinux.org/svntogit/community.git/tree/trunk/PKGBUILD?h=packages/gramps&id=ee1c7fae15872481d8f55868f4211efcbce15314 [3] gramps-project/gramps@ab67c78 [4] gramps-project/gramps#96 PR: 207005 Reviewed by: mat (mentor) Approved by: adamw (mentor) Differential Revision: https://reviews.freebsd.org/D6439
|
Is this ready to commit? |
|
Tested, rebased, tidied up the commit message and merged in commit 7851d3b. |
vores8
pushed a commit
to vores8/gramps
that referenced
this pull request
Jan 31, 2023
svmhdvn
pushed a commit
to svmhdvn/freebsd-ports
that referenced
this pull request
Jan 10, 2024
- Take maintainership - Convert to USE_GITHUB (new location of main upstream repository) - Update dependencies for new version (namely python 3.2+ and GTK3) [1] - Convert "strongly recommended" options to dependencies (removing option) [1] - Add "optional" dependencies as OPTIONS [1] - Remove pkg-plist and convert build to USE_PYTHON=autoplist distutils - Remove pre-extract upgrade warning as it is ineffective for pkg upgrades and now only applies for systems which have not been upgraded in 1.5 years. - Add post-stage hack to fix staging support, copied from Arch Linux [2] - Delete files/patch-src_gramps.py as the offending file has been removed - Add files/patch-setup.py to allow "--single-version-externally-managed" [3] - Add files/patch-setup.py to fix double slashes in generated by autoplist [4] Changes: https://github.com/gramps-project/gramps/blob/v4.2.3/NEWS [1] https://github.com/gramps-project/gramps/blob/v4.2.3/README [2] https://projects.archlinux.org/svntogit/community.git/tree/trunk/PKGBUILD?h=packages/gramps&id=ee1c7fae15872481d8f55868f4211efcbce15314 [3] gramps-project/gramps@ab67c78 [4] gramps-project/gramps#96 PR: 207005 Reviewed by: mat (mentor) Approved by: adamw (mentor) Differential Revision: https://reviews.freebsd.org/D6439
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This was resulting in 'share/man//...' showing in the file list generated for system packages.