dropbox · mknejp · Sep 21, 2016
diff --git a/example/generated-src/jni/NativeItemList.cpp b/example/generated-src/jni/NativeItemList.cpp
@@ -2,7 +2,7 @@
 // This file generated by Djinni from example.djinni
 
 #include "NativeItemList.hpp"  // my header
-#include "Marshal.hpp"
+#include "djinni/jni/Marshal.hpp"
 
 namespace djinni_generated {
 

diff --git a/example/generated-src/jni/NativeItemList.hpp b/example/generated-src/jni/NativeItemList.hpp
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "djinni_support.hpp"
+#include "djinni/jni/djinni_support.hpp"
 #include "item_list.hpp"
 
 namespace djinni_generated {

diff --git a/example/generated-src/jni/NativeSortItems.hpp b/example/generated-src/jni/NativeSortItems.hpp
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "djinni_support.hpp"
+#include "djinni/jni/djinni_support.hpp"
 #include "sort_items.hpp"
 
 namespace djinni_generated {

diff --git a/example/generated-src/jni/NativeSortOrder.hpp b/example/generated-src/jni/NativeSortOrder.hpp
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "djinni_support.hpp"
+#include "djinni/jni/djinni_support.hpp"
 #include "sort_order.hpp"
 
 namespace djinni_generated {

diff --git a/example/generated-src/jni/NativeTextboxListener.hpp b/example/generated-src/jni/NativeTextboxListener.hpp
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "djinni_support.hpp"
+#include "djinni/jni/djinni_support.hpp"
 #include "textbox_listener.hpp"
 
 namespace djinni_generated {

diff --git a/example/generated-src/objc/TXSItemList+Private.mm b/example/generated-src/objc/TXSItemList+Private.mm
@@ -2,7 +2,7 @@
 // This file generated by Djinni from example.djinni
 
 #import "TXSItemList+Private.h"
-#import "DJIMarshal+Private.h"
+#import "djinni/objc/DJIMarshal+Private.h"
 #include <cassert>
 
 namespace djinni_generated {

diff --git a/example/generated-src/objc/TXSSortItems+Private.mm b/example/generated-src/objc/TXSSortItems+Private.mm
@@ -3,11 +3,11 @@
 
 #import "TXSSortItems+Private.h"
 #import "TXSSortItems.h"
-#import "DJICppWrapperCache+Private.h"
-#import "DJIError.h"
 #import "TXSItemList+Private.h"
 #import "TXSSortOrder+Private.h"
 #import "TXSTextboxListener+Private.h"
+#import "djinni/objc/DJICppWrapperCache+Private.h"
+#import "djinni/objc/DJIError.h"
 #include <exception>
 #include <stdexcept>
 #include <utility>

diff --git a/example/generated-src/objc/TXSSortOrder+Private.h b/example/generated-src/objc/TXSSortOrder+Private.h
@@ -2,5 +2,5 @@
 // This file generated by Djinni from example.djinni
 
 #include "sort_order.hpp"
-#import "DJIMarshal+Private.h"
+#import "djinni/objc/DJIMarshal+Private.h"
 
diff --git a/example/generated-src/objc/TXSTextboxListener+Private.mm b/example/generated-src/objc/TXSTextboxListener+Private.mm
@@ -3,8 +3,8 @@
 
 #import "TXSTextboxListener+Private.h"
 #import "TXSTextboxListener.h"
-#import "DJIObjcWrapperCache+Private.h"
 #import "TXSItemList+Private.h"
+#import "djinni/objc/DJIObjcWrapperCache+Private.h"
 #include <stdexcept>
 
 static_assert(__has_feature(objc_arc), "Djinni requires ARC to be enabled for this file");

diff --git a/example/libtextsort.gyp b/example/libtextsort.gyp
@@ -8,7 +8,7 @@
             ],
             "ldflags": [ "-llog", "-Wl,--build-id,--gc-sections,--exclude-libs,ALL" ],
             "sources": [
-              "../support-lib/jni/djinni_main.cpp",
+              "../support-lib/src/jni/djinni_main.cpp",
               "<!@(python glob.py generated-src/jni   '*.cpp' '*.hpp')",
               "<!@(python glob.py generated-src/cpp   '*.cpp' '*.hpp')",
               "<!@(python glob.py handwritten-src/cpp '*.cpp' '*.hpp')",

diff --git a/example/objc/TextSort.xcodeproj/project.pbxproj b/example/objc/TextSort.xcodeproj/project.pbxproj
@@ -254,7 +254,7 @@
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
 				TARGETED_DEVICE_FAMILY = "1,2";
-				USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/../../support-lib/objc $(SRCROOT)/../generated-src/objc";
+				USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/../../support-lib/include/ $(SRCROOT)/../generated-src/objc";
 			};
 			name = Debug;
 		};
@@ -287,7 +287,7 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 7.1;
 				SDKROOT = iphoneos;
 				TARGETED_DEVICE_FAMILY = "1,2";
-				USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/../../support-lib/objc $(SRCROOT)/../generated-src/objc";
+				USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/../../support-lib/include/ $(SRCROOT)/../generated-src/objc";
 				VALIDATE_PRODUCT = YES;
 			};
 			name = Release;

diff --git a/src/source/Main.scala b/src/source/Main.scala
@@ -52,7 +52,7 @@ object Main {
     var jniIncludeCppPrefix: String = ""
     var jniFileIdentStyleOptional: Option[IdentConverter] = None
     var jniBaseLibClassIdentStyleOptional: Option[IdentConverter] = None
-    var jniBaseLibIncludePrefix: String = ""
+    var jniBaseLibIncludePrefix: String = "djinni/jni/"
     var cppHeaderOutFolderOptional: Option[File] = None
     var cppExt: String = "cpp"
     var cppHeaderExt: String = "hpp"
@@ -72,7 +72,7 @@ object Main {
     var objcppIncludeObjcPrefixOptional: Option[String] = None
     var objcFileIdentStyleOptional: Option[IdentConverter] = None
     var objcppNamespace: String = "djinni_generated"
-    var objcBaseLibIncludePrefix: String = ""
+    var objcBaseLibIncludePrefix: String = "djinni/objc/"
     var inFileListPath: Option[File] = None
     var outFileListPath: Option[File] = None
     var skipGeneration: Boolean = false

diff --git a/support-lib/djinni_common.hpp → support-lib/include/djinni/djinni_common.hpp b/support-lib/djinni_common.hpp → support-lib/include/djinni/djinni_common.hpp
diff --git a/support-lib/jni/Marshal.hpp → support-lib/include/djinni/jni/Marshal.hpp b/support-lib/jni/Marshal.hpp → support-lib/include/djinni/jni/Marshal.hpp
@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include "djinni_support.hpp"
+#include "djinni/jni/djinni_support.hpp"
 #include <cassert>
 #include <chrono>
 #include <cstdint>

diff --git a/support-lib/jni/djinni_support.hpp → ...lib/include/djinni/jni/djinni_support.hpp b/support-lib/jni/djinni_support.hpp → ...lib/include/djinni/jni/djinni_support.hpp
@@ -23,8 +23,8 @@
 #include <string>
 #include <unordered_map>
 
-#include "../proxy_cache_interface.hpp"
-#include "../djinni_common.hpp"
+#include "djinni/proxy_cache_interface.hpp"
+#include "djinni/djinni_common.hpp"
 #include <jni.h>
 
 /*

diff --git a/...ort-lib/objc/DJICppWrapperCache+Private.h → .../djinni/objc/DJICppWrapperCache+Private.h b/...ort-lib/objc/DJICppWrapperCache+Private.h → .../djinni/objc/DJICppWrapperCache+Private.h
@@ -19,7 +19,7 @@
 #import <Foundation/Foundation.h>
 #include <memory>
 
-#include "../proxy_cache_interface.hpp"
+#include "djinni/proxy_cache_interface.hpp"
 
 namespace djinni {
 

diff --git a/support-lib/objc/DJIError.h → support-lib/include/djinni/objc/DJIError.h b/support-lib/objc/DJIError.h → support-lib/include/djinni/objc/DJIError.h
diff --git a/support-lib/objc/DJIMarshal+Private.h → .../include/djinni/objc/DJIMarshal+Private.h b/support-lib/objc/DJIMarshal+Private.h → .../include/djinni/objc/DJIMarshal+Private.h
diff --git a/...rt-lib/objc/DJIObjcWrapperCache+Private.h → ...djinni/objc/DJIObjcWrapperCache+Private.h b/...rt-lib/objc/DJIObjcWrapperCache+Private.h → ...djinni/objc/DJIObjcWrapperCache+Private.h
@@ -19,7 +19,7 @@
 #import <Foundation/Foundation.h>
 #include <memory>
 
-#include "../proxy_cache_interface.hpp"
+#include "djinni/proxy_cache_interface.hpp"
 
 namespace djinni {
 

diff --git a/support-lib/proxy_cache_interface.hpp → .../include/djinni/proxy_cache_interface.hpp b/support-lib/proxy_cache_interface.hpp → .../include/djinni/proxy_cache_interface.hpp
diff --git a/support-lib/jni/djinni_main.cpp → support-lib/src/jni/djinni_main.cpp b/support-lib/jni/djinni_main.cpp → support-lib/src/jni/djinni_main.cpp
@@ -17,7 +17,7 @@
 // This provides a minimal JNI_OnLoad and JNI_OnUnload implementation - include it if your
 // app doesn't use JNI except through Djinni.
 
-#include "djinni_support.hpp"
+#include "djinni/jni/djinni_support.hpp"
 
 // Called when library is loaded by the first class which uses it.
 CJNIEXPORT jint JNICALL JNI_OnLoad(JavaVM * jvm, void * /*reserved*/) {

diff --git a/support-lib/jni/djinni_support.cpp → support-lib/src/jni/djinni_support.cpp b/support-lib/jni/djinni_support.cpp → support-lib/src/jni/djinni_support.cpp
@@ -14,8 +14,8 @@
 // limitations under the License.
 //
 
-#include "../djinni_common.hpp"
-#include "djinni_support.hpp"
+#include "djinni/djinni_common.hpp"
+#include "djinni/jni/djinni_support.hpp"
 #include "../proxy_cache_impl.hpp"
 #include <cassert>
 #include <cstdlib>

diff --git a/support-lib/objc/DJIError.mm → support-lib/src/objc/DJIError.mm b/support-lib/objc/DJIError.mm → support-lib/src/objc/DJIError.mm
@@ -15,7 +15,7 @@
 //
 
 #include <Foundation/Foundation.h>
-#include "DJIError.h"
+#include "djinni/objc/DJIError.h"
 #include <exception>
 static_assert(__has_feature(objc_arc), "Djinni requires ARC to be enabled for this file");
 

diff --git a/support-lib/objc/DJIProxyCaches.mm → support-lib/src/objc/DJIProxyCaches.mm b/support-lib/objc/DJIProxyCaches.mm → support-lib/src/objc/DJIProxyCaches.mm
@@ -17,8 +17,8 @@
 static_assert(__has_feature(objc_arc), "Djinni requires ARC to be enabled for this file");
 
 #include "../proxy_cache_impl.hpp"
-#include "DJIObjcWrapperCache+Private.h"
-#include "DJICppWrapperCache+Private.h"
+#include "djinni/objc/DJIObjcWrapperCache+Private.h"
+#include "djinni/objc/DJICppWrapperCache+Private.h"
 
 namespace djinni {
 

diff --git a/support-lib/proxy_cache_impl.hpp → support-lib/src/proxy_cache_impl.hpp b/support-lib/proxy_cache_impl.hpp → support-lib/src/proxy_cache_impl.hpp
@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include "proxy_cache_interface.hpp"
+#include "djinni/proxy_cache_interface.hpp"
 #include <functional>
 #include <mutex>
 #include <unordered_map>

diff --git a/support-lib/support_lib.gyp b/support-lib/support_lib.gyp
@@ -4,17 +4,19 @@
             "target_name": "djinni_jni",
             "type": "static_library",
             "sources": [
-              "djinni_common.hpp",
-              "jni/djinni_support.cpp",
-              "jni/djinni_support.hpp",
-              "jni/Marshal.hpp",
+              "include/djinni/djinni_common.hpp",
+              "include/djinni/jni/djinni_support.hpp",
+              "include/djinni/jni/Marshal.hpp",
+              "src/jni/djinni_support.cpp",
             ],
             "include_dirs": [
-              "jni",
+              "include",
+              "src",
             ],
             "direct_dependent_settings": {
                 "include_dirs": [
-                  "jni",
+                  "include",
+                  "src",
                 ],
             },
         },
@@ -25,21 +27,23 @@
               "CLANG_ENABLE_OBJC_ARC": "YES",
             },
             "sources": [
-              "objc/DJICppWrapperCache+Private.h",
-              "objc/DJIError.h",
-              "objc/DJIError.mm",
-              "objc/DJIMarshal+Private.h",
-              "objc/DJIObjcWrapperCache+Private.h",
-              "objc/DJIProxyCaches.mm",
-              "proxy_cache_impl.hpp",
-              "proxy_cache_interface.hpp",
+              "include/djinni/objc/DJICppWrapperCache+Private.h",
+              "include/djinni/objc/DJIError.h",
+              "include/djinni/objc/DJIMarshal+Private.h",
+              "include/djinni/objc/DJIObjcWrapperCache+Private.h",
+              "include/djinni/proxy_cache_interface.hpp",
+              "src/objc/DJIProxyCaches.mm",
+              "src/objc/DJIError.mm",
+              "src/proxy_cache_impl.hpp",
             ],
             "include_dirs": [
-              "objc",
+              "include",
+              "src",
             ],
             "direct_dependent_settings": {
                 "include_dirs": [
-                  "objc",
+                  "include",
+                  "src",
                 ],
             },
         },

diff --git a/test-suite/djinni/date.yaml b/test-suite/djinni/date.yaml
@@ -16,7 +16,7 @@ objc:
   hash: '(NSUInteger)%s.timeIntervalSinceReferenceDate'
 objcpp:
   translator: '::djinni::Date'
-  header: '"DJIMarshal+Private.h"'
+  header: '"djinni/objc/DJIMarshal+Private.h"'
 java:
   typename: 'java.util.Date'
   boxed: 'java.util.Date'
@@ -25,6 +25,6 @@ java:
   hash: '%s.hashCode()'
 jni:
   translator: '::djinni::Date'
-  header: '"Marshal.hpp"'
+  header: '"djinni/jni/Marshal.hpp"'
   typename: jobject
   typeSignature: 'Ljava/util/Date;'
diff --git a/test-suite/generated-src/jni/NativeAssortedPrimitives.cpp b/test-suite/generated-src/jni/NativeAssortedPrimitives.cpp
@@ -2,7 +2,7 @@
 // This file generated by Djinni from primtypes.djinni
 
 #include "NativeAssortedPrimitives.hpp"  // my header
-#include "Marshal.hpp"
+#include "djinni/jni/Marshal.hpp"
 
 namespace djinni_generated {
 

diff --git a/test-suite/generated-src/jni/NativeAssortedPrimitives.hpp b/test-suite/generated-src/jni/NativeAssortedPrimitives.hpp
@@ -4,7 +4,7 @@
 #pragma once
 
 #include "assorted_primitives.hpp"
-#include "djinni_support.hpp"
+#include "djinni/jni/djinni_support.hpp"
 
 namespace djinni_generated {
 

diff --git a/test-suite/generated-src/jni/NativeClientInterface.cpp b/test-suite/generated-src/jni/NativeClientInterface.cpp
@@ -2,8 +2,8 @@
 // This file generated by Djinni from client_interface.djinni
 
 #include "NativeClientInterface.hpp"  // my header
-#include "Marshal.hpp"
 #include "NativeClientReturnedRecord.hpp"
+#include "djinni/jni/Marshal.hpp"
 
 namespace djinni_generated {
 

diff --git a/test-suite/generated-src/jni/NativeClientInterface.hpp b/test-suite/generated-src/jni/NativeClientInterface.hpp
@@ -4,7 +4,7 @@
 #pragma once
 
 #include "client_interface.hpp"
-#include "djinni_support.hpp"
+#include "djinni/jni/djinni_support.hpp"
 
 namespace djinni_generated {
 

diff --git a/test-suite/generated-src/jni/NativeClientReturnedRecord.cpp b/test-suite/generated-src/jni/NativeClientReturnedRecord.cpp
@@ -2,7 +2,7 @@
 // This file generated by Djinni from client_interface.djinni
 
 #include "NativeClientReturnedRecord.hpp"  // my header
-#include "Marshal.hpp"
+#include "djinni/jni/Marshal.hpp"
 
 namespace djinni_generated {
 

diff --git a/test-suite/generated-src/jni/NativeClientReturnedRecord.hpp b/test-suite/generated-src/jni/NativeClientReturnedRecord.hpp
@@ -4,7 +4,7 @@
 #pragma once
 
 #include "client_returned_record.hpp"
-#include "djinni_support.hpp"
+#include "djinni/jni/djinni_support.hpp"
 
 namespace djinni_generated {
 

diff --git a/test-suite/generated-src/jni/NativeColor.hpp b/test-suite/generated-src/jni/NativeColor.hpp
@@ -4,7 +4,7 @@
 #pragma once
 
 #include "color.hpp"
-#include "djinni_support.hpp"
+#include "djinni/jni/djinni_support.hpp"
 
 namespace djinni_generated {
 

diff --git a/test-suite/generated-src/jni/NativeConflict.hpp b/test-suite/generated-src/jni/NativeConflict.hpp
@@ -4,7 +4,7 @@
 #pragma once
 
 #include "Conflict.hpp"
-#include "djinni_support.hpp"
+#include "djinni/jni/djinni_support.hpp"
 
 namespace djinni_generated {
 

diff --git a/test-suite/generated-src/jni/NativeConflictUser.cpp b/test-suite/generated-src/jni/NativeConflictUser.cpp
@@ -2,8 +2,8 @@
 // This file generated by Djinni from test.djinni
 
 #include "NativeConflictUser.hpp"  // my header
-#include "Marshal.hpp"
 #include "NativeConflict.hpp"
+#include "djinni/jni/Marshal.hpp"
 
 namespace djinni_generated {
 

diff --git a/test-suite/generated-src/jni/NativeConflictUser.hpp b/test-suite/generated-src/jni/NativeConflictUser.hpp
@@ -4,7 +4,7 @@
 #pragma once
 
 #include "conflict_user.hpp"
-#include "djinni_support.hpp"
+#include "djinni/jni/djinni_support.hpp"
 
 namespace djinni_generated {
 

diff --git a/test-suite/generated-src/jni/NativeConstantRecord.cpp b/test-suite/generated-src/jni/NativeConstantRecord.cpp
@@ -2,7 +2,7 @@
 // This file generated by Djinni from constants.djinni
 
 #include "NativeConstantRecord.hpp"  // my header
-#include "Marshal.hpp"
+#include "djinni/jni/Marshal.hpp"
 
 namespace djinni_generated {