From d6afab5b97ec51e9961895799755767a3f19c7b5 Mon Sep 17 00:00:00 2001 From: Miro Knejp Date: Mon, 4 Jul 2016 16:56:40 +0200 Subject: [PATCH] Move public headers to include/djinni This separation of public and private headers allows users to specify "include/" as obvious header search path and then use "#include " as reliable include prefix. This also gives a sensible default for all the "--xxx-base-lib-include-prefix" values. --- example/generated-src/jni/NativeItemList.cpp | 2 +- example/generated-src/jni/NativeItemList.hpp | 2 +- example/generated-src/jni/NativeSortItems.hpp | 2 +- example/generated-src/jni/NativeSortOrder.hpp | 2 +- .../jni/NativeTextboxListener.hpp | 2 +- .../generated-src/objc/TXSItemList+Private.mm | 2 +- .../objc/TXSSortItems+Private.mm | 6 +-- .../objc/TXSTextboxListener+Private.mm | 2 +- .../djinni/support-lib}/djinni_common.hpp | 0 .../djinni/support-lib}/jni/Marshal.hpp | 2 +- .../support-lib}/jni/djinni_support.hpp | 4 +- .../objc/DJICppWrapperCache+Private.h | 2 +- .../djinni/support-lib}/objc/DJIError.h | 0 .../support-lib}/objc/DJIMarshal+Private.h | 0 .../objc/DJIObjcWrapperCache+Private.h | 2 +- .../support-lib}/proxy_cache_interface.hpp | 0 src/source/Main.scala | 4 +- support-lib/jni/djinni_main.cpp | 2 +- support-lib/jni/djinni_support.cpp | 4 +- support-lib/objc/DJIError.mm | 2 +- support-lib/objc/DJIProxyCaches.mm | 4 +- support-lib/proxy_cache_impl.hpp | 2 +- support-lib/support_lib.gyp | 20 +++++---- test-suite/djinni/date.yaml | 4 +- .../jni/NativeAssortedPrimitives.cpp | 2 +- .../jni/NativeAssortedPrimitives.hpp | 2 +- .../jni/NativeClientInterface.cpp | 2 +- .../jni/NativeClientInterface.hpp | 2 +- .../jni/NativeClientReturnedRecord.cpp | 2 +- .../jni/NativeClientReturnedRecord.hpp | 2 +- test-suite/generated-src/jni/NativeColor.hpp | 2 +- .../generated-src/jni/NativeConflict.hpp | 2 +- .../generated-src/jni/NativeConflictUser.cpp | 2 +- .../generated-src/jni/NativeConflictUser.hpp | 2 +- .../jni/NativeConstantRecord.cpp | 2 +- .../jni/NativeConstantRecord.hpp | 2 +- .../generated-src/jni/NativeConstants.hpp | 2 +- .../jni/NativeConstantsInterface.cpp | 2 +- .../jni/NativeConstantsInterface.hpp | 2 +- .../generated-src/jni/NativeCppException.cpp | 2 +- .../generated-src/jni/NativeCppException.hpp | 2 +- .../generated-src/jni/NativeDateRecord.cpp | 2 +- .../generated-src/jni/NativeDateRecord.hpp | 2 +- .../generated-src/jni/NativeEmptyRecord.hpp | 2 +- .../jni/NativeExtendedRecord.cpp | 2 +- .../jni/NativeExtendedRecord.hpp | 2 +- .../jni/NativeExternInterface1.hpp | 2 +- .../jni/NativeExternInterface2.hpp | 2 +- .../jni/NativeExternRecordWithDerivings.hpp | 2 +- .../generated-src/jni/NativeFirstListener.hpp | 2 +- .../jni/NativeJavaOnlyListener.hpp | 2 +- .../jni/NativeListenerCaller.hpp | 2 +- .../generated-src/jni/NativeMapDateRecord.cpp | 2 +- .../generated-src/jni/NativeMapDateRecord.hpp | 2 +- .../generated-src/jni/NativeMapListRecord.cpp | 2 +- .../generated-src/jni/NativeMapListRecord.hpp | 2 +- .../generated-src/jni/NativeMapRecord.cpp | 2 +- .../generated-src/jni/NativeMapRecord.hpp | 2 +- .../jni/NativeNestedCollection.cpp | 2 +- .../jni/NativeNestedCollection.hpp | 2 +- .../jni/NativeObjcOnlyListener.hpp | 2 +- .../jni/NativeOptColorRecord.cpp | 2 +- .../jni/NativeOptColorRecord.hpp | 2 +- .../generated-src/jni/NativePrimitiveList.cpp | 2 +- .../generated-src/jni/NativePrimitiveList.hpp | 2 +- .../jni/NativeRecordWithDerivings.cpp | 2 +- .../jni/NativeRecordWithDerivings.hpp | 2 +- .../NativeRecordWithDurationAndDerivings.cpp | 2 +- .../NativeRecordWithDurationAndDerivings.hpp | 2 +- .../jni/NativeRecordWithNestedDerivings.cpp | 2 +- .../jni/NativeRecordWithNestedDerivings.hpp | 2 +- .../generated-src/jni/NativeReturnOne.cpp | 2 +- .../generated-src/jni/NativeReturnOne.hpp | 2 +- .../generated-src/jni/NativeReturnTwo.cpp | 2 +- .../generated-src/jni/NativeReturnTwo.hpp | 2 +- .../jni/NativeReverseClientInterface.cpp | 2 +- .../jni/NativeReverseClientInterface.hpp | 2 +- .../jni/NativeSecondListener.hpp | 2 +- .../generated-src/jni/NativeSetRecord.cpp | 2 +- .../generated-src/jni/NativeSetRecord.hpp | 2 +- .../generated-src/jni/NativeTestDuration.cpp | 2 +- .../generated-src/jni/NativeTestDuration.hpp | 2 +- .../generated-src/jni/NativeTestHelpers.cpp | 2 +- .../generated-src/jni/NativeTestHelpers.hpp | 2 +- .../generated-src/jni/NativeUserToken.cpp | 2 +- .../generated-src/jni/NativeUserToken.hpp | 2 +- .../jni/NativeUsesSingleLanguageListeners.hpp | 2 +- .../objc/DBAssortedPrimitives+Private.mm | 2 +- .../objc/DBClientInterface+Private.mm | 4 +- .../objc/DBClientReturnedRecord+Private.mm | 2 +- .../generated-src/objc/DBConflict+Private.mm | 4 +- .../objc/DBConflictUser+Private.mm | 6 +-- .../objc/DBConstantRecord+Private.mm | 2 +- .../generated-src/objc/DBConstants+Private.mm | 2 +- .../objc/DBConstantsInterface+Private.mm | 6 +-- .../objc/DBCppException+Private.mm | 6 +-- .../objc/DBDateRecord+Private.mm | 2 +- .../objc/DBExtendedRecord+Private.mm | 2 +- .../objc/DBExternInterface1+Private.mm | 4 +- .../objc/DBExternInterface2+Private.mm | 2 +- .../DBExternRecordWithDerivings+Private.mm | 2 +- .../objc/DBFirstListener+Private.mm | 2 +- .../objc/DBListenerCaller+Private.mm | 4 +- .../objc/DBMapDateRecord+Private.mm | 2 +- .../objc/DBMapListRecord+Private.mm | 2 +- .../generated-src/objc/DBMapRecord+Private.mm | 2 +- .../objc/DBNestedCollection+Private.mm | 2 +- .../objc/DBObjcOnlyListener+Private.mm | 2 +- .../objc/DBOptColorRecord+Private.mm | 2 +- .../objc/DBPrimitiveList+Private.mm | 2 +- .../objc/DBRecordWithDerivings+Private.mm | 2 +- ...BRecordWithDurationAndDerivings+Private.mm | 2 +- .../DBRecordWithNestedDerivings+Private.mm | 2 +- .../generated-src/objc/DBReturnOne+Private.mm | 6 +-- .../generated-src/objc/DBReturnTwo+Private.mm | 6 +-- .../objc/DBReverseClientInterface+Private.mm | 6 +-- .../objc/DBSecondListener+Private.mm | 2 +- .../generated-src/objc/DBSetRecord+Private.mm | 2 +- .../objc/DBTestDuration+Private.mm | 6 +-- .../objc/DBTestHelpers+Private.mm | 6 +-- .../generated-src/objc/DBUserToken+Private.mm | 8 ++-- .../DBUsesSingleLanguageListeners+Private.mm | 6 +-- .../handwritten-src/cpp/Duration-jni.hpp | 2 +- test-suite/java/CMakeLists.txt | 3 +- .../DjinniObjcTest.xcodeproj/project.pbxproj | 44 ++++++++++--------- 125 files changed, 188 insertions(+), 179 deletions(-) rename {support-lib => include/djinni/support-lib}/djinni_common.hpp (100%) rename {support-lib => include/djinni/support-lib}/jni/Marshal.hpp (99%) rename {support-lib => include/djinni/support-lib}/jni/djinni_support.hpp (99%) rename {support-lib => include/djinni/support-lib}/objc/DJICppWrapperCache+Private.h (97%) rename {support-lib => include/djinni/support-lib}/objc/DJIError.h (100%) rename {support-lib => include/djinni/support-lib}/objc/DJIMarshal+Private.h (100%) rename {support-lib => include/djinni/support-lib}/objc/DJIObjcWrapperCache+Private.h (97%) rename {support-lib => include/djinni/support-lib}/proxy_cache_interface.hpp (100%) diff --git a/example/generated-src/jni/NativeItemList.cpp b/example/generated-src/jni/NativeItemList.cpp index f6d79ab9b..9def13cc4 100644 --- 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/support-lib/jni/Marshal.hpp" namespace djinni_generated { diff --git a/example/generated-src/jni/NativeItemList.hpp b/example/generated-src/jni/NativeItemList.hpp index 57f7e7d77..413635132 100644 --- 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/support-lib/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 index ccd86b676..f4b85ac8c 100644 --- 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/support-lib/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 index 1e8a2a274..c856e37a2 100644 --- 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/support-lib/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 index 9f400bc49..f54de53ae 100644 --- 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/support-lib/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 index 1109e845d..c282dee16 100644 --- 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/support-lib/objc/DJIMarshal+Private.h" #include namespace djinni_generated { diff --git a/example/generated-src/objc/TXSSortItems+Private.mm b/example/generated-src/objc/TXSSortItems+Private.mm index 548b73c3b..cd8a9f807 100644 --- a/example/generated-src/objc/TXSSortItems+Private.mm +++ b/example/generated-src/objc/TXSSortItems+Private.mm @@ -3,12 +3,12 @@ #import "TXSSortItems+Private.h" #import "TXSSortItems.h" -#import "DJICppWrapperCache+Private.h" -#import "DJIError.h" -#import "DJIMarshal+Private.h" #import "TXSItemList+Private.h" #import "TXSSortItems+Private.h" #import "TXSTextboxListener+Private.h" +#import "djinni/support-lib/objc/DJICppWrapperCache+Private.h" +#import "djinni/support-lib/objc/DJIError.h" +#import "djinni/support-lib/objc/DJIMarshal+Private.h" #include #include diff --git a/example/generated-src/objc/TXSTextboxListener+Private.mm b/example/generated-src/objc/TXSTextboxListener+Private.mm index 655983807..e977bdf1b 100644 --- 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/support-lib/objc/DJIObjcWrapperCache+Private.h" static_assert(__has_feature(objc_arc), "Djinni requires ARC to be enabled for this file"); diff --git a/support-lib/djinni_common.hpp b/include/djinni/support-lib/djinni_common.hpp similarity index 100% rename from support-lib/djinni_common.hpp rename to include/djinni/support-lib/djinni_common.hpp diff --git a/support-lib/jni/Marshal.hpp b/include/djinni/support-lib/jni/Marshal.hpp similarity index 99% rename from support-lib/jni/Marshal.hpp rename to include/djinni/support-lib/jni/Marshal.hpp index d51b1865f..cb63eed10 100644 --- a/support-lib/jni/Marshal.hpp +++ b/include/djinni/support-lib/jni/Marshal.hpp @@ -16,7 +16,7 @@ #pragma once -#include "djinni_support.hpp" +#include "djinni/support-lib/jni/djinni_support.hpp" #include #include #include diff --git a/support-lib/jni/djinni_support.hpp b/include/djinni/support-lib/jni/djinni_support.hpp similarity index 99% rename from support-lib/jni/djinni_support.hpp rename to include/djinni/support-lib/jni/djinni_support.hpp index 5d6ab6a86..4db80f9f2 100644 --- a/support-lib/jni/djinni_support.hpp +++ b/include/djinni/support-lib/jni/djinni_support.hpp @@ -23,8 +23,8 @@ #include #include -#include "../proxy_cache_interface.hpp" -#include "../djinni_common.hpp" +#include "djinni/support-lib/proxy_cache_interface.hpp" +#include "djinni/support-lib/djinni_common.hpp" #include /* diff --git a/support-lib/objc/DJICppWrapperCache+Private.h b/include/djinni/support-lib/objc/DJICppWrapperCache+Private.h similarity index 97% rename from support-lib/objc/DJICppWrapperCache+Private.h rename to include/djinni/support-lib/objc/DJICppWrapperCache+Private.h index 425460970..214496d38 100644 --- a/support-lib/objc/DJICppWrapperCache+Private.h +++ b/include/djinni/support-lib/objc/DJICppWrapperCache+Private.h @@ -19,7 +19,7 @@ #import #include -#include "../proxy_cache_interface.hpp" +#include "djinni/support-lib/proxy_cache_interface.hpp" namespace djinni { diff --git a/support-lib/objc/DJIError.h b/include/djinni/support-lib/objc/DJIError.h similarity index 100% rename from support-lib/objc/DJIError.h rename to include/djinni/support-lib/objc/DJIError.h diff --git a/support-lib/objc/DJIMarshal+Private.h b/include/djinni/support-lib/objc/DJIMarshal+Private.h similarity index 100% rename from support-lib/objc/DJIMarshal+Private.h rename to include/djinni/support-lib/objc/DJIMarshal+Private.h diff --git a/support-lib/objc/DJIObjcWrapperCache+Private.h b/include/djinni/support-lib/objc/DJIObjcWrapperCache+Private.h similarity index 97% rename from support-lib/objc/DJIObjcWrapperCache+Private.h rename to include/djinni/support-lib/objc/DJIObjcWrapperCache+Private.h index 3c37d55d3..5b431efdc 100644 --- a/support-lib/objc/DJIObjcWrapperCache+Private.h +++ b/include/djinni/support-lib/objc/DJIObjcWrapperCache+Private.h @@ -19,7 +19,7 @@ #import #include -#include "../proxy_cache_interface.hpp" +#include "djinni/support-lib/proxy_cache_interface.hpp" namespace djinni { diff --git a/support-lib/proxy_cache_interface.hpp b/include/djinni/support-lib/proxy_cache_interface.hpp similarity index 100% rename from support-lib/proxy_cache_interface.hpp rename to include/djinni/support-lib/proxy_cache_interface.hpp diff --git a/src/source/Main.scala b/src/source/Main.scala index 07ab15810..320249a3a 100644 --- a/src/source/Main.scala +++ b/src/source/Main.scala @@ -50,7 +50,7 @@ object Main { var jniIncludeCppPrefix: String = "" var jniFileIdentStyleOptional: Option[IdentConverter] = None var jniBaseLibClassIdentStyleOptional: Option[IdentConverter] = None - var jniBaseLibIncludePrefix: String = "" + var jniBaseLibIncludePrefix: String = "djinni/support-lib/jni/" var cppHeaderOutFolderOptional: Option[File] = None var cppExt: String = "cpp" var cppHeaderExt: String = "hpp" @@ -70,7 +70,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/support-lib/objc/" var inFileListPath: Option[File] = None var outFileListPath: Option[File] = None var skipGeneration: Boolean = false diff --git a/support-lib/jni/djinni_main.cpp b/support-lib/jni/djinni_main.cpp index f6556956a..58874cbba 100644 --- a/support-lib/jni/djinni_main.cpp +++ b/support-lib/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/support-lib/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 b/support-lib/jni/djinni_support.cpp index ee6367c26..8f5a16114 100644 --- a/support-lib/jni/djinni_support.cpp +++ b/support-lib/jni/djinni_support.cpp @@ -14,8 +14,8 @@ // limitations under the License. // -#include "../djinni_common.hpp" -#include "djinni_support.hpp" +#include "djinni/support-lib/djinni_common.hpp" +#include "djinni/support-lib/jni/djinni_support.hpp" #include "../proxy_cache_impl.hpp" #include #include diff --git a/support-lib/objc/DJIError.mm b/support-lib/objc/DJIError.mm index 672ef358f..4334b14d6 100644 --- a/support-lib/objc/DJIError.mm +++ b/support-lib/objc/DJIError.mm @@ -15,7 +15,7 @@ // #include -#include "DJIError.h" +#include "djinni/support-lib/objc/DJIError.h" #include static_assert(__has_feature(objc_arc), "Djinni requires ARC to be enabled for this file"); diff --git a/support-lib/objc/DJIProxyCaches.mm b/support-lib/objc/DJIProxyCaches.mm index 53876cd46..15bd642ad 100644 --- a/support-lib/objc/DJIProxyCaches.mm +++ b/support-lib/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/support-lib/objc/DJIObjcWrapperCache+Private.h" +#include "djinni/support-lib/objc/DJICppWrapperCache+Private.h" namespace djinni { diff --git a/support-lib/proxy_cache_impl.hpp b/support-lib/proxy_cache_impl.hpp index 897701b0e..0cc1abe84 100644 --- a/support-lib/proxy_cache_impl.hpp +++ b/support-lib/proxy_cache_impl.hpp @@ -16,7 +16,7 @@ #pragma once -#include "proxy_cache_interface.hpp" +#include "djinni/support-lib/proxy_cache_interface.hpp" #include #include #include diff --git a/support-lib/support_lib.gyp b/support-lib/support_lib.gyp index 7ac16a19b..2f28efbbc 100644 --- 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", + "../include/djinni/support-lib/djinni_common.hpp", + "../include/djinni/support-lib/jni/djinni_support.hpp", + "../include/djinni/support-lib/jni/Marshal.hpp", "jni/djinni_support.cpp", - "jni/djinni_support.hpp", - "jni/Marshal.hpp", ], "include_dirs": [ "jni", + "../include" ], "direct_dependent_settings": { "include_dirs": [ "jni", + "../include" ], }, }, @@ -25,21 +27,23 @@ "CLANG_ENABLE_OBJC_ARC": "YES", }, "sources": [ - "objc/DJICppWrapperCache+Private.h", - "objc/DJIError.h", + "../include/djinni/support-lib/objc/DJICppWrapperCache+Private.h", + "../include/djinni/support-lib/objc/DJIError.h", + "../include/djinni/support-lib/objc/DJIMarshal+Private.h", + "../include/djinni/support-lib/objc/DJIObjcWrapperCache+Private.h", + "../include/djinni/support-lib/proxy_cache_interface.hpp", "objc/DJIError.mm", - "objc/DJIMarshal+Private.h", - "objc/DJIObjcWrapperCache+Private.h", "objc/DJIProxyCaches.mm", "proxy_cache_impl.hpp", - "proxy_cache_interface.hpp", ], "include_dirs": [ "objc", + "../include" ], "direct_dependent_settings": { "include_dirs": [ "objc", + "../include" ], }, }, diff --git a/test-suite/djinni/date.yaml b/test-suite/djinni/date.yaml index b49bbf602..f70255e6e 100644 --- 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/support-lib/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/support-lib/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 index 098a8a2fc..59e1dd3ae 100644 --- 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/support-lib/jni/Marshal.hpp" namespace djinni_generated { diff --git a/test-suite/generated-src/jni/NativeAssortedPrimitives.hpp b/test-suite/generated-src/jni/NativeAssortedPrimitives.hpp index 00583bcc8..79bd3bab2 100644 --- 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/support-lib/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 index 3c7ac5f86..cde8c2b35 100644 --- a/test-suite/generated-src/jni/NativeClientInterface.cpp +++ b/test-suite/generated-src/jni/NativeClientInterface.cpp @@ -2,9 +2,9 @@ // This file generated by Djinni from client_interface.djinni #include "NativeClientInterface.hpp" // my header -#include "Marshal.hpp" #include "NativeClientInterface.hpp" #include "NativeClientReturnedRecord.hpp" +#include "djinni/support-lib/jni/Marshal.hpp" namespace djinni_generated { diff --git a/test-suite/generated-src/jni/NativeClientInterface.hpp b/test-suite/generated-src/jni/NativeClientInterface.hpp index a8a723a3a..df0d3290c 100644 --- 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/support-lib/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 index da59503ed..9323b56c0 100644 --- 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/support-lib/jni/Marshal.hpp" namespace djinni_generated { diff --git a/test-suite/generated-src/jni/NativeClientReturnedRecord.hpp b/test-suite/generated-src/jni/NativeClientReturnedRecord.hpp index 9c81fe4bd..724744039 100644 --- 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/support-lib/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 index b4fae7300..0230a9e69 100644 --- 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/support-lib/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 index f4e6a1ce3..723bfdb4c 100644 --- 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/support-lib/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 index 271c1a54e..d7d48686c 100644 --- 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/support-lib/jni/Marshal.hpp" namespace djinni_generated { diff --git a/test-suite/generated-src/jni/NativeConflictUser.hpp b/test-suite/generated-src/jni/NativeConflictUser.hpp index 8c6cdd465..bb93fd2b6 100644 --- 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/support-lib/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 index 209246b71..735cdd8e6 100644 --- 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/support-lib/jni/Marshal.hpp" namespace djinni_generated { diff --git a/test-suite/generated-src/jni/NativeConstantRecord.hpp b/test-suite/generated-src/jni/NativeConstantRecord.hpp index b486dcb38..66e2e773f 100644 --- a/test-suite/generated-src/jni/NativeConstantRecord.hpp +++ b/test-suite/generated-src/jni/NativeConstantRecord.hpp @@ -4,7 +4,7 @@ #pragma once #include "constant_record.hpp" -#include "djinni_support.hpp" +#include "djinni/support-lib/jni/djinni_support.hpp" namespace djinni_generated { diff --git a/test-suite/generated-src/jni/NativeConstants.hpp b/test-suite/generated-src/jni/NativeConstants.hpp index 55fdc908d..f7c21c2ad 100644 --- a/test-suite/generated-src/jni/NativeConstants.hpp +++ b/test-suite/generated-src/jni/NativeConstants.hpp @@ -4,7 +4,7 @@ #pragma once #include "constants.hpp" -#include "djinni_support.hpp" +#include "djinni/support-lib/jni/djinni_support.hpp" namespace djinni_generated { diff --git a/test-suite/generated-src/jni/NativeConstantsInterface.cpp b/test-suite/generated-src/jni/NativeConstantsInterface.cpp index 9928944c1..f816fe50b 100644 --- a/test-suite/generated-src/jni/NativeConstantsInterface.cpp +++ b/test-suite/generated-src/jni/NativeConstantsInterface.cpp @@ -2,8 +2,8 @@ // This file generated by Djinni from constants.djinni #include "NativeConstantsInterface.hpp" // my header -#include "Marshal.hpp" #include "NativeConstantRecord.hpp" +#include "djinni/support-lib/jni/Marshal.hpp" namespace djinni_generated { diff --git a/test-suite/generated-src/jni/NativeConstantsInterface.hpp b/test-suite/generated-src/jni/NativeConstantsInterface.hpp index bd20f0fab..4d23c6155 100644 --- a/test-suite/generated-src/jni/NativeConstantsInterface.hpp +++ b/test-suite/generated-src/jni/NativeConstantsInterface.hpp @@ -4,7 +4,7 @@ #pragma once #include "constants_interface.hpp" -#include "djinni_support.hpp" +#include "djinni/support-lib/jni/djinni_support.hpp" namespace djinni_generated { diff --git a/test-suite/generated-src/jni/NativeCppException.cpp b/test-suite/generated-src/jni/NativeCppException.cpp index c5a724f34..3670f8aca 100644 --- a/test-suite/generated-src/jni/NativeCppException.cpp +++ b/test-suite/generated-src/jni/NativeCppException.cpp @@ -2,8 +2,8 @@ // This file generated by Djinni from exception.djinni #include "NativeCppException.hpp" // my header -#include "Marshal.hpp" #include "NativeCppException.hpp" +#include "djinni/support-lib/jni/Marshal.hpp" namespace djinni_generated { diff --git a/test-suite/generated-src/jni/NativeCppException.hpp b/test-suite/generated-src/jni/NativeCppException.hpp index 4fb0a508c..f309b97dd 100644 --- a/test-suite/generated-src/jni/NativeCppException.hpp +++ b/test-suite/generated-src/jni/NativeCppException.hpp @@ -4,7 +4,7 @@ #pragma once #include "cpp_exception.hpp" -#include "djinni_support.hpp" +#include "djinni/support-lib/jni/djinni_support.hpp" namespace djinni_generated { diff --git a/test-suite/generated-src/jni/NativeDateRecord.cpp b/test-suite/generated-src/jni/NativeDateRecord.cpp index b2580e16c..4b36f56ed 100644 --- a/test-suite/generated-src/jni/NativeDateRecord.cpp +++ b/test-suite/generated-src/jni/NativeDateRecord.cpp @@ -2,7 +2,7 @@ // This file generated by Djinni from date.djinni #include "NativeDateRecord.hpp" // my header -#include "Marshal.hpp" +#include "djinni/support-lib/jni/Marshal.hpp" namespace djinni_generated { diff --git a/test-suite/generated-src/jni/NativeDateRecord.hpp b/test-suite/generated-src/jni/NativeDateRecord.hpp index 3b9503606..05a139941 100644 --- a/test-suite/generated-src/jni/NativeDateRecord.hpp +++ b/test-suite/generated-src/jni/NativeDateRecord.hpp @@ -4,7 +4,7 @@ #pragma once #include "date_record.hpp" -#include "djinni_support.hpp" +#include "djinni/support-lib/jni/djinni_support.hpp" namespace djinni_generated { diff --git a/test-suite/generated-src/jni/NativeEmptyRecord.hpp b/test-suite/generated-src/jni/NativeEmptyRecord.hpp index beb2c5875..f06a247b3 100644 --- a/test-suite/generated-src/jni/NativeEmptyRecord.hpp +++ b/test-suite/generated-src/jni/NativeEmptyRecord.hpp @@ -3,7 +3,7 @@ #pragma once -#include "djinni_support.hpp" +#include "djinni/support-lib/jni/djinni_support.hpp" #include "empty_record.hpp" namespace djinni_generated { diff --git a/test-suite/generated-src/jni/NativeExtendedRecord.cpp b/test-suite/generated-src/jni/NativeExtendedRecord.cpp index 57ebe529b..ba0390037 100644 --- a/test-suite/generated-src/jni/NativeExtendedRecord.cpp +++ b/test-suite/generated-src/jni/NativeExtendedRecord.cpp @@ -2,7 +2,7 @@ // This file generated by Djinni from extended_record.djinni #include "NativeExtendedRecord.hpp" // my header -#include "Marshal.hpp" +#include "djinni/support-lib/jni/Marshal.hpp" namespace djinni_generated { diff --git a/test-suite/generated-src/jni/NativeExtendedRecord.hpp b/test-suite/generated-src/jni/NativeExtendedRecord.hpp index 64ce0fc66..accd1c871 100644 --- a/test-suite/generated-src/jni/NativeExtendedRecord.hpp +++ b/test-suite/generated-src/jni/NativeExtendedRecord.hpp @@ -3,7 +3,7 @@ #pragma once -#include "djinni_support.hpp" +#include "djinni/support-lib/jni/djinni_support.hpp" #include "extended_record.hpp" namespace djinni_generated { diff --git a/test-suite/generated-src/jni/NativeExternInterface1.hpp b/test-suite/generated-src/jni/NativeExternInterface1.hpp index d0d1902ef..62a8c4ffe 100644 --- a/test-suite/generated-src/jni/NativeExternInterface1.hpp +++ b/test-suite/generated-src/jni/NativeExternInterface1.hpp @@ -3,7 +3,7 @@ #pragma once -#include "djinni_support.hpp" +#include "djinni/support-lib/jni/djinni_support.hpp" #include "extern_interface_1.hpp" namespace djinni_generated { diff --git a/test-suite/generated-src/jni/NativeExternInterface2.hpp b/test-suite/generated-src/jni/NativeExternInterface2.hpp index 25e36ef70..a877d9f8e 100644 --- a/test-suite/generated-src/jni/NativeExternInterface2.hpp +++ b/test-suite/generated-src/jni/NativeExternInterface2.hpp @@ -3,7 +3,7 @@ #pragma once -#include "djinni_support.hpp" +#include "djinni/support-lib/jni/djinni_support.hpp" #include "extern_interface_2.hpp" namespace djinni_generated { diff --git a/test-suite/generated-src/jni/NativeExternRecordWithDerivings.hpp b/test-suite/generated-src/jni/NativeExternRecordWithDerivings.hpp index c4b86d1c0..e4183fe57 100644 --- a/test-suite/generated-src/jni/NativeExternRecordWithDerivings.hpp +++ b/test-suite/generated-src/jni/NativeExternRecordWithDerivings.hpp @@ -3,7 +3,7 @@ #pragma once -#include "djinni_support.hpp" +#include "djinni/support-lib/jni/djinni_support.hpp" #include "extern_record_with_derivings.hpp" namespace djinni_generated { diff --git a/test-suite/generated-src/jni/NativeFirstListener.hpp b/test-suite/generated-src/jni/NativeFirstListener.hpp index 72d3de7be..a99410978 100644 --- a/test-suite/generated-src/jni/NativeFirstListener.hpp +++ b/test-suite/generated-src/jni/NativeFirstListener.hpp @@ -3,7 +3,7 @@ #pragma once -#include "djinni_support.hpp" +#include "djinni/support-lib/jni/djinni_support.hpp" #include "first_listener.hpp" namespace djinni_generated { diff --git a/test-suite/generated-src/jni/NativeJavaOnlyListener.hpp b/test-suite/generated-src/jni/NativeJavaOnlyListener.hpp index 7d3e92d8a..5bb64ed24 100644 --- a/test-suite/generated-src/jni/NativeJavaOnlyListener.hpp +++ b/test-suite/generated-src/jni/NativeJavaOnlyListener.hpp @@ -3,7 +3,7 @@ #pragma once -#include "djinni_support.hpp" +#include "djinni/support-lib/jni/djinni_support.hpp" #include "java_only_listener.hpp" namespace djinni_generated { diff --git a/test-suite/generated-src/jni/NativeListenerCaller.hpp b/test-suite/generated-src/jni/NativeListenerCaller.hpp index f7830964f..129dbcb95 100644 --- a/test-suite/generated-src/jni/NativeListenerCaller.hpp +++ b/test-suite/generated-src/jni/NativeListenerCaller.hpp @@ -3,7 +3,7 @@ #pragma once -#include "djinni_support.hpp" +#include "djinni/support-lib/jni/djinni_support.hpp" #include "listener_caller.hpp" namespace djinni_generated { diff --git a/test-suite/generated-src/jni/NativeMapDateRecord.cpp b/test-suite/generated-src/jni/NativeMapDateRecord.cpp index eb359d1ee..5a3320162 100644 --- a/test-suite/generated-src/jni/NativeMapDateRecord.cpp +++ b/test-suite/generated-src/jni/NativeMapDateRecord.cpp @@ -2,7 +2,7 @@ // This file generated by Djinni from date.djinni #include "NativeMapDateRecord.hpp" // my header -#include "Marshal.hpp" +#include "djinni/support-lib/jni/Marshal.hpp" namespace djinni_generated { diff --git a/test-suite/generated-src/jni/NativeMapDateRecord.hpp b/test-suite/generated-src/jni/NativeMapDateRecord.hpp index a0bb744ae..804148608 100644 --- a/test-suite/generated-src/jni/NativeMapDateRecord.hpp +++ b/test-suite/generated-src/jni/NativeMapDateRecord.hpp @@ -3,7 +3,7 @@ #pragma once -#include "djinni_support.hpp" +#include "djinni/support-lib/jni/djinni_support.hpp" #include "map_date_record.hpp" namespace djinni_generated { diff --git a/test-suite/generated-src/jni/NativeMapListRecord.cpp b/test-suite/generated-src/jni/NativeMapListRecord.cpp index a29ae6fdd..dd6d7624b 100644 --- a/test-suite/generated-src/jni/NativeMapListRecord.cpp +++ b/test-suite/generated-src/jni/NativeMapListRecord.cpp @@ -2,7 +2,7 @@ // This file generated by Djinni from map.djinni #include "NativeMapListRecord.hpp" // my header -#include "Marshal.hpp" +#include "djinni/support-lib/jni/Marshal.hpp" namespace djinni_generated { diff --git a/test-suite/generated-src/jni/NativeMapListRecord.hpp b/test-suite/generated-src/jni/NativeMapListRecord.hpp index c26eb9868..c310c57f7 100644 --- a/test-suite/generated-src/jni/NativeMapListRecord.hpp +++ b/test-suite/generated-src/jni/NativeMapListRecord.hpp @@ -3,7 +3,7 @@ #pragma once -#include "djinni_support.hpp" +#include "djinni/support-lib/jni/djinni_support.hpp" #include "map_list_record.hpp" namespace djinni_generated { diff --git a/test-suite/generated-src/jni/NativeMapRecord.cpp b/test-suite/generated-src/jni/NativeMapRecord.cpp index 21dd19245..2977bae00 100644 --- a/test-suite/generated-src/jni/NativeMapRecord.cpp +++ b/test-suite/generated-src/jni/NativeMapRecord.cpp @@ -2,7 +2,7 @@ // This file generated by Djinni from map.djinni #include "NativeMapRecord.hpp" // my header -#include "Marshal.hpp" +#include "djinni/support-lib/jni/Marshal.hpp" namespace djinni_generated { diff --git a/test-suite/generated-src/jni/NativeMapRecord.hpp b/test-suite/generated-src/jni/NativeMapRecord.hpp index 43a1a61a4..f591c94da 100644 --- a/test-suite/generated-src/jni/NativeMapRecord.hpp +++ b/test-suite/generated-src/jni/NativeMapRecord.hpp @@ -3,7 +3,7 @@ #pragma once -#include "djinni_support.hpp" +#include "djinni/support-lib/jni/djinni_support.hpp" #include "map_record.hpp" namespace djinni_generated { diff --git a/test-suite/generated-src/jni/NativeNestedCollection.cpp b/test-suite/generated-src/jni/NativeNestedCollection.cpp index 2d4333095..2f1b4f369 100644 --- a/test-suite/generated-src/jni/NativeNestedCollection.cpp +++ b/test-suite/generated-src/jni/NativeNestedCollection.cpp @@ -2,7 +2,7 @@ // This file generated by Djinni from nested_collection.djinni #include "NativeNestedCollection.hpp" // my header -#include "Marshal.hpp" +#include "djinni/support-lib/jni/Marshal.hpp" namespace djinni_generated { diff --git a/test-suite/generated-src/jni/NativeNestedCollection.hpp b/test-suite/generated-src/jni/NativeNestedCollection.hpp index 4532a251e..6f8dcfd94 100644 --- a/test-suite/generated-src/jni/NativeNestedCollection.hpp +++ b/test-suite/generated-src/jni/NativeNestedCollection.hpp @@ -3,7 +3,7 @@ #pragma once -#include "djinni_support.hpp" +#include "djinni/support-lib/jni/djinni_support.hpp" #include "nested_collection.hpp" namespace djinni_generated { diff --git a/test-suite/generated-src/jni/NativeObjcOnlyListener.hpp b/test-suite/generated-src/jni/NativeObjcOnlyListener.hpp index 402d9ca91..95f63a0ae 100644 --- a/test-suite/generated-src/jni/NativeObjcOnlyListener.hpp +++ b/test-suite/generated-src/jni/NativeObjcOnlyListener.hpp @@ -3,7 +3,7 @@ #pragma once -#include "djinni_support.hpp" +#include "djinni/support-lib/jni/djinni_support.hpp" #include "objc_only_listener.hpp" namespace djinni_generated { diff --git a/test-suite/generated-src/jni/NativeOptColorRecord.cpp b/test-suite/generated-src/jni/NativeOptColorRecord.cpp index d351766ed..4374be418 100644 --- a/test-suite/generated-src/jni/NativeOptColorRecord.cpp +++ b/test-suite/generated-src/jni/NativeOptColorRecord.cpp @@ -2,8 +2,8 @@ // This file generated by Djinni from enum.djinni #include "NativeOptColorRecord.hpp" // my header -#include "Marshal.hpp" #include "NativeColor.hpp" +#include "djinni/support-lib/jni/Marshal.hpp" namespace djinni_generated { diff --git a/test-suite/generated-src/jni/NativeOptColorRecord.hpp b/test-suite/generated-src/jni/NativeOptColorRecord.hpp index c01c9f83e..638800852 100644 --- a/test-suite/generated-src/jni/NativeOptColorRecord.hpp +++ b/test-suite/generated-src/jni/NativeOptColorRecord.hpp @@ -3,7 +3,7 @@ #pragma once -#include "djinni_support.hpp" +#include "djinni/support-lib/jni/djinni_support.hpp" #include "opt_color_record.hpp" namespace djinni_generated { diff --git a/test-suite/generated-src/jni/NativePrimitiveList.cpp b/test-suite/generated-src/jni/NativePrimitiveList.cpp index f054e195f..703fd75f3 100644 --- a/test-suite/generated-src/jni/NativePrimitiveList.cpp +++ b/test-suite/generated-src/jni/NativePrimitiveList.cpp @@ -2,7 +2,7 @@ // This file generated by Djinni from primitive_list.djinni #include "NativePrimitiveList.hpp" // my header -#include "Marshal.hpp" +#include "djinni/support-lib/jni/Marshal.hpp" namespace djinni_generated { diff --git a/test-suite/generated-src/jni/NativePrimitiveList.hpp b/test-suite/generated-src/jni/NativePrimitiveList.hpp index d2fcbde6d..9f8a2306a 100644 --- a/test-suite/generated-src/jni/NativePrimitiveList.hpp +++ b/test-suite/generated-src/jni/NativePrimitiveList.hpp @@ -3,7 +3,7 @@ #pragma once -#include "djinni_support.hpp" +#include "djinni/support-lib/jni/djinni_support.hpp" #include "primitive_list.hpp" namespace djinni_generated { diff --git a/test-suite/generated-src/jni/NativeRecordWithDerivings.cpp b/test-suite/generated-src/jni/NativeRecordWithDerivings.cpp index 707e7e364..fa32e6c7f 100644 --- a/test-suite/generated-src/jni/NativeRecordWithDerivings.cpp +++ b/test-suite/generated-src/jni/NativeRecordWithDerivings.cpp @@ -2,7 +2,7 @@ // This file generated by Djinni from derivings.djinni #include "NativeRecordWithDerivings.hpp" // my header -#include "Marshal.hpp" +#include "djinni/support-lib/jni/Marshal.hpp" namespace djinni_generated { diff --git a/test-suite/generated-src/jni/NativeRecordWithDerivings.hpp b/test-suite/generated-src/jni/NativeRecordWithDerivings.hpp index b5088e24e..38c9fcf09 100644 --- a/test-suite/generated-src/jni/NativeRecordWithDerivings.hpp +++ b/test-suite/generated-src/jni/NativeRecordWithDerivings.hpp @@ -3,7 +3,7 @@ #pragma once -#include "djinni_support.hpp" +#include "djinni/support-lib/jni/djinni_support.hpp" #include "record_with_derivings.hpp" namespace djinni_generated { diff --git a/test-suite/generated-src/jni/NativeRecordWithDurationAndDerivings.cpp b/test-suite/generated-src/jni/NativeRecordWithDurationAndDerivings.cpp index de3d59023..18f01f047 100644 --- a/test-suite/generated-src/jni/NativeRecordWithDurationAndDerivings.cpp +++ b/test-suite/generated-src/jni/NativeRecordWithDurationAndDerivings.cpp @@ -3,7 +3,7 @@ #include "NativeRecordWithDurationAndDerivings.hpp" // my header #include "Duration-jni.hpp" -#include "Marshal.hpp" +#include "djinni/support-lib/jni/Marshal.hpp" namespace djinni_generated { diff --git a/test-suite/generated-src/jni/NativeRecordWithDurationAndDerivings.hpp b/test-suite/generated-src/jni/NativeRecordWithDurationAndDerivings.hpp index 331b6a8ba..66b38eac9 100644 --- a/test-suite/generated-src/jni/NativeRecordWithDurationAndDerivings.hpp +++ b/test-suite/generated-src/jni/NativeRecordWithDurationAndDerivings.hpp @@ -3,7 +3,7 @@ #pragma once -#include "djinni_support.hpp" +#include "djinni/support-lib/jni/djinni_support.hpp" #include "record_with_duration_and_derivings.hpp" namespace djinni_generated { diff --git a/test-suite/generated-src/jni/NativeRecordWithNestedDerivings.cpp b/test-suite/generated-src/jni/NativeRecordWithNestedDerivings.cpp index 79bcae165..e45d995c1 100644 --- a/test-suite/generated-src/jni/NativeRecordWithNestedDerivings.cpp +++ b/test-suite/generated-src/jni/NativeRecordWithNestedDerivings.cpp @@ -2,8 +2,8 @@ // This file generated by Djinni from derivings.djinni #include "NativeRecordWithNestedDerivings.hpp" // my header -#include "Marshal.hpp" #include "NativeRecordWithDerivings.hpp" +#include "djinni/support-lib/jni/Marshal.hpp" namespace djinni_generated { diff --git a/test-suite/generated-src/jni/NativeRecordWithNestedDerivings.hpp b/test-suite/generated-src/jni/NativeRecordWithNestedDerivings.hpp index c9afde20d..fff97bb13 100644 --- a/test-suite/generated-src/jni/NativeRecordWithNestedDerivings.hpp +++ b/test-suite/generated-src/jni/NativeRecordWithNestedDerivings.hpp @@ -3,7 +3,7 @@ #pragma once -#include "djinni_support.hpp" +#include "djinni/support-lib/jni/djinni_support.hpp" #include "record_with_nested_derivings.hpp" namespace djinni_generated { diff --git a/test-suite/generated-src/jni/NativeReturnOne.cpp b/test-suite/generated-src/jni/NativeReturnOne.cpp index bd5fdb3cb..ed9802629 100644 --- a/test-suite/generated-src/jni/NativeReturnOne.cpp +++ b/test-suite/generated-src/jni/NativeReturnOne.cpp @@ -2,8 +2,8 @@ // This file generated by Djinni from multiple_inheritance.djinni #include "NativeReturnOne.hpp" // my header -#include "Marshal.hpp" #include "NativeReturnOne.hpp" +#include "djinni/support-lib/jni/Marshal.hpp" namespace djinni_generated { diff --git a/test-suite/generated-src/jni/NativeReturnOne.hpp b/test-suite/generated-src/jni/NativeReturnOne.hpp index e5e189443..d4afe66c5 100644 --- a/test-suite/generated-src/jni/NativeReturnOne.hpp +++ b/test-suite/generated-src/jni/NativeReturnOne.hpp @@ -3,7 +3,7 @@ #pragma once -#include "djinni_support.hpp" +#include "djinni/support-lib/jni/djinni_support.hpp" #include "return_one.hpp" namespace djinni_generated { diff --git a/test-suite/generated-src/jni/NativeReturnTwo.cpp b/test-suite/generated-src/jni/NativeReturnTwo.cpp index 2c3f5cb3f..4cefc4b35 100644 --- a/test-suite/generated-src/jni/NativeReturnTwo.cpp +++ b/test-suite/generated-src/jni/NativeReturnTwo.cpp @@ -2,8 +2,8 @@ // This file generated by Djinni from multiple_inheritance.djinni #include "NativeReturnTwo.hpp" // my header -#include "Marshal.hpp" #include "NativeReturnTwo.hpp" +#include "djinni/support-lib/jni/Marshal.hpp" namespace djinni_generated { diff --git a/test-suite/generated-src/jni/NativeReturnTwo.hpp b/test-suite/generated-src/jni/NativeReturnTwo.hpp index e4b77017a..cca198616 100644 --- a/test-suite/generated-src/jni/NativeReturnTwo.hpp +++ b/test-suite/generated-src/jni/NativeReturnTwo.hpp @@ -3,7 +3,7 @@ #pragma once -#include "djinni_support.hpp" +#include "djinni/support-lib/jni/djinni_support.hpp" #include "return_two.hpp" namespace djinni_generated { diff --git a/test-suite/generated-src/jni/NativeReverseClientInterface.cpp b/test-suite/generated-src/jni/NativeReverseClientInterface.cpp index 16cbef876..ca77e7740 100644 --- a/test-suite/generated-src/jni/NativeReverseClientInterface.cpp +++ b/test-suite/generated-src/jni/NativeReverseClientInterface.cpp @@ -2,8 +2,8 @@ // This file generated by Djinni from client_interface.djinni #include "NativeReverseClientInterface.hpp" // my header -#include "Marshal.hpp" #include "NativeReverseClientInterface.hpp" +#include "djinni/support-lib/jni/Marshal.hpp" namespace djinni_generated { diff --git a/test-suite/generated-src/jni/NativeReverseClientInterface.hpp b/test-suite/generated-src/jni/NativeReverseClientInterface.hpp index ebd82ecfc..cbf0aa8ec 100644 --- a/test-suite/generated-src/jni/NativeReverseClientInterface.hpp +++ b/test-suite/generated-src/jni/NativeReverseClientInterface.hpp @@ -3,7 +3,7 @@ #pragma once -#include "djinni_support.hpp" +#include "djinni/support-lib/jni/djinni_support.hpp" #include "reverse_client_interface.hpp" namespace djinni_generated { diff --git a/test-suite/generated-src/jni/NativeSecondListener.hpp b/test-suite/generated-src/jni/NativeSecondListener.hpp index dc56dce63..d1100731a 100644 --- a/test-suite/generated-src/jni/NativeSecondListener.hpp +++ b/test-suite/generated-src/jni/NativeSecondListener.hpp @@ -3,7 +3,7 @@ #pragma once -#include "djinni_support.hpp" +#include "djinni/support-lib/jni/djinni_support.hpp" #include "second_listener.hpp" namespace djinni_generated { diff --git a/test-suite/generated-src/jni/NativeSetRecord.cpp b/test-suite/generated-src/jni/NativeSetRecord.cpp index 4ead65146..b613e3a89 100644 --- a/test-suite/generated-src/jni/NativeSetRecord.cpp +++ b/test-suite/generated-src/jni/NativeSetRecord.cpp @@ -2,7 +2,7 @@ // This file generated by Djinni from set.djinni #include "NativeSetRecord.hpp" // my header -#include "Marshal.hpp" +#include "djinni/support-lib/jni/Marshal.hpp" namespace djinni_generated { diff --git a/test-suite/generated-src/jni/NativeSetRecord.hpp b/test-suite/generated-src/jni/NativeSetRecord.hpp index 5755a1947..30f4c749a 100644 --- a/test-suite/generated-src/jni/NativeSetRecord.hpp +++ b/test-suite/generated-src/jni/NativeSetRecord.hpp @@ -3,7 +3,7 @@ #pragma once -#include "djinni_support.hpp" +#include "djinni/support-lib/jni/djinni_support.hpp" #include "set_record.hpp" namespace djinni_generated { diff --git a/test-suite/generated-src/jni/NativeTestDuration.cpp b/test-suite/generated-src/jni/NativeTestDuration.cpp index 2712f7901..9ae6c36a0 100644 --- a/test-suite/generated-src/jni/NativeTestDuration.cpp +++ b/test-suite/generated-src/jni/NativeTestDuration.cpp @@ -3,7 +3,7 @@ #include "NativeTestDuration.hpp" // my header #include "Duration-jni.hpp" -#include "Marshal.hpp" +#include "djinni/support-lib/jni/Marshal.hpp" namespace djinni_generated { diff --git a/test-suite/generated-src/jni/NativeTestDuration.hpp b/test-suite/generated-src/jni/NativeTestDuration.hpp index 533dc1c79..64a4d8387 100644 --- a/test-suite/generated-src/jni/NativeTestDuration.hpp +++ b/test-suite/generated-src/jni/NativeTestDuration.hpp @@ -3,7 +3,7 @@ #pragma once -#include "djinni_support.hpp" +#include "djinni/support-lib/jni/djinni_support.hpp" #include "test_duration.hpp" namespace djinni_generated { diff --git a/test-suite/generated-src/jni/NativeTestHelpers.cpp b/test-suite/generated-src/jni/NativeTestHelpers.cpp index f49395ce9..c28b9a997 100644 --- a/test-suite/generated-src/jni/NativeTestHelpers.cpp +++ b/test-suite/generated-src/jni/NativeTestHelpers.cpp @@ -2,7 +2,6 @@ // This file generated by Djinni from test.djinni #include "NativeTestHelpers.hpp" // my header -#include "Marshal.hpp" #include "NativeAssortedPrimitives.hpp" #include "NativeClientInterface.hpp" #include "NativeColor.hpp" @@ -11,6 +10,7 @@ #include "NativePrimitiveList.hpp" #include "NativeSetRecord.hpp" #include "NativeUserToken.hpp" +#include "djinni/support-lib/jni/Marshal.hpp" namespace djinni_generated { diff --git a/test-suite/generated-src/jni/NativeTestHelpers.hpp b/test-suite/generated-src/jni/NativeTestHelpers.hpp index cf1fe0b82..813b48beb 100644 --- a/test-suite/generated-src/jni/NativeTestHelpers.hpp +++ b/test-suite/generated-src/jni/NativeTestHelpers.hpp @@ -3,7 +3,7 @@ #pragma once -#include "djinni_support.hpp" +#include "djinni/support-lib/jni/djinni_support.hpp" #include "test_helpers.hpp" namespace djinni_generated { diff --git a/test-suite/generated-src/jni/NativeUserToken.cpp b/test-suite/generated-src/jni/NativeUserToken.cpp index a1bc87eb5..bad365265 100644 --- a/test-suite/generated-src/jni/NativeUserToken.cpp +++ b/test-suite/generated-src/jni/NativeUserToken.cpp @@ -2,7 +2,7 @@ // This file generated by Djinni from user_token.djinni #include "NativeUserToken.hpp" // my header -#include "Marshal.hpp" +#include "djinni/support-lib/jni/Marshal.hpp" namespace djinni_generated { diff --git a/test-suite/generated-src/jni/NativeUserToken.hpp b/test-suite/generated-src/jni/NativeUserToken.hpp index 2297819f6..0fa4c47e2 100644 --- a/test-suite/generated-src/jni/NativeUserToken.hpp +++ b/test-suite/generated-src/jni/NativeUserToken.hpp @@ -3,7 +3,7 @@ #pragma once -#include "djinni_support.hpp" +#include "djinni/support-lib/jni/djinni_support.hpp" #include "user_token.hpp" namespace djinni_generated { diff --git a/test-suite/generated-src/jni/NativeUsesSingleLanguageListeners.hpp b/test-suite/generated-src/jni/NativeUsesSingleLanguageListeners.hpp index 86b30aaf5..1113436bf 100644 --- a/test-suite/generated-src/jni/NativeUsesSingleLanguageListeners.hpp +++ b/test-suite/generated-src/jni/NativeUsesSingleLanguageListeners.hpp @@ -3,7 +3,7 @@ #pragma once -#include "djinni_support.hpp" +#include "djinni/support-lib/jni/djinni_support.hpp" #include "uses_single_language_listeners.hpp" namespace djinni_generated { diff --git a/test-suite/generated-src/objc/DBAssortedPrimitives+Private.mm b/test-suite/generated-src/objc/DBAssortedPrimitives+Private.mm index ed1046b8a..34f1db5ea 100644 --- a/test-suite/generated-src/objc/DBAssortedPrimitives+Private.mm +++ b/test-suite/generated-src/objc/DBAssortedPrimitives+Private.mm @@ -2,7 +2,7 @@ // This file generated by Djinni from primtypes.djinni #import "DBAssortedPrimitives+Private.h" -#import "DJIMarshal+Private.h" +#import "djinni/support-lib/objc/DJIMarshal+Private.h" #include namespace djinni_generated { diff --git a/test-suite/generated-src/objc/DBClientInterface+Private.mm b/test-suite/generated-src/objc/DBClientInterface+Private.mm index 95f1bfad9..c1c1c0421 100644 --- a/test-suite/generated-src/objc/DBClientInterface+Private.mm +++ b/test-suite/generated-src/objc/DBClientInterface+Private.mm @@ -5,8 +5,8 @@ #import "DBClientInterface.h" #import "DBClientInterface+Private.h" #import "DBClientReturnedRecord+Private.h" -#import "DJIMarshal+Private.h" -#import "DJIObjcWrapperCache+Private.h" +#import "djinni/support-lib/objc/DJIMarshal+Private.h" +#import "djinni/support-lib/objc/DJIObjcWrapperCache+Private.h" static_assert(__has_feature(objc_arc), "Djinni requires ARC to be enabled for this file"); diff --git a/test-suite/generated-src/objc/DBClientReturnedRecord+Private.mm b/test-suite/generated-src/objc/DBClientReturnedRecord+Private.mm index 601cac098..a6bc198cd 100644 --- a/test-suite/generated-src/objc/DBClientReturnedRecord+Private.mm +++ b/test-suite/generated-src/objc/DBClientReturnedRecord+Private.mm @@ -2,7 +2,7 @@ // This file generated by Djinni from client_interface.djinni #import "DBClientReturnedRecord+Private.h" -#import "DJIMarshal+Private.h" +#import "djinni/support-lib/objc/DJIMarshal+Private.h" #include namespace djinni_generated { diff --git a/test-suite/generated-src/objc/DBConflict+Private.mm b/test-suite/generated-src/objc/DBConflict+Private.mm index 46d0b9459..7b17eeaba 100644 --- a/test-suite/generated-src/objc/DBConflict+Private.mm +++ b/test-suite/generated-src/objc/DBConflict+Private.mm @@ -3,8 +3,8 @@ #import "DBConflict+Private.h" #import "DBConflict.h" -#import "DJICppWrapperCache+Private.h" -#import "DJIError.h" +#import "djinni/support-lib/objc/DJICppWrapperCache+Private.h" +#import "djinni/support-lib/objc/DJIError.h" #include #include diff --git a/test-suite/generated-src/objc/DBConflictUser+Private.mm b/test-suite/generated-src/objc/DBConflictUser+Private.mm index a17ed6909..f2efb2ca2 100644 --- a/test-suite/generated-src/objc/DBConflictUser+Private.mm +++ b/test-suite/generated-src/objc/DBConflictUser+Private.mm @@ -4,9 +4,9 @@ #import "DBConflictUser+Private.h" #import "DBConflictUser.h" #import "DBConflict+Private.h" -#import "DJICppWrapperCache+Private.h" -#import "DJIError.h" -#import "DJIMarshal+Private.h" +#import "djinni/support-lib/objc/DJICppWrapperCache+Private.h" +#import "djinni/support-lib/objc/DJIError.h" +#import "djinni/support-lib/objc/DJIMarshal+Private.h" #include #include diff --git a/test-suite/generated-src/objc/DBConstantRecord+Private.mm b/test-suite/generated-src/objc/DBConstantRecord+Private.mm index b28f25172..ee1f4b3b2 100644 --- a/test-suite/generated-src/objc/DBConstantRecord+Private.mm +++ b/test-suite/generated-src/objc/DBConstantRecord+Private.mm @@ -2,7 +2,7 @@ // This file generated by Djinni from constants.djinni #import "DBConstantRecord+Private.h" -#import "DJIMarshal+Private.h" +#import "djinni/support-lib/objc/DJIMarshal+Private.h" #include namespace djinni_generated { diff --git a/test-suite/generated-src/objc/DBConstants+Private.mm b/test-suite/generated-src/objc/DBConstants+Private.mm index 154a203d2..0db00730b 100644 --- a/test-suite/generated-src/objc/DBConstants+Private.mm +++ b/test-suite/generated-src/objc/DBConstants+Private.mm @@ -3,7 +3,7 @@ #import "DBConstants+Private.h" #import "DBConstantRecord+Private.h" -#import "DJIMarshal+Private.h" +#import "djinni/support-lib/objc/DJIMarshal+Private.h" #include namespace djinni_generated { diff --git a/test-suite/generated-src/objc/DBConstantsInterface+Private.mm b/test-suite/generated-src/objc/DBConstantsInterface+Private.mm index 28d34f0cd..3ac812b64 100644 --- a/test-suite/generated-src/objc/DBConstantsInterface+Private.mm +++ b/test-suite/generated-src/objc/DBConstantsInterface+Private.mm @@ -4,9 +4,9 @@ #import "DBConstantsInterface+Private.h" #import "DBConstantsInterface.h" #import "DBConstantRecord+Private.h" -#import "DJICppWrapperCache+Private.h" -#import "DJIError.h" -#import "DJIMarshal+Private.h" +#import "djinni/support-lib/objc/DJICppWrapperCache+Private.h" +#import "djinni/support-lib/objc/DJIError.h" +#import "djinni/support-lib/objc/DJIMarshal+Private.h" #include #include diff --git a/test-suite/generated-src/objc/DBCppException+Private.mm b/test-suite/generated-src/objc/DBCppException+Private.mm index d64717f03..958c25dcb 100644 --- a/test-suite/generated-src/objc/DBCppException+Private.mm +++ b/test-suite/generated-src/objc/DBCppException+Private.mm @@ -4,9 +4,9 @@ #import "DBCppException+Private.h" #import "DBCppException.h" #import "DBCppException+Private.h" -#import "DJICppWrapperCache+Private.h" -#import "DJIError.h" -#import "DJIMarshal+Private.h" +#import "djinni/support-lib/objc/DJICppWrapperCache+Private.h" +#import "djinni/support-lib/objc/DJIError.h" +#import "djinni/support-lib/objc/DJIMarshal+Private.h" #include #include diff --git a/test-suite/generated-src/objc/DBDateRecord+Private.mm b/test-suite/generated-src/objc/DBDateRecord+Private.mm index e1e8175d2..f0d75c018 100644 --- a/test-suite/generated-src/objc/DBDateRecord+Private.mm +++ b/test-suite/generated-src/objc/DBDateRecord+Private.mm @@ -2,7 +2,7 @@ // This file generated by Djinni from date.djinni #import "DBDateRecord+Private.h" -#import "DJIMarshal+Private.h" +#import "djinni/support-lib/objc/DJIMarshal+Private.h" #include namespace djinni_generated { diff --git a/test-suite/generated-src/objc/DBExtendedRecord+Private.mm b/test-suite/generated-src/objc/DBExtendedRecord+Private.mm index ab10e1f25..a2f699ec6 100644 --- a/test-suite/generated-src/objc/DBExtendedRecord+Private.mm +++ b/test-suite/generated-src/objc/DBExtendedRecord+Private.mm @@ -3,7 +3,7 @@ #import "DBExtendedRecord+Private.h" #import "DBExtendedRecord+Private.h" -#import "DJIMarshal+Private.h" +#import "djinni/support-lib/objc/DJIMarshal+Private.h" #include namespace djinni_generated { diff --git a/test-suite/generated-src/objc/DBExternInterface1+Private.mm b/test-suite/generated-src/objc/DBExternInterface1+Private.mm index 34c07564c..84274aa45 100644 --- a/test-suite/generated-src/objc/DBExternInterface1+Private.mm +++ b/test-suite/generated-src/objc/DBExternInterface1+Private.mm @@ -5,8 +5,8 @@ #import "DBExternInterface1.h" #import "DBClientInterface+Private.h" #import "DBClientReturnedRecord+Private.h" -#import "DJICppWrapperCache+Private.h" -#import "DJIError.h" +#import "djinni/support-lib/objc/DJICppWrapperCache+Private.h" +#import "djinni/support-lib/objc/DJIError.h" #include #include diff --git a/test-suite/generated-src/objc/DBExternInterface2+Private.mm b/test-suite/generated-src/objc/DBExternInterface2+Private.mm index 6e3c4e461..76f9091a8 100644 --- a/test-suite/generated-src/objc/DBExternInterface2+Private.mm +++ b/test-suite/generated-src/objc/DBExternInterface2+Private.mm @@ -5,7 +5,7 @@ #import "DBExternInterface2.h" #import "DBExternRecordWithDerivings+Private.h" #import "DBTestHelpers+Private.h" -#import "DJIObjcWrapperCache+Private.h" +#import "djinni/support-lib/objc/DJIObjcWrapperCache+Private.h" static_assert(__has_feature(objc_arc), "Djinni requires ARC to be enabled for this file"); diff --git a/test-suite/generated-src/objc/DBExternRecordWithDerivings+Private.mm b/test-suite/generated-src/objc/DBExternRecordWithDerivings+Private.mm index 6d3cd729d..777347df4 100644 --- a/test-suite/generated-src/objc/DBExternRecordWithDerivings+Private.mm +++ b/test-suite/generated-src/objc/DBExternRecordWithDerivings+Private.mm @@ -3,7 +3,7 @@ #import "DBExternRecordWithDerivings+Private.h" #import "DBRecordWithDerivings+Private.h" -#import "DJIMarshal+Private.h" +#import "djinni/support-lib/objc/DJIMarshal+Private.h" #include namespace djinni_generated { diff --git a/test-suite/generated-src/objc/DBFirstListener+Private.mm b/test-suite/generated-src/objc/DBFirstListener+Private.mm index 6e1a33b39..9bd754b26 100644 --- a/test-suite/generated-src/objc/DBFirstListener+Private.mm +++ b/test-suite/generated-src/objc/DBFirstListener+Private.mm @@ -3,7 +3,7 @@ #import "DBFirstListener+Private.h" #import "DBFirstListener.h" -#import "DJIObjcWrapperCache+Private.h" +#import "djinni/support-lib/objc/DJIObjcWrapperCache+Private.h" static_assert(__has_feature(objc_arc), "Djinni requires ARC to be enabled for this file"); diff --git a/test-suite/generated-src/objc/DBListenerCaller+Private.mm b/test-suite/generated-src/objc/DBListenerCaller+Private.mm index 855fe17c5..41891238b 100644 --- a/test-suite/generated-src/objc/DBListenerCaller+Private.mm +++ b/test-suite/generated-src/objc/DBListenerCaller+Private.mm @@ -6,8 +6,8 @@ #import "DBFirstListener+Private.h" #import "DBListenerCaller+Private.h" #import "DBSecondListener+Private.h" -#import "DJICppWrapperCache+Private.h" -#import "DJIError.h" +#import "djinni/support-lib/objc/DJICppWrapperCache+Private.h" +#import "djinni/support-lib/objc/DJIError.h" #include #include diff --git a/test-suite/generated-src/objc/DBMapDateRecord+Private.mm b/test-suite/generated-src/objc/DBMapDateRecord+Private.mm index 77e09f1a7..a83691a40 100644 --- a/test-suite/generated-src/objc/DBMapDateRecord+Private.mm +++ b/test-suite/generated-src/objc/DBMapDateRecord+Private.mm @@ -2,7 +2,7 @@ // This file generated by Djinni from date.djinni #import "DBMapDateRecord+Private.h" -#import "DJIMarshal+Private.h" +#import "djinni/support-lib/objc/DJIMarshal+Private.h" #include namespace djinni_generated { diff --git a/test-suite/generated-src/objc/DBMapListRecord+Private.mm b/test-suite/generated-src/objc/DBMapListRecord+Private.mm index 9709618a6..11b02089f 100644 --- a/test-suite/generated-src/objc/DBMapListRecord+Private.mm +++ b/test-suite/generated-src/objc/DBMapListRecord+Private.mm @@ -2,7 +2,7 @@ // This file generated by Djinni from map.djinni #import "DBMapListRecord+Private.h" -#import "DJIMarshal+Private.h" +#import "djinni/support-lib/objc/DJIMarshal+Private.h" #include namespace djinni_generated { diff --git a/test-suite/generated-src/objc/DBMapRecord+Private.mm b/test-suite/generated-src/objc/DBMapRecord+Private.mm index 1bcf53821..0955aaca9 100644 --- a/test-suite/generated-src/objc/DBMapRecord+Private.mm +++ b/test-suite/generated-src/objc/DBMapRecord+Private.mm @@ -2,7 +2,7 @@ // This file generated by Djinni from map.djinni #import "DBMapRecord+Private.h" -#import "DJIMarshal+Private.h" +#import "djinni/support-lib/objc/DJIMarshal+Private.h" #include namespace djinni_generated { diff --git a/test-suite/generated-src/objc/DBNestedCollection+Private.mm b/test-suite/generated-src/objc/DBNestedCollection+Private.mm index 35c24e4fa..d51deaba8 100644 --- a/test-suite/generated-src/objc/DBNestedCollection+Private.mm +++ b/test-suite/generated-src/objc/DBNestedCollection+Private.mm @@ -2,7 +2,7 @@ // This file generated by Djinni from nested_collection.djinni #import "DBNestedCollection+Private.h" -#import "DJIMarshal+Private.h" +#import "djinni/support-lib/objc/DJIMarshal+Private.h" #include namespace djinni_generated { diff --git a/test-suite/generated-src/objc/DBObjcOnlyListener+Private.mm b/test-suite/generated-src/objc/DBObjcOnlyListener+Private.mm index 3002520f6..ed35f0d72 100644 --- a/test-suite/generated-src/objc/DBObjcOnlyListener+Private.mm +++ b/test-suite/generated-src/objc/DBObjcOnlyListener+Private.mm @@ -3,7 +3,7 @@ #import "DBObjcOnlyListener+Private.h" #import "DBObjcOnlyListener.h" -#import "DJIObjcWrapperCache+Private.h" +#import "djinni/support-lib/objc/DJIObjcWrapperCache+Private.h" static_assert(__has_feature(objc_arc), "Djinni requires ARC to be enabled for this file"); diff --git a/test-suite/generated-src/objc/DBOptColorRecord+Private.mm b/test-suite/generated-src/objc/DBOptColorRecord+Private.mm index 1ab0d4a09..ab8c8d910 100644 --- a/test-suite/generated-src/objc/DBOptColorRecord+Private.mm +++ b/test-suite/generated-src/objc/DBOptColorRecord+Private.mm @@ -2,7 +2,7 @@ // This file generated by Djinni from enum.djinni #import "DBOptColorRecord+Private.h" -#import "DJIMarshal+Private.h" +#import "djinni/support-lib/objc/DJIMarshal+Private.h" #include namespace djinni_generated { diff --git a/test-suite/generated-src/objc/DBPrimitiveList+Private.mm b/test-suite/generated-src/objc/DBPrimitiveList+Private.mm index 02c180a88..7b66663ee 100644 --- a/test-suite/generated-src/objc/DBPrimitiveList+Private.mm +++ b/test-suite/generated-src/objc/DBPrimitiveList+Private.mm @@ -2,7 +2,7 @@ // This file generated by Djinni from primitive_list.djinni #import "DBPrimitiveList+Private.h" -#import "DJIMarshal+Private.h" +#import "djinni/support-lib/objc/DJIMarshal+Private.h" #include namespace djinni_generated { diff --git a/test-suite/generated-src/objc/DBRecordWithDerivings+Private.mm b/test-suite/generated-src/objc/DBRecordWithDerivings+Private.mm index 03a55824c..955f56b03 100644 --- a/test-suite/generated-src/objc/DBRecordWithDerivings+Private.mm +++ b/test-suite/generated-src/objc/DBRecordWithDerivings+Private.mm @@ -2,7 +2,7 @@ // This file generated by Djinni from derivings.djinni #import "DBRecordWithDerivings+Private.h" -#import "DJIMarshal+Private.h" +#import "djinni/support-lib/objc/DJIMarshal+Private.h" #include namespace djinni_generated { diff --git a/test-suite/generated-src/objc/DBRecordWithDurationAndDerivings+Private.mm b/test-suite/generated-src/objc/DBRecordWithDurationAndDerivings+Private.mm index df494dca2..5da5a7a26 100644 --- a/test-suite/generated-src/objc/DBRecordWithDurationAndDerivings+Private.mm +++ b/test-suite/generated-src/objc/DBRecordWithDurationAndDerivings+Private.mm @@ -2,8 +2,8 @@ // This file generated by Djinni from duration.djinni #import "DBRecordWithDurationAndDerivings+Private.h" -#import "DJIMarshal+Private.h" #import "Duration-objc.hpp" +#import "djinni/support-lib/objc/DJIMarshal+Private.h" #include namespace djinni_generated { diff --git a/test-suite/generated-src/objc/DBRecordWithNestedDerivings+Private.mm b/test-suite/generated-src/objc/DBRecordWithNestedDerivings+Private.mm index 11e682cae..d8208348a 100644 --- a/test-suite/generated-src/objc/DBRecordWithNestedDerivings+Private.mm +++ b/test-suite/generated-src/objc/DBRecordWithNestedDerivings+Private.mm @@ -3,7 +3,7 @@ #import "DBRecordWithNestedDerivings+Private.h" #import "DBRecordWithDerivings+Private.h" -#import "DJIMarshal+Private.h" +#import "djinni/support-lib/objc/DJIMarshal+Private.h" #include namespace djinni_generated { diff --git a/test-suite/generated-src/objc/DBReturnOne+Private.mm b/test-suite/generated-src/objc/DBReturnOne+Private.mm index ebacf8025..08434a33a 100644 --- a/test-suite/generated-src/objc/DBReturnOne+Private.mm +++ b/test-suite/generated-src/objc/DBReturnOne+Private.mm @@ -4,9 +4,9 @@ #import "DBReturnOne+Private.h" #import "DBReturnOne.h" #import "DBReturnOne+Private.h" -#import "DJICppWrapperCache+Private.h" -#import "DJIError.h" -#import "DJIMarshal+Private.h" +#import "djinni/support-lib/objc/DJICppWrapperCache+Private.h" +#import "djinni/support-lib/objc/DJIError.h" +#import "djinni/support-lib/objc/DJIMarshal+Private.h" #include #include diff --git a/test-suite/generated-src/objc/DBReturnTwo+Private.mm b/test-suite/generated-src/objc/DBReturnTwo+Private.mm index ca6201a39..13abaaf0b 100644 --- a/test-suite/generated-src/objc/DBReturnTwo+Private.mm +++ b/test-suite/generated-src/objc/DBReturnTwo+Private.mm @@ -4,9 +4,9 @@ #import "DBReturnTwo+Private.h" #import "DBReturnTwo.h" #import "DBReturnTwo+Private.h" -#import "DJICppWrapperCache+Private.h" -#import "DJIError.h" -#import "DJIMarshal+Private.h" +#import "djinni/support-lib/objc/DJICppWrapperCache+Private.h" +#import "djinni/support-lib/objc/DJIError.h" +#import "djinni/support-lib/objc/DJIMarshal+Private.h" #include #include diff --git a/test-suite/generated-src/objc/DBReverseClientInterface+Private.mm b/test-suite/generated-src/objc/DBReverseClientInterface+Private.mm index 391059729..2ca8a62ed 100644 --- a/test-suite/generated-src/objc/DBReverseClientInterface+Private.mm +++ b/test-suite/generated-src/objc/DBReverseClientInterface+Private.mm @@ -4,9 +4,9 @@ #import "DBReverseClientInterface+Private.h" #import "DBReverseClientInterface.h" #import "DBReverseClientInterface+Private.h" -#import "DJICppWrapperCache+Private.h" -#import "DJIError.h" -#import "DJIMarshal+Private.h" +#import "djinni/support-lib/objc/DJICppWrapperCache+Private.h" +#import "djinni/support-lib/objc/DJIError.h" +#import "djinni/support-lib/objc/DJIMarshal+Private.h" #include #include diff --git a/test-suite/generated-src/objc/DBSecondListener+Private.mm b/test-suite/generated-src/objc/DBSecondListener+Private.mm index 83ed60720..4c9e02804 100644 --- a/test-suite/generated-src/objc/DBSecondListener+Private.mm +++ b/test-suite/generated-src/objc/DBSecondListener+Private.mm @@ -3,7 +3,7 @@ #import "DBSecondListener+Private.h" #import "DBSecondListener.h" -#import "DJIObjcWrapperCache+Private.h" +#import "djinni/support-lib/objc/DJIObjcWrapperCache+Private.h" static_assert(__has_feature(objc_arc), "Djinni requires ARC to be enabled for this file"); diff --git a/test-suite/generated-src/objc/DBSetRecord+Private.mm b/test-suite/generated-src/objc/DBSetRecord+Private.mm index 2b6681292..38565cbfb 100644 --- a/test-suite/generated-src/objc/DBSetRecord+Private.mm +++ b/test-suite/generated-src/objc/DBSetRecord+Private.mm @@ -2,7 +2,7 @@ // This file generated by Djinni from set.djinni #import "DBSetRecord+Private.h" -#import "DJIMarshal+Private.h" +#import "djinni/support-lib/objc/DJIMarshal+Private.h" #include namespace djinni_generated { diff --git a/test-suite/generated-src/objc/DBTestDuration+Private.mm b/test-suite/generated-src/objc/DBTestDuration+Private.mm index b0d597746..b11d8062c 100644 --- a/test-suite/generated-src/objc/DBTestDuration+Private.mm +++ b/test-suite/generated-src/objc/DBTestDuration+Private.mm @@ -3,10 +3,10 @@ #import "DBTestDuration+Private.h" #import "DBTestDuration.h" -#import "DJICppWrapperCache+Private.h" -#import "DJIError.h" -#import "DJIMarshal+Private.h" #import "Duration-objc.hpp" +#import "djinni/support-lib/objc/DJICppWrapperCache+Private.h" +#import "djinni/support-lib/objc/DJIError.h" +#import "djinni/support-lib/objc/DJIMarshal+Private.h" #include #include diff --git a/test-suite/generated-src/objc/DBTestHelpers+Private.mm b/test-suite/generated-src/objc/DBTestHelpers+Private.mm index f51065b7f..b7b184a24 100644 --- a/test-suite/generated-src/objc/DBTestHelpers+Private.mm +++ b/test-suite/generated-src/objc/DBTestHelpers+Private.mm @@ -10,9 +10,9 @@ #import "DBPrimitiveList+Private.h" #import "DBSetRecord+Private.h" #import "DBUserToken+Private.h" -#import "DJICppWrapperCache+Private.h" -#import "DJIError.h" -#import "DJIMarshal+Private.h" +#import "djinni/support-lib/objc/DJICppWrapperCache+Private.h" +#import "djinni/support-lib/objc/DJIError.h" +#import "djinni/support-lib/objc/DJIMarshal+Private.h" #include #include diff --git a/test-suite/generated-src/objc/DBUserToken+Private.mm b/test-suite/generated-src/objc/DBUserToken+Private.mm index 51e8c012d..6e2a54bef 100644 --- a/test-suite/generated-src/objc/DBUserToken+Private.mm +++ b/test-suite/generated-src/objc/DBUserToken+Private.mm @@ -3,10 +3,10 @@ #import "DBUserToken+Private.h" #import "DBUserToken.h" -#import "DJICppWrapperCache+Private.h" -#import "DJIError.h" -#import "DJIMarshal+Private.h" -#import "DJIObjcWrapperCache+Private.h" +#import "djinni/support-lib/objc/DJICppWrapperCache+Private.h" +#import "djinni/support-lib/objc/DJIError.h" +#import "djinni/support-lib/objc/DJIMarshal+Private.h" +#import "djinni/support-lib/objc/DJIObjcWrapperCache+Private.h" #include #include diff --git a/test-suite/generated-src/objc/DBUsesSingleLanguageListeners+Private.mm b/test-suite/generated-src/objc/DBUsesSingleLanguageListeners+Private.mm index fbf6bed7c..a0a267637 100644 --- a/test-suite/generated-src/objc/DBUsesSingleLanguageListeners+Private.mm +++ b/test-suite/generated-src/objc/DBUsesSingleLanguageListeners+Private.mm @@ -5,9 +5,9 @@ #import "DBUsesSingleLanguageListeners.h" #import "DBJavaOnlyListener+Private.h" #import "DBObjcOnlyListener+Private.h" -#import "DJICppWrapperCache+Private.h" -#import "DJIError.h" -#import "DJIObjcWrapperCache+Private.h" +#import "djinni/support-lib/objc/DJICppWrapperCache+Private.h" +#import "djinni/support-lib/objc/DJIError.h" +#import "djinni/support-lib/objc/DJIObjcWrapperCache+Private.h" #include #include diff --git a/test-suite/handwritten-src/cpp/Duration-jni.hpp b/test-suite/handwritten-src/cpp/Duration-jni.hpp index e901b635b..8eb149996 100644 --- a/test-suite/handwritten-src/cpp/Duration-jni.hpp +++ b/test-suite/handwritten-src/cpp/Duration-jni.hpp @@ -1,5 +1,5 @@ #pragma once -#include "djinni_support.hpp" +#include "djinni/support-lib/jni/djinni_support.hpp" #include #include diff --git a/test-suite/java/CMakeLists.txt b/test-suite/java/CMakeLists.txt index 1bb317296..f0129dc9c 100644 --- a/test-suite/java/CMakeLists.txt +++ b/test-suite/java/CMakeLists.txt @@ -25,6 +25,7 @@ endif() ## set(support_dir ../../support-lib/jni) +set(include_dir ../../include) set(test_include_dirs ../generated-src/jni/ ../generated-src/cpp/ ../handwritten-src/cpp/) file( @@ -50,7 +51,7 @@ add_library(DjinniTestNative SHARED ${test_lib_srcs}) include_directories( DjinniTestNative ${test_include_dirs} - ${support_dir} + ${include_dir} ${JNI_INCLUDE_DIRS}) target_link_libraries(DjinniTestNative ${JNI_LIBRARIES}) install( diff --git a/test-suite/objc/DjinniObjcTest.xcodeproj/project.pbxproj b/test-suite/objc/DjinniObjcTest.xcodeproj/project.pbxproj index 3c3c76b7f..3e418b475 100644 --- a/test-suite/objc/DjinniObjcTest.xcodeproj/project.pbxproj +++ b/test-suite/objc/DjinniObjcTest.xcodeproj/project.pbxproj @@ -60,8 +60,6 @@ A24850301AF96EBC00AFE907 /* DBRecordWithNestedDerivings.mm in Sources */ = {isa = PBXBuildFile; fileRef = A24850241AF96EBC00AFE907 /* DBRecordWithNestedDerivings.mm */; }; A24850311AF96EBC00AFE907 /* DBSetRecord.mm in Sources */ = {isa = PBXBuildFile; fileRef = A24850251AF96EBC00AFE907 /* DBSetRecord.mm */; }; A278D45319BA3601006FD937 /* test_helpers.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A278D45219BA3601006FD937 /* test_helpers.cpp */; }; - A2AE38491BB3074800B7A0C9 /* DJIProxyCaches.mm in Sources */ = {isa = PBXBuildFile; fileRef = 6536CD6C19A6C82200DD7715 /* DJIProxyCaches.mm */; }; - A2CB54B419BA6E6000A9E600 /* DJIError.mm in Sources */ = {isa = PBXBuildFile; fileRef = A2CB54B319BA6E6000A9E600 /* DJIError.mm */; }; B52DA5681B103F72005CE75F /* DBAssortedPrimitives.mm in Sources */ = {isa = PBXBuildFile; fileRef = B52DA5651B103F6D005CE75F /* DBAssortedPrimitives.mm */; }; B52DA5691B103F72005CE75F /* DBAssortedPrimitives.mm in Sources */ = {isa = PBXBuildFile; fileRef = B52DA5651B103F6D005CE75F /* DBAssortedPrimitives.mm */; }; B52DA56A1B103F75005CE75F /* DBAssortedPrimitives+Private.mm in Sources */ = {isa = PBXBuildFile; fileRef = B52DA5671B103F6D005CE75F /* DBAssortedPrimitives+Private.mm */; }; @@ -74,6 +72,8 @@ B5E9C9401C1F9E9E0073C123 /* DBReverseClientInterface+Private.mm in Sources */ = {isa = PBXBuildFile; fileRef = B5E9C93F1C1F9E9E0073C123 /* DBReverseClientInterface+Private.mm */; }; CFAED8751B54291900E3B8A3 /* DBEmptyRecord.mm in Sources */ = {isa = PBXBuildFile; fileRef = CFAED8721B54291900E3B8A3 /* DBEmptyRecord.mm */; }; CFAED8761B54291900E3B8A3 /* DBEmptyRecord+Private.mm in Sources */ = {isa = PBXBuildFile; fileRef = CFAED8741B54291900E3B8A3 /* DBEmptyRecord+Private.mm */; }; + CFBF90A41D2AA51E00F927DD /* DJIError.mm in Sources */ = {isa = PBXBuildFile; fileRef = CFBF90A21D2AA51E00F927DD /* DJIError.mm */; }; + CFBF90A51D2AA51E00F927DD /* DJIProxyCaches.mm in Sources */ = {isa = PBXBuildFile; fileRef = CFBF90A31D2AA51E00F927DD /* DJIProxyCaches.mm */; }; CFC5D9D01B15105100BF2DF8 /* extern_record_with_derivings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CFC5D9CE1B15105100BF2DF8 /* extern_record_with_derivings.cpp */; }; CFC5D9D11B15105100BF2DF8 /* extern_record_with_derivings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CFC5D9CE1B15105100BF2DF8 /* extern_record_with_derivings.cpp */; }; CFC5D9D61B15106400BF2DF8 /* DBExternRecordWithDerivings.mm in Sources */ = {isa = PBXBuildFile; fileRef = CFC5D9D31B15106400BF2DF8 /* DBExternRecordWithDerivings.mm */; }; @@ -141,10 +141,6 @@ 650CA0571C2AB48E007ADDDB /* DBListenerCaller+Private.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = "DBListenerCaller+Private.mm"; sourceTree = ""; }; 650CA05B1C2AB524007ADDDB /* DBMultipleInheritanceTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DBMultipleInheritanceTests.m; sourceTree = ""; }; 650CA05D1C2AB5AB007ADDDB /* ListenerCaller.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ListenerCaller.cpp; sourceTree = ""; }; - 6536CD6A19A6C82200DD7715 /* DJIError.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DJIError.h; sourceTree = ""; }; - 6536CD6C19A6C82200DD7715 /* DJIProxyCaches.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = DJIProxyCaches.mm; sourceTree = ""; }; - 6536CD6D19A6C82200DD7715 /* DJICppWrapperCache+Private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "DJICppWrapperCache+Private.h"; sourceTree = ""; }; - 6536CD6E19A6C82200DD7715 /* DJIObjcWrapperCache+Private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "DJIObjcWrapperCache+Private.h"; sourceTree = ""; }; 6536CD7119A6C96C00DD7715 /* DBClientInterfaceImpl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DBClientInterfaceImpl.h; sourceTree = ""; }; 6536CD7219A6C96C00DD7715 /* DBClientInterfaceImpl.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = DBClientInterfaceImpl.mm; sourceTree = ""; }; 6536CD7619A6C98800DD7715 /* cpp_exception_impl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = cpp_exception_impl.cpp; sourceTree = ""; }; @@ -199,7 +195,6 @@ A238CA861AF84B7100CDDCE5 /* DBRecordWithDerivings+Private.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = "DBRecordWithDerivings+Private.mm"; sourceTree = ""; }; A238CA881AF84B7100CDDCE5 /* DBRecordWithNestedDerivings+Private.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = "DBRecordWithNestedDerivings+Private.mm"; sourceTree = ""; }; A238CA8A1AF84B7100CDDCE5 /* DBSetRecord+Private.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = "DBSetRecord+Private.mm"; sourceTree = ""; }; - A239F3791AF400C600DF27C8 /* DJIMarshal+Private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "DJIMarshal+Private.h"; sourceTree = ""; }; A242491C1AF192E0003BF8F0 /* DBClientInterface.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DBClientInterface.h; sourceTree = ""; }; A242491F1AF192E0003BF8F0 /* DBClientReturnedRecord+Private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "DBClientReturnedRecord+Private.h"; sourceTree = ""; }; A24249201AF192E0003BF8F0 /* DBClientReturnedRecord.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DBClientReturnedRecord.h; sourceTree = ""; }; @@ -261,7 +256,6 @@ A24850241AF96EBC00AFE907 /* DBRecordWithNestedDerivings.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = DBRecordWithNestedDerivings.mm; sourceTree = ""; }; A24850251AF96EBC00AFE907 /* DBSetRecord.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = DBSetRecord.mm; sourceTree = ""; }; A278D45219BA3601006FD937 /* test_helpers.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = test_helpers.cpp; sourceTree = ""; }; - A2CB54B319BA6E6000A9E600 /* DJIError.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = DJIError.mm; sourceTree = ""; }; A2CCB9411AF80DFC00E6230A /* DBClientInterface+Private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "DBClientInterface+Private.h"; sourceTree = ""; }; B52DA5641B103F6D005CE75F /* DBAssortedPrimitives.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = DBAssortedPrimitives.h; sourceTree = ""; }; B52DA5651B103F6D005CE75F /* DBAssortedPrimitives.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = DBAssortedPrimitives.mm; sourceTree = ""; }; @@ -286,6 +280,15 @@ CFAED8731B54291900E3B8A3 /* DBEmptyRecord+Private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "DBEmptyRecord+Private.h"; sourceTree = ""; }; CFAED8741B54291900E3B8A3 /* DBEmptyRecord+Private.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = "DBEmptyRecord+Private.mm"; sourceTree = ""; }; CFAED8771B54292600E3B8A3 /* empty_record.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = empty_record.hpp; sourceTree = ""; }; + CFBF90A11D2AA51800F927DD /* proxy_cache_impl.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = proxy_cache_impl.hpp; path = ../proxy_cache_impl.hpp; sourceTree = ""; }; + CFBF90A21D2AA51E00F927DD /* DJIError.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = DJIError.mm; sourceTree = ""; }; + CFBF90A31D2AA51E00F927DD /* DJIProxyCaches.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = DJIProxyCaches.mm; sourceTree = ""; }; + CFBF90A61D2AA53000F927DD /* djinni_common.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = djinni_common.hpp; path = "../../include/djinni/support-lib/djinni_common.hpp"; sourceTree = ""; }; + CFBF90A71D2AA53000F927DD /* proxy_cache_interface.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = proxy_cache_interface.hpp; path = "../../include/djinni/support-lib/proxy_cache_interface.hpp"; sourceTree = ""; }; + CFBF90A81D2AA53D00F927DD /* DJICppWrapperCache+Private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "DJICppWrapperCache+Private.h"; path = "../../include/djinni/support-lib/objc/DJICppWrapperCache+Private.h"; sourceTree = ""; }; + CFBF90A91D2AA53D00F927DD /* DJIError.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DJIError.h; path = "../../include/djinni/support-lib/objc/DJIError.h"; sourceTree = ""; }; + CFBF90AA1D2AA53D00F927DD /* DJIMarshal+Private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "DJIMarshal+Private.h"; path = "../../include/djinni/support-lib/objc/DJIMarshal+Private.h"; sourceTree = ""; }; + CFBF90AB1D2AA53D00F927DD /* DJIObjcWrapperCache+Private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "DJIObjcWrapperCache+Private.h"; path = "../../include/djinni/support-lib/objc/DJIObjcWrapperCache+Private.h"; sourceTree = ""; }; CFC5D9CE1B15105100BF2DF8 /* extern_record_with_derivings.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = extern_record_with_derivings.cpp; sourceTree = ""; }; CFC5D9CF1B15105100BF2DF8 /* extern_record_with_derivings.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = extern_record_with_derivings.hpp; sourceTree = ""; }; CFC5D9D21B15106400BF2DF8 /* DBExternRecordWithDerivings.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DBExternRecordWithDerivings.h; sourceTree = ""; }; @@ -354,12 +357,15 @@ 6536CD6919A6C82200DD7715 /* objc-support-lib */ = { isa = PBXGroup; children = ( - A239F3791AF400C600DF27C8 /* DJIMarshal+Private.h */, - A2CB54B319BA6E6000A9E600 /* DJIError.mm */, - 6536CD6A19A6C82200DD7715 /* DJIError.h */, - 6536CD6C19A6C82200DD7715 /* DJIProxyCaches.mm */, - 6536CD6D19A6C82200DD7715 /* DJICppWrapperCache+Private.h */, - 6536CD6E19A6C82200DD7715 /* DJIObjcWrapperCache+Private.h */, + CFBF90A81D2AA53D00F927DD /* DJICppWrapperCache+Private.h */, + CFBF90A91D2AA53D00F927DD /* DJIError.h */, + CFBF90A21D2AA51E00F927DD /* DJIError.mm */, + CFBF90AA1D2AA53D00F927DD /* DJIMarshal+Private.h */, + CFBF90A61D2AA53000F927DD /* djinni_common.hpp */, + CFBF90AB1D2AA53D00F927DD /* DJIObjcWrapperCache+Private.h */, + CFBF90A31D2AA51E00F927DD /* DJIProxyCaches.mm */, + CFBF90A11D2AA51800F927DD /* proxy_cache_impl.hpp */, + CFBF90A71D2AA53000F927DD /* proxy_cache_interface.hpp */, ); name = "objc-support-lib"; path = "../../support-lib/objc"; @@ -728,6 +734,7 @@ CFC5D9FC1B152E4300BF2DF8 /* TranslateDuration.cpp in Sources */, A248502F1AF96EBC00AFE907 /* DBRecordWithDerivings.mm in Sources */, A24249741AF192FC003BF8F0 /* constants.cpp in Sources */, + CFBF90A51D2AA51E00F927DD /* DJIProxyCaches.mm in Sources */, CFFD588B1B019E79001E10B6 /* DBClientInterface+Private.mm in Sources */, B52DA5691B103F72005CE75F /* DBAssortedPrimitives.mm in Sources */, A24850281AF96EBC00AFE907 /* DBConstants.mm in Sources */, @@ -736,7 +743,6 @@ CFAED8751B54291900E3B8A3 /* DBEmptyRecord.mm in Sources */, A238CA9A1AF84B7100CDDCE5 /* DBNestedCollection+Private.mm in Sources */, CFFD58911B019E79001E10B6 /* DBUserToken+Private.mm in Sources */, - A2CB54B419BA6E6000A9E600 /* DJIError.mm in Sources */, B5E9C9401C1F9E9E0073C123 /* DBReverseClientInterface+Private.mm in Sources */, A238CA961AF84B7100CDDCE5 /* DBMapListRecord+Private.mm in Sources */, A238CA9C1AF84B7100CDDCE5 /* DBPrimitiveList+Private.mm in Sources */, @@ -747,7 +753,6 @@ B5E9C93B1C1F9D9D0073C123 /* reverse_client_interface_impl.cpp in Sources */, CFC5D9D81B15106400BF2DF8 /* DBExternRecordWithDerivings+Private.mm in Sources */, A238CAA21AF84B7100CDDCE5 /* DBSetRecord+Private.mm in Sources */, - A2AE38491BB3074800B7A0C9 /* DJIProxyCaches.mm in Sources */, A238CA9E1AF84B7100CDDCE5 /* DBRecordWithDerivings+Private.mm in Sources */, 6551684F1C40511C003682A4 /* return_one_two.cpp in Sources */, A24249751AF192FC003BF8F0 /* record_with_derivings.cpp in Sources */, @@ -757,6 +762,7 @@ CFC5DA011B15318B00BF2DF8 /* DBTestDuration+Private.mm in Sources */, 650CA05E1C2AB5AB007ADDDB /* ListenerCaller.cpp in Sources */, A248502A1AF96EBC00AFE907 /* DBMapDateRecord.mm in Sources */, + CFBF90A41D2AA51E00F927DD /* DJIError.mm in Sources */, A238CA8E1AF84B7100CDDCE5 /* DBClientReturnedRecord+Private.mm in Sources */, 6551684D1C4050A4003682A4 /* DBReturnTwo+Private.mm in Sources */, B52DA56B1B103F75005CE75F /* DBAssortedPrimitives+Private.mm in Sources */, @@ -864,8 +870,7 @@ HEADER_SEARCH_PATHS = ( "$(inherited)", /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include, - "$(SRCROOT)/DjinniObjcTest/objc", - "$(SRCROOT)/DjinniObjcTest/cpp", + "$(SRCROOT)/../../include", ); IPHONEOS_DEPLOYMENT_TARGET = 7.1; ONLY_ACTIVE_ARCH = YES; @@ -902,8 +907,7 @@ HEADER_SEARCH_PATHS = ( "$(inherited)", /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include, - "$(SRCROOT)/DjinniObjcTest/objc", - "$(SRCROOT)/DjinniObjcTest/cpp", + "$(SRCROOT)/../../include", ); IPHONEOS_DEPLOYMENT_TARGET = 7.1; SDKROOT = iphoneos;