Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
D
djinni
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
cpp-libs
djinni
Commits
a8c89710
Commit
a8c89710
authored
Dec 08, 2016
by
Kenny Kaye
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Default include path is directory of first included file
parent
0983bca7
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
5 additions
and
5 deletions
+5
-5
src/source/Main.scala
src/source/Main.scala
+1
-1
src/source/parser.scala
src/source/parser.scala
+1
-1
test-suite/generated-src/inFileList.txt
test-suite/generated-src/inFileList.txt
+2
-2
test-suite/run_djinni.sh
test-suite/run_djinni.sh
+1
-1
No files found.
src/source/Main.scala
View file @
a8c89710
...
...
@@ -24,7 +24,7 @@ object Main {
def
main
(
args
:
Array
[
String
])
{
var
idlFile
:
File
=
null
var
idlIncludePaths
:
List
[
String
]
=
List
(
"
.
"
)
var
idlIncludePaths
:
List
[
String
]
=
List
(
""
)
var
cppOutFolder
:
Option
[
File
]
=
None
var
cppNamespace
:
String
=
""
var
cppIncludePrefix
:
String
=
""
...
...
src/source/parser.scala
View file @
a8c89710
...
...
@@ -55,7 +55,7 @@ private object IdlParser extends RegexParsers {
includePaths
.
foreach
(
path
=>
{
if
(
file
.
isEmpty
)
{
var
relPath
=
if
(
path
==
"."
)
fileParent
else
path
+
"/"
var
relPath
=
if
(
path
.
isEmpty
)
fileParent
else
path
+
"/"
val
tmp
=
new
File
(
relPath
+
fileName
);
if
(
tmp
.
exists
)
file
=
Some
(
tmp
)
...
...
test-suite/generated-src/inFileList.txt
View file @
a8c89710
...
...
@@ -17,5 +17,5 @@ djinni/single_language_interfaces.djinni
djinni/extended_record.djinni
djinni/date.djinni
djinni/date.yaml
./
djinni/vendor/third-party/duration.djinni
./
djinni/vendor/third-party/duration.yaml
djinni/vendor/third-party/duration.djinni
djinni/vendor/third-party/duration.yaml
test-suite/run_djinni.sh
View file @
a8c89710
...
...
@@ -90,7 +90,7 @@ fi
--yaml-prefix
"test_"
\
\
--idl
"
$in_relative
"
\
--idl-include-path
"
./
djinni/vendor"
\
--idl-include-path
"djinni/vendor"
\
)
# Make sure we can parse back our own generated YAML file
...
...
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