-
Notifications
You must be signed in to change notification settings - Fork 412
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
Fix staged pps on Windows #10869
Fix staged pps on Windows #10869
Changes from 8 commits
150354b
665dcaf
2fbf742
af903cd
c7aaf59
b464330
092ca00
d5dce76
64eba01
4d27a90
7da46f7
0e6035c
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
- Fix staged pps preprocessors on Windows (which were not working at all | ||
previously) (#10869, @nojb) |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -278,7 +278,17 @@ let need_quoting s = | |
;; | ||
|
||
let quote_for_shell s = if need_quoting s then Stdlib.Filename.quote s else s | ||
let quote_list_for_shell l = List.map l ~f:quote_for_shell |> concat ~sep:" " | ||
|
||
let quote_list_for_shell = function | ||
| [] -> "" | ||
| prog :: args -> | ||
let prog = | ||
if Sys.win32 && contains prog '/' | ||
then concat ~sep:"\\" (split_on_char ~sep:'/' prog) | ||
else prog | ||
in | ||
prog :: List.map ~f:quote_for_shell args |> concat ~sep:" " | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. No, it is wrong: fixed in 4d27a90 There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Thanks! |
||
;; | ||
|
||
let of_list chars = | ||
let s = Bytes.make (List.length chars) '0' in | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why not use String.map directly?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Fixed, thanks.