add prefix dirs

Snapchat · Jul 31, 2024 · c271198 · c271198
1 parent 683c39f
commit c271198
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/src/source/Main.scala b/src/source/Main.scala
@@ -119,6 +119,8 @@ object Main {
     var swiftxxBaseLibModule: String = "DjinniSupportCxx"
     var swiftxxClassIdentStyleOptional: Option[IdentConverter] = None
     var swiftxxFileIdentStyleOptional: Option[IdentConverter] = None
+    var swiftxxIncludeCppPrefix: String = ""
+    var swiftxxBaseLibIncludePrefix: String = ""
     var inFileListPath: Option[File] = None
     var outFileListPath: Option[File] = None
     var skipGeneration: Boolean = false
@@ -304,6 +306,10 @@ object Main {
         .text("Swift module name (default: \"Module\").")
       opt[File]("swiftxx-out").valueName("<out-folder>").foreach(x => swiftxxOutFolder = Some(x))
         .text("The output folder for private Swift/C++ interop files (Generator disabled if unspecified).")
+      opt[String]("swiftxx-include-cpp-prefix").valueName("<prefix>").foreach(swiftxxIncludeCppPrefix = _)
+        .text("The prefix for #includes of the main header files from Swift C++ files.")
+      opt[String]("swiftxx-base-lib-include-prefix").valueName("...").foreach(x => swiftxxBaseLibIncludePrefix = x)
+        .text("The Swift C++ base library's include path, relative to the Swift C++ classes.")
       note("")
       opt[File]("yaml-out").valueName("<out-folder>").foreach(x => yamlOutFolder = Some(x))
         .text("The output folder for YAML files (Generator disabled if unspecified).")
@@ -519,6 +525,8 @@ object Main {
       swiftxxBaseLibModule,
       swiftxxClassIdentStyle,
       swiftxxFileIdentStyle,
+      swiftxxIncludeCppPrefix,
+      swiftxxBaseLibIncludePrefix,
       outFileListWriter,
       skipGeneration,
       yamlOutFolder,

diff --git a/src/source/SwiftxxGenerator.scala b/src/source/SwiftxxGenerator.scala
@@ -35,8 +35,8 @@ class SwiftxxGenerator(spec: Spec) extends Generator(spec) {
   class SwiftRefs(name: String) {
     var swiftHpp = mutable.TreeSet[String]()
     var swiftCpp = mutable.TreeSet[String]()
-    swiftHpp.add("#include " + q(spec.cppFileIdentStyle(name) + "." + spec.cppHeaderExt))
-    swiftHpp.add("#include " + q("djinni_support.hpp"))
+    swiftHpp.add("#include " + q(spec.swiftxxIncludeCppPrefix + spec.cppFileIdentStyle(name) + "." + spec.cppHeaderExt))
+    swiftHpp.add("#include " + q(spec.swiftxxBaseLibIncludePrefix + "djinni_support.hpp"))
     spec.cppNnHeader match {
       case Some(nnHdr) => swiftHpp.add("#include " + nnHdr)
       case _ =>

diff --git a/src/source/generator.scala b/src/source/generator.scala
@@ -121,6 +121,8 @@ package object generatorTools {
                    swiftxxBaseLibModule: String,
                    swiftxxClassIdentStyle: IdentConverter,
                    swiftxxFileIdentStyle: IdentConverter,
+                   swiftxxIncludeCppPrefix: String,
+                   swiftxxBaseLibIncludePrefix: String,
                    outFileListWriter: Option[Writer],
                    skipGeneration: Boolean,
                    yamlOutFolder: Option[File],