Commit 64a9d3aa authored by Kenny Kaye's avatar Kenny Kaye

Support --idl-include-path argument to configure include paths

parent 079d9723
...@@ -69,7 +69,9 @@ fi ...@@ -69,7 +69,9 @@ fi
--objcpp-out "$temp_out/objc" \ --objcpp-out "$temp_out/objc" \
--objc-type-prefix TXS \ --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. # Copy changes from "$temp_output" to final dir.
......
...@@ -8,10 +8,10 @@ ...@@ -8,10 +8,10 @@
</extension> </extension>
<option name="MAIN_CLASS_NAME" value="djinni.Main" /> <option name="MAIN_CLASS_NAME" value="djinni.Main" />
<option name="VM_PARAMETERS" value="" /> <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 &quot;javax.annotation.CheckForNull&quot; --java-nonnull-annotation &quot;javax.annotation.Nonnull&quot; --ident-java-field mFooBar --cpp-out djinni-output-temp/cpp --cpp-namespace testsuite --ident-cpp-enum-type foo_bar --cpp-optional-template &quot;std::experimental::optional&quot; --cpp-optional-header &quot;&lt;experimental/optional&gt;&quot; --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 &quot;yaml-test.yaml&quot; --yaml-prefix &quot;test_&quot; --idl djinni/all.djinni" /> <option name="PROGRAM_PARAMETERS" value="--java-out djinni-output-temp/java --java-package com.dropbox.djinni.test --java-nullable-annotation &quot;javax.annotation.CheckForNull&quot; --java-nonnull-annotation &quot;javax.annotation.Nonnull&quot; --ident-java-field mFooBar --cpp-out djinni-output-temp/cpp --cpp-namespace testsuite --ident-cpp-enum-type foo_bar --cpp-optional-template &quot;std::experimental::optional&quot; --cpp-optional-header &quot;&lt;experimental/optional&gt;&quot; --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 &quot;yaml-test.yaml&quot; --yaml-prefix &quot;test_&quot; --idl djinni/all.djinni --idl-include-path djinni/vendor" />
<option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/../test-suite" /> <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/../test-suite" />
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> <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="ENABLE_SWING_INSPECTOR" value="false" />
<option name="ENV_VARIABLES" /> <option name="ENV_VARIABLES" />
<option name="PASS_PARENT_ENVS" value="true" /> <option name="PASS_PARENT_ENVS" value="true" />
......
...@@ -24,6 +24,7 @@ object Main { ...@@ -24,6 +24,7 @@ object Main {
def main(args: Array[String]) { def main(args: Array[String]) {
var idlFile: File = null var idlFile: File = null
var idlIncludePaths: List[String] = List(".")
var cppOutFolder: Option[File] = None var cppOutFolder: Option[File] = None
var cppNamespace: String = "" var cppNamespace: String = ""
var cppIncludePrefix: String = "" var cppIncludePrefix: String = ""
...@@ -93,6 +94,8 @@ object Main { ...@@ -93,6 +94,8 @@ object Main {
help("help") help("help")
opt[File]("idl").valueName("<in-file>").required().foreach(idlFile = _) opt[File]("idl").valueName("<in-file>").required().foreach(idlFile = _)
.text("The IDL file with the type definitions, typically with extension \".djinni\".") .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("") note("")
opt[File]("java-out").valueName("<out-folder>").foreach(x => javaOutFolder = Some(x)) opt[File]("java-out").valueName("<out-folder>").foreach(x => javaOutFolder = Some(x))
.text("The output for the Java files (Generator disabled if unspecified).") .text("The output for the Java files (Generator disabled if unspecified).")
......
...@@ -90,6 +90,7 @@ fi ...@@ -90,6 +90,7 @@ fi
--yaml-prefix "test_" \ --yaml-prefix "test_" \
\ \
--idl "$in_relative" \ --idl "$in_relative" \
--idl-include-path "./djinni/vendor" \
) )
# Make sure we can parse back our own generated YAML file # Make sure we can parse back our own generated YAML file
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment