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
64a9d3aa
Commit
64a9d3aa
authored
Jul 13, 2016
by
Kenny Kaye
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Support --idl-include-path argument to configure include paths
parent
079d9723
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
9 additions
and
3 deletions
+9
-3
example/run_djinni.sh
example/run_djinni.sh
+3
-1
src/.idea/runConfigurations/djinni_Main__Test_Suite_.xml
src/.idea/runConfigurations/djinni_Main__Test_Suite_.xml
+2
-2
src/source/Main.scala
src/source/Main.scala
+3
-0
test-suite/run_djinni.sh
test-suite/run_djinni.sh
+1
-0
No files found.
example/run_djinni.sh
View file @
64a9d3aa
...
...
@@ -69,7 +69,9 @@ fi
--objcpp-out
"
$temp_out
/objc"
\
--objc-type-prefix
TXS
\
\
--idl
"
$in
"
--idl
"
$in
"
\
--idl-include-path
"../../"
\
--idl-include-path
"path/to/idl"
# Copy changes from "$temp_output" to final dir.
...
...
src/.idea/runConfigurations/djinni_Main__Test_Suite_.xml
View file @
64a9d3aa
...
...
@@ -8,10 +8,10 @@
</extension>
<option
name=
"MAIN_CLASS_NAME"
value=
"djinni.Main"
/>
<option
name=
"VM_PARAMETERS"
value=
""
/>
<option
name=
"PROGRAM_PARAMETERS"
value=
"--java-out djinni-output-temp/java --java-package com.dropbox.djinni.test --java-nullable-annotation "javax.annotation.CheckForNull" --java-nonnull-annotation "javax.annotation.Nonnull" --ident-java-field mFooBar --cpp-out djinni-output-temp/cpp --cpp-namespace testsuite --ident-cpp-enum-type foo_bar --cpp-optional-template "std::experimental::optional" --cpp-optional-header "<experimental/optional>" --jni-out djinni-output-temp/jni --ident-jni-class NativeFooBar --ident-jni-file NativeFooBar --objc-out djinni-output-temp/objc --objcpp-out djinni-output-temp/objc --objc-type-prefix DB --list-in-files generated-src/inFileList.txt --list-out-files generated-src/outFileList.txt --yaml-out djinni-output-temp/yaml --yaml-out-file "yaml-test.yaml" --yaml-prefix "test_" --idl djinni/all.djinni"
/>
<option
name=
"PROGRAM_PARAMETERS"
value=
"--java-out djinni-output-temp/java --java-package com.dropbox.djinni.test --java-nullable-annotation "javax.annotation.CheckForNull" --java-nonnull-annotation "javax.annotation.Nonnull" --ident-java-field mFooBar --cpp-out djinni-output-temp/cpp --cpp-namespace testsuite --ident-cpp-enum-type foo_bar --cpp-optional-template "std::experimental::optional" --cpp-optional-header "<experimental/optional>" --jni-out djinni-output-temp/jni --ident-jni-class NativeFooBar --ident-jni-file NativeFooBar --objc-out djinni-output-temp/objc --objcpp-out djinni-output-temp/objc --objc-type-prefix DB --list-in-files generated-src/inFileList.txt --list-out-files generated-src/outFileList.txt --yaml-out djinni-output-temp/yaml --yaml-out-file "yaml-test.yaml" --yaml-prefix "test_" --idl djinni/all.djinni
--idl-include-path djinni/vendor
"
/>
<option
name=
"WORKING_DIRECTORY"
value=
"file://$PROJECT_DIR$/../test-suite"
/>
<option
name=
"ALTERNATIVE_JRE_PATH_ENABLED"
value=
"false"
/>
<option
name=
"ALTERNATIVE_JRE_PATH"
value=
""
/>
<option
name=
"ALTERNATIVE_JRE_PATH"
/>
<option
name=
"ENABLE_SWING_INSPECTOR"
value=
"false"
/>
<option
name=
"ENV_VARIABLES"
/>
<option
name=
"PASS_PARENT_ENVS"
value=
"true"
/>
...
...
src/source/Main.scala
View file @
64a9d3aa
...
...
@@ -24,6 +24,7 @@ object Main {
def
main
(
args
:
Array
[
String
])
{
var
idlFile
:
File
=
null
var
idlIncludePaths
:
List
[
String
]
=
List
(
"."
)
var
cppOutFolder
:
Option
[
File
]
=
None
var
cppNamespace
:
String
=
""
var
cppIncludePrefix
:
String
=
""
...
...
@@ -93,6 +94,8 @@ object Main {
help
(
"help"
)
opt
[
File
](
"idl"
).
valueName
(
"<in-file>"
).
required
().
foreach
(
idlFile
=
_
)
.
text
(
"The IDL file with the type definitions, typically with extension \".djinni\"."
)
opt
[
String
](
"idl-include-path"
).
valueName
(
"<path> ..."
).
optional
().
unbounded
().
foreach
(
x
=>
idlIncludePaths
=
idlIncludePaths
:+
x
)
.
text
(
"An include path to search for Djinni @import directives. Can specify multiple paths."
)
note
(
""
)
opt
[
File
](
"java-out"
).
valueName
(
"<out-folder>"
).
foreach
(
x
=>
javaOutFolder
=
Some
(
x
))
.
text
(
"The output for the Java files (Generator disabled if unspecified)."
)
...
...
test-suite/run_djinni.sh
View file @
64a9d3aa
...
...
@@ -90,6 +90,7 @@ fi
--yaml-prefix
"test_"
\
\
--idl
"
$in_relative
"
\
--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