Prepare source tree for pointing GitHub Pages to master docs/ #1503
Conversation
|
Looking good, thanks! A couple of additional comments:
|
| Subject: [PATCH] add Batchfile with test to run on host | ||
|
|
||
|
|
||
| diff --git a/all-tests-openmp-validation.bat b/all-tests-openmp-validation.bat |
There was a problem hiding this comment.
The second patch, openmp-validation-2-test-crlf.patch, creates a batch file with crlf line endings. There's special handling for these in .gitattributes and I'm not sure it can be consolidated.
There was a problem hiding this comment.
For reasons I don't fully understand, the crlf endings are preserved in the body of the patch and the file is created correctly.
There was a problem hiding this comment.
Why should it work incorrectly? We already have many DOS line endings patches created with patch-tool-mxe. File openmp-validation-2-test-crlf.patch had mixed line endings: DOS for Copyright header and diff content and Unix for diff header.
Could you explain the problem with DOS line endings and how .gitattributes approaches it, please?
There was a problem hiding this comment.
I can't figure out what the initial problem with DOS line endings was - very likely some local misconfiguration as .gitattributes selectively does what git config --global core.autocrlf input does.
There was a problem hiding this comment.
.gitattributes was added in commit b2bef6b but it does not provide the background.
IMHO, we can stay with consolidated patches, remove .gitattributes and revisit the problem if it happens again.
|
Amended:
|
|
Note that the Makefile does need a change, though, from "See index.html" to "See docs/index.html". |
Done. |
openmp-validation-2-test-crlf.patch was the only file with \r byte in Copyright Header. See mxe#1500
The following script was applied:
sed ':a;/part of MXE.$/{N;s/\n//;ba}' -i $(git grep -l 'part of MXE')
sed 's/\(part of MXE\).*\(See index.html\)/\1. \2/' -i \
$(git grep -l 'part of MXE.*See index.html')
before='This file is part of MXE. See index.html for further information.'
after='This file is part of MXE. See LICENSE.md for licensing information.'
sed "s/$before/$after/" -i $(git grep -l 'part of MXE')
Then git grep 'index.html for further information' revealed two other files.
One of them was patched manually (patch.mk). Makefile has text
"See index.html for further information" unrelated to licensing.
See mxe#1500 (comment)
index.html: make docs/build-matrix.html a link mxe-activate: add versions.json add .PHONY for build-matrix.html
|
Rebased. @tonytheodore, GitHub seems to be stricter than |
|
@starius Thanks for your work! |
See #1500