Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
C
capnproto
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
capnproto
Commits
eaefd922
Commit
eaefd922
authored
Aug 25, 2018
by
Kenton Varda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Improve heuristics for capnpc -o param on Windows. Fixes #722.
parent
68990bb3
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
23 additions
and
13 deletions
+23
-13
capnp.c++
c++/src/capnp/compiler/capnp.c++
+23
-13
No files found.
c++/src/capnp/compiler/capnp.c++
View file @
eaefd922
...
@@ -382,10 +382,14 @@ public:
...
@@ -382,10 +382,14 @@ public:
kj
::
StringPtr
dir
=
spec
.
slice
(
*
split
+
1
);
kj
::
StringPtr
dir
=
spec
.
slice
(
*
split
+
1
);
auto
plugin
=
spec
.
slice
(
0
,
*
split
);
auto
plugin
=
spec
.
slice
(
0
,
*
split
);
KJ_IF_MAYBE
(
split2
,
dir
.
findFirst
(
':'
))
{
if
(
*
split
==
1
&&
(
dir
.
startsWith
(
"/"
)
||
dir
.
startsWith
(
"
\\
"
)))
{
// Grr, there are two colons. Might this be a Windows path? Let's do some heuristics.
// The colon is the second character and is immediately followed by a slash or backslash.
if
(
*
split
==
1
&&
(
dir
.
startsWith
(
"/"
)
||
dir
.
startsWith
(
"
\\
"
)))
{
// So, the user passed something like `-o c:/foo`. Is this a request to run the C plugin
// So, the first ':' was the second char, and was followed by '/' or '\', e.g.:
// and output to `/foo`? Or are we on Windows, and is this a request to run the plugin
// `c:/foo`?
KJ_IF_MAYBE
(
split2
,
dir
.
findFirst
(
':'
))
{
// There are two colons. The first ':' was the second char, and was followed by '/' or
// '\', e.g.:
// capnp compile -o c:/foo.exe:bar
// capnp compile -o c:/foo.exe:bar
//
//
// In this case we can conclude that the second colon is actually meant to be the
// In this case we can conclude that the second colon is actually meant to be the
...
@@ -407,18 +411,24 @@ public:
...
@@ -407,18 +411,24 @@ public:
// -> CONTRADICTION
// -> CONTRADICTION
//
//
// We therefore conclude that the *second* colon is in fact the plugin/location separator.
// We therefore conclude that the *second* colon is in fact the plugin/location separator.
//
// Note that there is still an ambiguous case:
// capnp compile -o c:/foo
//
// In this unfortunate case, we have no way to tell if the user meant "use the 'c' plugin
// and output to /foo" or "use the plugin c:/foo and output to the default location". We
// prefer the former interpretation, because the latter is Windows-specific and such
// users can always explicitly specify the output location like:
// capnp compile -o c:/foo:.
dir
=
dir
.
slice
(
*
split2
+
1
);
dir
=
dir
.
slice
(
*
split2
+
1
);
plugin
=
spec
.
slice
(
0
,
*
split2
+
2
);
plugin
=
spec
.
slice
(
0
,
*
split2
+
2
);
#if _WIN32
}
else
{
// The user wrote something like:
//
// capnp compile -o c:/foo/bar
//
// What does this mean? It depends on what system we're on. On a Unix system, the above
// clearly is a request to run the `capnpc-c` plugin (perhaps to output C code) and write
// to the directory /foo/bar. But on Windows, absolute paths do not start with '/', and
// the above is actually a request to run the plugin `c:/foo/bar`, outputting to the
// current directory.
outputs
.
add
(
OutputDirective
{
spec
.
asArray
(),
nullptr
});
return
true
;
#endif
}
}
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment