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

Various bits 'n bobs #3346

Merged
merged 13 commits into from
May 15, 2018
Merged

Various bits 'n bobs #3346

merged 13 commits into from
May 15, 2018

Conversation

dra27
Copy link
Member

@dra27 dra27 commented May 10, 2018

This is a first chunk of #3260, separated off. Hopefully these are the non-controversial parts.

dra27 added 13 commits May 10, 2018 14:43
This function is taken directly from ExtLib.Option

Signed-off-by: David Allsopp <david.allsopp@metastack.com>
The Microsoft C compiler is also a C++ compiler (in many ways, it's the
other way around...)
file:// URLs would end up with an extra slash for an empty path.

Signed-off-by: David Allsopp <david.allsopp@metastack.com>
Operations permitted on OpamFilename also permitted on OpamFilename.Base

Signed-off-by: David Allsopp <david.allsopp@metastack.com>
Compile the programs using an initial invocation of jbuilder so that the
testsuite itself (which is still in make) can be run using --no-buffer
so that results can be seen as they appear.

Reduce some of the noise from the make output as well.

Signed-off-by: David Allsopp <david.allsopp@metastack.com>
Also generate .gitattributes files to ensure that the shell scripts are
always created with LF-endings only, even on Windows.

Signed-off-by: David Allsopp <david.allsopp@metastack.com>
These configuration files need interpolated variable paths to be
backslash-escaped, which means an opam-version header needs to be
present in order to activate the escaping.
Returns the directory found, instead of the complete command.

Signed-off-by: David Allsopp <david.allsopp@metastack.com>
Three fixes:
  - Ensure file:// URLs only use /
  - Use Filename.is_relative to determine an absolute path!
  - Ensure that concatenation maintains / on Windows

Signed-off-by: David Allsopp <david.allsopp@metastack.com>
dra27 added a commit to dra27/opam that referenced this pull request May 10, 2018
This commit should be blown away before merge.
dra27 added a commit to dra27/opam that referenced this pull request May 10, 2018
dra27 added a commit to dra27/opam that referenced this pull request May 10, 2018
dra27 added a commit to dra27/opam that referenced this pull request May 10, 2018
dra27 added a commit to dra27/opam that referenced this pull request May 10, 2018
@AltGr
Copy link
Member

AltGr commented May 15, 2018

Thanks!

@AltGr AltGr merged commit 875f312 into ocaml:master May 15, 2018
@dra27 dra27 deleted the various branch June 10, 2018 12:22
dra27 added a commit to dra27/opam that referenced this pull request Jul 21, 2018
The sequence [m was replaced with [0m in ocaml#3346 which required an
additional case in the VT-100 translator in OpamConsole. Not quite sure
how that was missed...
@dra27 dra27 mentioned this pull request Jun 13, 2024
This pull request was closed.
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.

2 participants