Commit a8c89710 authored by Kenny Kaye's avatar Kenny Kaye

Default include path is directory of first included file

parent 0983bca7
...@@ -24,7 +24,7 @@ object Main { ...@@ -24,7 +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 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 = ""
......
...@@ -55,7 +55,7 @@ private object IdlParser extends RegexParsers { ...@@ -55,7 +55,7 @@ private object IdlParser extends RegexParsers {
includePaths.foreach(path => { includePaths.foreach(path => {
if (file.isEmpty) { if (file.isEmpty) {
var relPath = if (path == ".") fileParent else path + "/" var relPath = if (path.isEmpty) fileParent else path + "/"
val tmp = new File(relPath + fileName); val tmp = new File(relPath + fileName);
if (tmp.exists) if (tmp.exists)
file = Some(tmp) file = Some(tmp)
......
...@@ -17,5 +17,5 @@ djinni/single_language_interfaces.djinni ...@@ -17,5 +17,5 @@ djinni/single_language_interfaces.djinni
djinni/extended_record.djinni djinni/extended_record.djinni
djinni/date.djinni djinni/date.djinni
djinni/date.yaml djinni/date.yaml
./djinni/vendor/third-party/duration.djinni djinni/vendor/third-party/duration.djinni
./djinni/vendor/third-party/duration.yaml djinni/vendor/third-party/duration.yaml
...@@ -90,7 +90,7 @@ fi ...@@ -90,7 +90,7 @@ fi
--yaml-prefix "test_" \ --yaml-prefix "test_" \
\ \
--idl "$in_relative" \ --idl "$in_relative" \
--idl-include-path "./djinni/vendor" \ --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