From 0f872f0c0e3278ff432fd79f9d706e42d405f7c1 Mon Sep 17 00:00:00 2001 From: Miro Knejp Date: Wed, 21 Sep 2016 16:22:46 +0200 Subject: [PATCH] Move public headers to support-lib/include/djinni This separation of public and private headers allows users to specify "support-lib/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 | 4 +-- .../generated-src/objc/TXSSortOrder+Private.h | 2 +- .../objc/TXSTextboxListener+Private.mm | 2 +- example/libtextsort.gyp | 2 +- .../objc/TextSort.xcodeproj/project.pbxproj | 4 +-- src/source/Main.scala | 4 +-- .../{ => include/djinni}/djinni_common.hpp | 0 .../{ => include/djinni}/jni/Marshal.hpp | 2 +- .../djinni}/jni/djinni_support.hpp | 4 +-- .../djinni}/objc/DJICppWrapperCache+Private.h | 2 +- .../{ => include/djinni}/objc/DJIError.h | 0 .../djinni}/objc/DJIMarshal+Private.h | 0 .../objc/DJIObjcWrapperCache+Private.h | 2 +- .../djinni}/proxy_cache_interface.hpp | 0 support-lib/{ => src}/jni/djinni_main.cpp | 2 +- support-lib/{ => src}/jni/djinni_support.cpp | 4 +-- support-lib/{ => src}/objc/DJIError.mm | 2 +- support-lib/{ => src}/objc/DJIProxyCaches.mm | 4 +-- support-lib/{ => src}/proxy_cache_impl.hpp | 2 +- support-lib/support_lib.gyp | 36 ++++++++++--------- 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/NativeEnumUsageInterface.cpp | 2 +- .../jni/NativeEnumUsageInterface.hpp | 2 +- .../jni/NativeEnumUsageRecord.cpp | 2 +- .../jni/NativeEnumUsageRecord.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 +- .../NativeInterfaceUsingExtendedRecord.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 +- .../generated-src/jni/NativePrimitiveList.cpp | 2 +- .../generated-src/jni/NativePrimitiveList.hpp | 2 +- .../jni/NativeRecordUsingExtendedRecord.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 +- .../jni/NativeVarnameInterface.hpp | 2 +- .../generated-src/jni/NativeVarnameRecord.cpp | 2 +- .../generated-src/jni/NativeVarnameRecord.hpp | 2 +- .../jni/NativeWcharTestHelpers.cpp | 2 +- .../jni/NativeWcharTestHelpers.hpp | 2 +- .../generated-src/jni/NativeWcharTestRec.cpp | 2 +- .../generated-src/jni/NativeWcharTestRec.hpp | 2 +- .../objc/DBAssortedPrimitives+Private.mm | 2 +- .../objc/DBClientInterface+Private.mm | 4 +-- .../objc/DBClientReturnedRecord+Private.mm | 2 +- .../generated-src/objc/DBColor+Private.h | 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/DBEnumUsageInterface+Private.mm | 8 ++--- .../objc/DBEnumUsageRecord+Private.mm | 2 +- .../objc/DBExtendedRecord+Private.mm | 2 +- .../objc/DBExternInterface1+Private.mm | 4 +-- .../objc/DBExternInterface2+Private.mm | 2 +- .../objc/DBFirstListener+Private.mm | 2 +- .../DBInterfaceUsingExtendedRecord+Private.mm | 4 +-- .../objc/DBJavaOnlyListener+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/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 ++-- .../objc/DBVarnameInterface+Private.mm | 4 +-- .../objc/DBVarnameRecord+Private.mm | 2 +- .../objc/DBWcharTestHelpers+Private.mm | 6 ++-- .../objc/DBWcharTestRec+Private.mm | 2 +- .../handwritten-src/cpp/Duration-jni.hpp | 2 +- test-suite/java/CMakeLists.txt | 6 ++-- .../DjinniObjcTest.xcodeproj/project.pbxproj | 28 +++++++++------ 146 files changed, 219 insertions(+), 207 deletions(-) rename support-lib/{ => include/djinni}/djinni_common.hpp (100%) rename support-lib/{ => include/djinni}/jni/Marshal.hpp (99%) rename support-lib/{ => include/djinni}/jni/djinni_support.hpp (99%) rename support-lib/{ => include/djinni}/objc/DJICppWrapperCache+Private.h (98%) rename support-lib/{ => include/djinni}/objc/DJIError.h (100%) rename support-lib/{ => include/djinni}/objc/DJIMarshal+Private.h (100%) rename support-lib/{ => include/djinni}/objc/DJIObjcWrapperCache+Private.h (97%) rename support-lib/{ => include/djinni}/proxy_cache_interface.hpp (100%) rename support-lib/{ => src}/jni/djinni_main.cpp (96%) rename support-lib/{ => src}/jni/djinni_support.cpp (99%) rename support-lib/{ => src}/objc/DJIError.mm (97%) rename support-lib/{ => src}/objc/DJIProxyCaches.mm (90%) rename support-lib/{ => src}/proxy_cache_impl.hpp (99%) diff --git a/example/generated-src/jni/NativeItemList.cpp b/example/generated-src/jni/NativeItemList.cpp index f6d79ab9b..3d7e32eb1 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/jni/Marshal.hpp" namespace djinni_generated { diff --git a/example/generated-src/jni/NativeItemList.hpp b/example/generated-src/jni/NativeItemList.hpp index 57f7e7d77..fb5a09291 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/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..81475378e 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/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..d2081c0ef 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/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..bea3a2856 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/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..ad64df882 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/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 9368ce974..a9a7394a2 100644 --- 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 #include #include diff --git a/example/generated-src/objc/TXSSortOrder+Private.h b/example/generated-src/objc/TXSSortOrder+Private.h index df2a08421..8da70de15 100644 --- 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 index 18ef89465..9851eaf51 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/objc/DJIObjcWrapperCache+Private.h" #include 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 index 8719435ae..1513ba10c 100644 --- 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", " #include #include diff --git a/support-lib/jni/djinni_support.hpp b/support-lib/include/djinni/jni/djinni_support.hpp similarity index 99% rename from support-lib/jni/djinni_support.hpp rename to support-lib/include/djinni/jni/djinni_support.hpp index a4fab781f..6ceb8e42c 100644 --- a/support-lib/jni/djinni_support.hpp +++ b/support-lib/include/djinni/jni/djinni_support.hpp @@ -23,8 +23,8 @@ #include #include -#include "../proxy_cache_interface.hpp" -#include "../djinni_common.hpp" +#include "djinni/proxy_cache_interface.hpp" +#include "djinni/djinni_common.hpp" #include /* diff --git a/support-lib/objc/DJICppWrapperCache+Private.h b/support-lib/include/djinni/objc/DJICppWrapperCache+Private.h similarity index 98% rename from support-lib/objc/DJICppWrapperCache+Private.h rename to support-lib/include/djinni/objc/DJICppWrapperCache+Private.h index 425460970..4fcd05111 100644 --- a/support-lib/objc/DJICppWrapperCache+Private.h +++ b/support-lib/include/djinni/objc/DJICppWrapperCache+Private.h @@ -19,7 +19,7 @@ #import #include -#include "../proxy_cache_interface.hpp" +#include "djinni/proxy_cache_interface.hpp" namespace djinni { diff --git a/support-lib/objc/DJIError.h b/support-lib/include/djinni/objc/DJIError.h similarity index 100% rename from support-lib/objc/DJIError.h rename to support-lib/include/djinni/objc/DJIError.h diff --git a/support-lib/objc/DJIMarshal+Private.h b/support-lib/include/djinni/objc/DJIMarshal+Private.h similarity index 100% rename from support-lib/objc/DJIMarshal+Private.h rename to support-lib/include/djinni/objc/DJIMarshal+Private.h diff --git a/support-lib/objc/DJIObjcWrapperCache+Private.h b/support-lib/include/djinni/objc/DJIObjcWrapperCache+Private.h similarity index 97% rename from support-lib/objc/DJIObjcWrapperCache+Private.h rename to support-lib/include/djinni/objc/DJIObjcWrapperCache+Private.h index 3c37d55d3..a71059ad2 100644 --- a/support-lib/objc/DJIObjcWrapperCache+Private.h +++ b/support-lib/include/djinni/objc/DJIObjcWrapperCache+Private.h @@ -19,7 +19,7 @@ #import #include -#include "../proxy_cache_interface.hpp" +#include "djinni/proxy_cache_interface.hpp" namespace djinni { diff --git a/support-lib/proxy_cache_interface.hpp b/support-lib/include/djinni/proxy_cache_interface.hpp similarity index 100% rename from support-lib/proxy_cache_interface.hpp rename to support-lib/include/djinni/proxy_cache_interface.hpp diff --git a/support-lib/jni/djinni_main.cpp b/support-lib/src/jni/djinni_main.cpp similarity index 96% rename from support-lib/jni/djinni_main.cpp rename to support-lib/src/jni/djinni_main.cpp index f6556956a..2dee135ac 100644 --- a/support-lib/jni/djinni_main.cpp +++ b/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 b/support-lib/src/jni/djinni_support.cpp similarity index 99% rename from support-lib/jni/djinni_support.cpp rename to support-lib/src/jni/djinni_support.cpp index e3a9ff515..990b0b6e0 100644 --- a/support-lib/jni/djinni_support.cpp +++ b/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 #include diff --git a/support-lib/objc/DJIError.mm b/support-lib/src/objc/DJIError.mm similarity index 97% rename from support-lib/objc/DJIError.mm rename to support-lib/src/objc/DJIError.mm index 4be648097..a77294054 100644 --- a/support-lib/objc/DJIError.mm +++ b/support-lib/src/objc/DJIError.mm @@ -15,7 +15,7 @@ // #include -#include "DJIError.h" +#include "djinni/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/src/objc/DJIProxyCaches.mm similarity index 90% rename from support-lib/objc/DJIProxyCaches.mm rename to support-lib/src/objc/DJIProxyCaches.mm index 53876cd46..5933931db 100644 --- a/support-lib/objc/DJIProxyCaches.mm +++ b/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 b/support-lib/src/proxy_cache_impl.hpp similarity index 99% rename from support-lib/proxy_cache_impl.hpp rename to support-lib/src/proxy_cache_impl.hpp index 897701b0e..21f7a904f 100644 --- a/support-lib/proxy_cache_impl.hpp +++ b/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 #include #include diff --git a/support-lib/support_lib.gyp b/support-lib/support_lib.gyp index 7ac16a19b..4847bc2de 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", - "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 index b49bbf602..1858757dd 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/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 index 098a8a2fc..0339b84ff 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/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..30d13f01d 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/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 16f9c9b5f..f914ba3d2 100644 --- 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 index a8a723a3a..6525dc20e 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/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..f488cd9c4 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/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..e8437a4a8 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/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..969ce3de3 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/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..5055a73c1 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/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..7399d388e 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/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..b521b1dd7 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/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..1eec3f4c4 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/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..9832dc4f1 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/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..358b5289b 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/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..166d4098d 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/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..caebb2652 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/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 dc7cfe0a1..f0eed87c6 100644 --- a/test-suite/generated-src/jni/NativeCppException.cpp +++ b/test-suite/generated-src/jni/NativeCppException.cpp @@ -2,7 +2,7 @@ // This file generated by Djinni from exception.djinni #include "NativeCppException.hpp" // my header -#include "Marshal.hpp" +#include "djinni/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..ab45d7ee4 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/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..70f5ba111 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/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..70ac2e01b 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/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..1193d468d 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/jni/djinni_support.hpp" #include "empty_record.hpp" namespace djinni_generated { diff --git a/test-suite/generated-src/jni/NativeEnumUsageInterface.cpp b/test-suite/generated-src/jni/NativeEnumUsageInterface.cpp index 4e84735d3..0f2e474ec 100644 --- a/test-suite/generated-src/jni/NativeEnumUsageInterface.cpp +++ b/test-suite/generated-src/jni/NativeEnumUsageInterface.cpp @@ -2,8 +2,8 @@ // This file generated by Djinni from enum.djinni #include "NativeEnumUsageInterface.hpp" // my header -#include "Marshal.hpp" #include "NativeColor.hpp" +#include "djinni/jni/Marshal.hpp" namespace djinni_generated { diff --git a/test-suite/generated-src/jni/NativeEnumUsageInterface.hpp b/test-suite/generated-src/jni/NativeEnumUsageInterface.hpp index 9710b002b..1e0414bc9 100644 --- a/test-suite/generated-src/jni/NativeEnumUsageInterface.hpp +++ b/test-suite/generated-src/jni/NativeEnumUsageInterface.hpp @@ -3,7 +3,7 @@ #pragma once -#include "djinni_support.hpp" +#include "djinni/jni/djinni_support.hpp" #include "enum_usage_interface.hpp" namespace djinni_generated { diff --git a/test-suite/generated-src/jni/NativeEnumUsageRecord.cpp b/test-suite/generated-src/jni/NativeEnumUsageRecord.cpp index 0460969ac..77d179d66 100644 --- a/test-suite/generated-src/jni/NativeEnumUsageRecord.cpp +++ b/test-suite/generated-src/jni/NativeEnumUsageRecord.cpp @@ -2,8 +2,8 @@ // This file generated by Djinni from enum.djinni #include "NativeEnumUsageRecord.hpp" // my header -#include "Marshal.hpp" #include "NativeColor.hpp" +#include "djinni/jni/Marshal.hpp" namespace djinni_generated { diff --git a/test-suite/generated-src/jni/NativeEnumUsageRecord.hpp b/test-suite/generated-src/jni/NativeEnumUsageRecord.hpp index fbc3bbfbd..2afecde35 100644 --- a/test-suite/generated-src/jni/NativeEnumUsageRecord.hpp +++ b/test-suite/generated-src/jni/NativeEnumUsageRecord.hpp @@ -3,7 +3,7 @@ #pragma once -#include "djinni_support.hpp" +#include "djinni/jni/djinni_support.hpp" #include "enum_usage_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..5a7a4e9f9 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/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 559316a40..2ea4f66f7 100644 --- a/test-suite/generated-src/jni/NativeExtendedRecord.hpp +++ b/test-suite/generated-src/jni/NativeExtendedRecord.hpp @@ -4,7 +4,7 @@ #pragma once #include "../../handwritten-src/cpp/extended_record.hpp" -#include "djinni_support.hpp" +#include "djinni/jni/djinni_support.hpp" namespace djinni_generated { diff --git a/test-suite/generated-src/jni/NativeExternInterface1.hpp b/test-suite/generated-src/jni/NativeExternInterface1.hpp index d0d1902ef..8777a4f4c 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/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..dde74e923 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/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..0b18f3338 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/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..d289a9913 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/jni/djinni_support.hpp" #include "first_listener.hpp" namespace djinni_generated { diff --git a/test-suite/generated-src/jni/NativeInterfaceUsingExtendedRecord.hpp b/test-suite/generated-src/jni/NativeInterfaceUsingExtendedRecord.hpp index dc20f6f82..35dfd664a 100644 --- a/test-suite/generated-src/jni/NativeInterfaceUsingExtendedRecord.hpp +++ b/test-suite/generated-src/jni/NativeInterfaceUsingExtendedRecord.hpp @@ -3,7 +3,7 @@ #pragma once -#include "djinni_support.hpp" +#include "djinni/jni/djinni_support.hpp" #include "interface_using_extended_record.hpp" namespace djinni_generated { diff --git a/test-suite/generated-src/jni/NativeJavaOnlyListener.hpp b/test-suite/generated-src/jni/NativeJavaOnlyListener.hpp index 7d3e92d8a..3404cfe08 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/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..b83514ad5 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/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..ebeecfc35 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/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..80642e7f8 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/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..b229e8cb2 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/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..b8ad633a2 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/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..85a0d00df 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/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..f75c492fb 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/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..673b57265 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/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..4486c11a4 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/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..749eaf459 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/jni/djinni_support.hpp" #include "objc_only_listener.hpp" namespace djinni_generated { diff --git a/test-suite/generated-src/jni/NativePrimitiveList.cpp b/test-suite/generated-src/jni/NativePrimitiveList.cpp index f054e195f..e63ddcb2a 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/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..6b8d2e8d0 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/jni/djinni_support.hpp" #include "primitive_list.hpp" namespace djinni_generated { diff --git a/test-suite/generated-src/jni/NativeRecordUsingExtendedRecord.hpp b/test-suite/generated-src/jni/NativeRecordUsingExtendedRecord.hpp index d295f5cb0..fb51e9e0b 100644 --- a/test-suite/generated-src/jni/NativeRecordUsingExtendedRecord.hpp +++ b/test-suite/generated-src/jni/NativeRecordUsingExtendedRecord.hpp @@ -3,7 +3,7 @@ #pragma once -#include "djinni_support.hpp" +#include "djinni/jni/djinni_support.hpp" #include "record_using_extended_record.hpp" namespace djinni_generated { diff --git a/test-suite/generated-src/jni/NativeRecordWithDerivings.cpp b/test-suite/generated-src/jni/NativeRecordWithDerivings.cpp index 707e7e364..c457e433b 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/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..afa0c7f74 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/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..c43a78003 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/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..d525030a6 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/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..b62cf71f0 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/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..27a6922a7 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/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 8b2690b53..d75b5c2f9 100644 --- a/test-suite/generated-src/jni/NativeReturnOne.cpp +++ b/test-suite/generated-src/jni/NativeReturnOne.cpp @@ -2,7 +2,7 @@ // This file generated by Djinni from multiple_inheritance.djinni #include "NativeReturnOne.hpp" // my header -#include "Marshal.hpp" +#include "djinni/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..90b87636a 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/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 0697e2983..3b870456d 100644 --- a/test-suite/generated-src/jni/NativeReturnTwo.cpp +++ b/test-suite/generated-src/jni/NativeReturnTwo.cpp @@ -2,7 +2,7 @@ // This file generated by Djinni from multiple_inheritance.djinni #include "NativeReturnTwo.hpp" // my header -#include "Marshal.hpp" +#include "djinni/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..0607e55dc 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/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 013ab8e14..44a302b5a 100644 --- a/test-suite/generated-src/jni/NativeReverseClientInterface.cpp +++ b/test-suite/generated-src/jni/NativeReverseClientInterface.cpp @@ -2,7 +2,7 @@ // This file generated by Djinni from client_interface.djinni #include "NativeReverseClientInterface.hpp" // my header -#include "Marshal.hpp" +#include "djinni/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..8a4d4f657 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/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..e7f83f6dc 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/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..aee44e9d0 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/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..4eeb6bf39 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/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..00a039cfc 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/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..69bd06376 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/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..14371367e 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/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..dc988371b 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/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..a0e07394f 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/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..5ed96d6c7 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/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 75c639c79..f65a596bb 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/jni/djinni_support.hpp" #include "uses_single_language_listeners.hpp" namespace djinni_generated { diff --git a/test-suite/generated-src/jni/NativeVarnameInterface.hpp b/test-suite/generated-src/jni/NativeVarnameInterface.hpp index 1b2845cab..894cd20c9 100644 --- a/test-suite/generated-src/jni/NativeVarnameInterface.hpp +++ b/test-suite/generated-src/jni/NativeVarnameInterface.hpp @@ -4,7 +4,7 @@ #pragma once #include "_varname_interface_.hpp" -#include "djinni_support.hpp" +#include "djinni/jni/djinni_support.hpp" namespace djinni_generated { diff --git a/test-suite/generated-src/jni/NativeVarnameRecord.cpp b/test-suite/generated-src/jni/NativeVarnameRecord.cpp index 4d3e34293..e00e88a49 100644 --- a/test-suite/generated-src/jni/NativeVarnameRecord.cpp +++ b/test-suite/generated-src/jni/NativeVarnameRecord.cpp @@ -2,7 +2,7 @@ // This file generated by Djinni from varnames.djinni #include "NativeVarnameRecord.hpp" // my header -#include "Marshal.hpp" +#include "djinni/jni/Marshal.hpp" namespace djinni_generated { diff --git a/test-suite/generated-src/jni/NativeVarnameRecord.hpp b/test-suite/generated-src/jni/NativeVarnameRecord.hpp index 0462273b7..8f2efbf8b 100644 --- a/test-suite/generated-src/jni/NativeVarnameRecord.hpp +++ b/test-suite/generated-src/jni/NativeVarnameRecord.hpp @@ -4,7 +4,7 @@ #pragma once #include "_varname_record_.hpp" -#include "djinni_support.hpp" +#include "djinni/jni/djinni_support.hpp" namespace djinni_generated { diff --git a/test-suite/generated-src/jni/NativeWcharTestHelpers.cpp b/test-suite/generated-src/jni/NativeWcharTestHelpers.cpp index 19dd54fae..5c23e4af5 100644 --- a/test-suite/generated-src/jni/NativeWcharTestHelpers.cpp +++ b/test-suite/generated-src/jni/NativeWcharTestHelpers.cpp @@ -2,8 +2,8 @@ // This file generated by Djinni from wchar_test.djinni #include "NativeWcharTestHelpers.hpp" // my header -#include "Marshal.hpp" #include "NativeWcharTestRec.hpp" +#include "djinni/jni/Marshal.hpp" namespace djinni_generated { diff --git a/test-suite/generated-src/jni/NativeWcharTestHelpers.hpp b/test-suite/generated-src/jni/NativeWcharTestHelpers.hpp index 922c4ee5a..72237f5e2 100644 --- a/test-suite/generated-src/jni/NativeWcharTestHelpers.hpp +++ b/test-suite/generated-src/jni/NativeWcharTestHelpers.hpp @@ -3,7 +3,7 @@ #pragma once -#include "djinni_support.hpp" +#include "djinni/jni/djinni_support.hpp" #include "wchar_test_helpers.hpp" namespace djinni_generated { diff --git a/test-suite/generated-src/jni/NativeWcharTestRec.cpp b/test-suite/generated-src/jni/NativeWcharTestRec.cpp index ee981e5b2..0aae4247c 100644 --- a/test-suite/generated-src/jni/NativeWcharTestRec.cpp +++ b/test-suite/generated-src/jni/NativeWcharTestRec.cpp @@ -2,7 +2,7 @@ // This file generated by Djinni from wchar_test.djinni #include "NativeWcharTestRec.hpp" // my header -#include "Marshal.hpp" +#include "djinni/jni/Marshal.hpp" namespace djinni_generated { diff --git a/test-suite/generated-src/jni/NativeWcharTestRec.hpp b/test-suite/generated-src/jni/NativeWcharTestRec.hpp index efa42ef40..c96f879aa 100644 --- a/test-suite/generated-src/jni/NativeWcharTestRec.hpp +++ b/test-suite/generated-src/jni/NativeWcharTestRec.hpp @@ -3,7 +3,7 @@ #pragma once -#include "djinni_support.hpp" +#include "djinni/jni/djinni_support.hpp" #include "wchar_test_rec.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..1345f2ae0 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/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 3593ff4fc..12c53bc8c 100644 --- a/test-suite/generated-src/objc/DBClientInterface+Private.mm +++ b/test-suite/generated-src/objc/DBClientInterface+Private.mm @@ -4,8 +4,8 @@ #import "DBClientInterface+Private.h" #import "DBClientInterface.h" #import "DBClientReturnedRecord+Private.h" -#import "DJIMarshal+Private.h" -#import "DJIObjcWrapperCache+Private.h" +#import "djinni/objc/DJIMarshal+Private.h" +#import "djinni/objc/DJIObjcWrapperCache+Private.h" #include 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..4b8ddc707 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/objc/DJIMarshal+Private.h" #include namespace djinni_generated { diff --git a/test-suite/generated-src/objc/DBColor+Private.h b/test-suite/generated-src/objc/DBColor+Private.h index 018fa9ff0..bbd2c1786 100644 --- a/test-suite/generated-src/objc/DBColor+Private.h +++ b/test-suite/generated-src/objc/DBColor+Private.h @@ -2,5 +2,5 @@ // This file generated by Djinni from enum.djinni #include "color.hpp" -#import "DJIMarshal+Private.h" +#import "djinni/objc/DJIMarshal+Private.h" diff --git a/test-suite/generated-src/objc/DBConflict+Private.mm b/test-suite/generated-src/objc/DBConflict+Private.mm index 4f4d7dae5..664d10d17 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/objc/DJICppWrapperCache+Private.h" +#import "djinni/objc/DJIError.h" #include #include #include diff --git a/test-suite/generated-src/objc/DBConflictUser+Private.mm b/test-suite/generated-src/objc/DBConflictUser+Private.mm index 937934de1..07554350c 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/objc/DJICppWrapperCache+Private.h" +#import "djinni/objc/DJIError.h" +#import "djinni/objc/DJIMarshal+Private.h" #include #include #include diff --git a/test-suite/generated-src/objc/DBConstantRecord+Private.mm b/test-suite/generated-src/objc/DBConstantRecord+Private.mm index b28f25172..409d116fd 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/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..75fe1c4b5 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/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 f6e7db467..4647c1912 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/objc/DJICppWrapperCache+Private.h" +#import "djinni/objc/DJIError.h" +#import "djinni/objc/DJIMarshal+Private.h" #include #include #include diff --git a/test-suite/generated-src/objc/DBCppException+Private.mm b/test-suite/generated-src/objc/DBCppException+Private.mm index 6d068a92e..fe19373b6 100644 --- a/test-suite/generated-src/objc/DBCppException+Private.mm +++ b/test-suite/generated-src/objc/DBCppException+Private.mm @@ -3,9 +3,9 @@ #import "DBCppException+Private.h" #import "DBCppException.h" -#import "DJICppWrapperCache+Private.h" -#import "DJIError.h" -#import "DJIMarshal+Private.h" +#import "djinni/objc/DJICppWrapperCache+Private.h" +#import "djinni/objc/DJIError.h" +#import "djinni/objc/DJIMarshal+Private.h" #include #include #include diff --git a/test-suite/generated-src/objc/DBDateRecord+Private.mm b/test-suite/generated-src/objc/DBDateRecord+Private.mm index e1e8175d2..f2dbd4de4 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/objc/DJIMarshal+Private.h" #include namespace djinni_generated { diff --git a/test-suite/generated-src/objc/DBEnumUsageInterface+Private.mm b/test-suite/generated-src/objc/DBEnumUsageInterface+Private.mm index 460b43183..8195ce8b6 100644 --- a/test-suite/generated-src/objc/DBEnumUsageInterface+Private.mm +++ b/test-suite/generated-src/objc/DBEnumUsageInterface+Private.mm @@ -4,10 +4,10 @@ #import "DBEnumUsageInterface+Private.h" #import "DBEnumUsageInterface.h" #import "DBColor+Private.h" -#import "DJICppWrapperCache+Private.h" -#import "DJIError.h" -#import "DJIMarshal+Private.h" -#import "DJIObjcWrapperCache+Private.h" +#import "djinni/objc/DJICppWrapperCache+Private.h" +#import "djinni/objc/DJIError.h" +#import "djinni/objc/DJIMarshal+Private.h" +#import "djinni/objc/DJIObjcWrapperCache+Private.h" #include #include #include diff --git a/test-suite/generated-src/objc/DBEnumUsageRecord+Private.mm b/test-suite/generated-src/objc/DBEnumUsageRecord+Private.mm index 2f21a3b69..c2a888865 100644 --- a/test-suite/generated-src/objc/DBEnumUsageRecord+Private.mm +++ b/test-suite/generated-src/objc/DBEnumUsageRecord+Private.mm @@ -3,7 +3,7 @@ #import "DBEnumUsageRecord+Private.h" #import "DBColor+Private.h" -#import "DJIMarshal+Private.h" +#import "djinni/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 69413f8d6..abb7c5857 100644 --- a/test-suite/generated-src/objc/DBExtendedRecord+Private.mm +++ b/test-suite/generated-src/objc/DBExtendedRecord+Private.mm @@ -2,7 +2,7 @@ // This file generated by Djinni from extended_record.djinni #import "DBExtendedRecord+Private.h" -#import "DJIMarshal+Private.h" +#import "djinni/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 6a85c6f8b..9079ba293 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/objc/DJICppWrapperCache+Private.h" +#import "djinni/objc/DJIError.h" #include #include #include diff --git a/test-suite/generated-src/objc/DBExternInterface2+Private.mm b/test-suite/generated-src/objc/DBExternInterface2+Private.mm index 38608286b..454f410ad 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/objc/DJIObjcWrapperCache+Private.h" #include static_assert(__has_feature(objc_arc), "Djinni requires ARC to be enabled for this file"); diff --git a/test-suite/generated-src/objc/DBFirstListener+Private.mm b/test-suite/generated-src/objc/DBFirstListener+Private.mm index be17c49e7..b21837d21 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/objc/DJIObjcWrapperCache+Private.h" #include static_assert(__has_feature(objc_arc), "Djinni requires ARC to be enabled for this file"); diff --git a/test-suite/generated-src/objc/DBInterfaceUsingExtendedRecord+Private.mm b/test-suite/generated-src/objc/DBInterfaceUsingExtendedRecord+Private.mm index 20048f849..a1042b25e 100644 --- a/test-suite/generated-src/objc/DBInterfaceUsingExtendedRecord+Private.mm +++ b/test-suite/generated-src/objc/DBInterfaceUsingExtendedRecord+Private.mm @@ -5,8 +5,8 @@ #import "DBInterfaceUsingExtendedRecord.h" #import "DBExtendedRecord+Private.h" #import "DBRecordUsingExtendedRecord+Private.h" -#import "DJICppWrapperCache+Private.h" -#import "DJIError.h" +#import "djinni/objc/DJICppWrapperCache+Private.h" +#import "djinni/objc/DJIError.h" #include #include #include diff --git a/test-suite/generated-src/objc/DBJavaOnlyListener+Private.mm b/test-suite/generated-src/objc/DBJavaOnlyListener+Private.mm index bfce2c889..2ec2ba771 100644 --- a/test-suite/generated-src/objc/DBJavaOnlyListener+Private.mm +++ b/test-suite/generated-src/objc/DBJavaOnlyListener+Private.mm @@ -3,7 +3,7 @@ #import "DBJavaOnlyListener+Private.h" #import "DBJavaOnlyListener.h" -#import "DJIError.h" +#import "djinni/objc/DJIError.h" #include 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 b403438af..192d70fca 100644 --- a/test-suite/generated-src/objc/DBListenerCaller+Private.mm +++ b/test-suite/generated-src/objc/DBListenerCaller+Private.mm @@ -5,8 +5,8 @@ #import "DBListenerCaller.h" #import "DBFirstListener+Private.h" #import "DBSecondListener+Private.h" -#import "DJICppWrapperCache+Private.h" -#import "DJIError.h" +#import "djinni/objc/DJICppWrapperCache+Private.h" +#import "djinni/objc/DJIError.h" #include #include #include diff --git a/test-suite/generated-src/objc/DBMapDateRecord+Private.mm b/test-suite/generated-src/objc/DBMapDateRecord+Private.mm index 77e09f1a7..d8f34c366 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/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..c6f0b50b0 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/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..7b00544e1 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/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..b66e017f9 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/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 184ec1c7a..1435bfb48 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/objc/DJIObjcWrapperCache+Private.h" #include static_assert(__has_feature(objc_arc), "Djinni requires ARC to be enabled for this file"); diff --git a/test-suite/generated-src/objc/DBPrimitiveList+Private.mm b/test-suite/generated-src/objc/DBPrimitiveList+Private.mm index 02c180a88..ddfca7bd9 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/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..d4b3f6471 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/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..a709bdf55 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/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..ca3a09a2d 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/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 1b363b5c6..a1a58b80b 100644 --- a/test-suite/generated-src/objc/DBReturnOne+Private.mm +++ b/test-suite/generated-src/objc/DBReturnOne+Private.mm @@ -3,9 +3,9 @@ #import "DBReturnOne+Private.h" #import "DBReturnOne.h" -#import "DJICppWrapperCache+Private.h" -#import "DJIError.h" -#import "DJIMarshal+Private.h" +#import "djinni/objc/DJICppWrapperCache+Private.h" +#import "djinni/objc/DJIError.h" +#import "djinni/objc/DJIMarshal+Private.h" #include #include #include diff --git a/test-suite/generated-src/objc/DBReturnTwo+Private.mm b/test-suite/generated-src/objc/DBReturnTwo+Private.mm index 1050fb043..e92e506da 100644 --- a/test-suite/generated-src/objc/DBReturnTwo+Private.mm +++ b/test-suite/generated-src/objc/DBReturnTwo+Private.mm @@ -3,9 +3,9 @@ #import "DBReturnTwo+Private.h" #import "DBReturnTwo.h" -#import "DJICppWrapperCache+Private.h" -#import "DJIError.h" -#import "DJIMarshal+Private.h" +#import "djinni/objc/DJICppWrapperCache+Private.h" +#import "djinni/objc/DJIError.h" +#import "djinni/objc/DJIMarshal+Private.h" #include #include #include diff --git a/test-suite/generated-src/objc/DBReverseClientInterface+Private.mm b/test-suite/generated-src/objc/DBReverseClientInterface+Private.mm index 9e5fd500f..bfad0ade2 100644 --- a/test-suite/generated-src/objc/DBReverseClientInterface+Private.mm +++ b/test-suite/generated-src/objc/DBReverseClientInterface+Private.mm @@ -3,9 +3,9 @@ #import "DBReverseClientInterface+Private.h" #import "DBReverseClientInterface.h" -#import "DJICppWrapperCache+Private.h" -#import "DJIError.h" -#import "DJIMarshal+Private.h" +#import "djinni/objc/DJICppWrapperCache+Private.h" +#import "djinni/objc/DJIError.h" +#import "djinni/objc/DJIMarshal+Private.h" #include #include #include diff --git a/test-suite/generated-src/objc/DBSecondListener+Private.mm b/test-suite/generated-src/objc/DBSecondListener+Private.mm index 15ce58f3f..5c6c42d83 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/objc/DJIObjcWrapperCache+Private.h" #include 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..25040eacc 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/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 4f374d52b..c8fafea11 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/objc/DJICppWrapperCache+Private.h" +#import "djinni/objc/DJIError.h" +#import "djinni/objc/DJIMarshal+Private.h" #include #include #include diff --git a/test-suite/generated-src/objc/DBTestHelpers+Private.mm b/test-suite/generated-src/objc/DBTestHelpers+Private.mm index eab020b8b..338b972ff 100644 --- a/test-suite/generated-src/objc/DBTestHelpers+Private.mm +++ b/test-suite/generated-src/objc/DBTestHelpers+Private.mm @@ -11,9 +11,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/objc/DJICppWrapperCache+Private.h" +#import "djinni/objc/DJIError.h" +#import "djinni/objc/DJIMarshal+Private.h" #include #include #include diff --git a/test-suite/generated-src/objc/DBUserToken+Private.mm b/test-suite/generated-src/objc/DBUserToken+Private.mm index d22c729fd..9347990b6 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/objc/DJICppWrapperCache+Private.h" +#import "djinni/objc/DJIError.h" +#import "djinni/objc/DJIMarshal+Private.h" +#import "djinni/objc/DJIObjcWrapperCache+Private.h" #include #include #include diff --git a/test-suite/generated-src/objc/DBUsesSingleLanguageListeners+Private.mm b/test-suite/generated-src/objc/DBUsesSingleLanguageListeners+Private.mm index 8f26c375f..d3ee53360 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/objc/DJICppWrapperCache+Private.h" +#import "djinni/objc/DJIError.h" +#import "djinni/objc/DJIObjcWrapperCache+Private.h" #include #include #include diff --git a/test-suite/generated-src/objc/DBVarnameInterface+Private.mm b/test-suite/generated-src/objc/DBVarnameInterface+Private.mm index fca3a07d1..bf1b110d1 100644 --- a/test-suite/generated-src/objc/DBVarnameInterface+Private.mm +++ b/test-suite/generated-src/objc/DBVarnameInterface+Private.mm @@ -4,8 +4,8 @@ #import "DBVarnameInterface+Private.h" #import "DBVarnameInterface.h" #import "DBVarnameRecord+Private.h" -#import "DJICppWrapperCache+Private.h" -#import "DJIError.h" +#import "djinni/objc/DJICppWrapperCache+Private.h" +#import "djinni/objc/DJIError.h" #include #include #include diff --git a/test-suite/generated-src/objc/DBVarnameRecord+Private.mm b/test-suite/generated-src/objc/DBVarnameRecord+Private.mm index fd1325418..662c8b768 100644 --- a/test-suite/generated-src/objc/DBVarnameRecord+Private.mm +++ b/test-suite/generated-src/objc/DBVarnameRecord+Private.mm @@ -2,7 +2,7 @@ // This file generated by Djinni from varnames.djinni #import "DBVarnameRecord+Private.h" -#import "DJIMarshal+Private.h" +#import "djinni/objc/DJIMarshal+Private.h" #include namespace djinni_generated { diff --git a/test-suite/generated-src/objc/DBWcharTestHelpers+Private.mm b/test-suite/generated-src/objc/DBWcharTestHelpers+Private.mm index 36936a5af..52cfc05f3 100644 --- a/test-suite/generated-src/objc/DBWcharTestHelpers+Private.mm +++ b/test-suite/generated-src/objc/DBWcharTestHelpers+Private.mm @@ -4,9 +4,9 @@ #import "DBWcharTestHelpers+Private.h" #import "DBWcharTestHelpers.h" #import "DBWcharTestRec+Private.h" -#import "DJICppWrapperCache+Private.h" -#import "DJIError.h" -#import "DJIMarshal+Private.h" +#import "djinni/objc/DJICppWrapperCache+Private.h" +#import "djinni/objc/DJIError.h" +#import "djinni/objc/DJIMarshal+Private.h" #include #include #include diff --git a/test-suite/generated-src/objc/DBWcharTestRec+Private.mm b/test-suite/generated-src/objc/DBWcharTestRec+Private.mm index 9d7f2e979..25a3ab50a 100644 --- a/test-suite/generated-src/objc/DBWcharTestRec+Private.mm +++ b/test-suite/generated-src/objc/DBWcharTestRec+Private.mm @@ -2,7 +2,7 @@ // This file generated by Djinni from wchar_test.djinni #import "DBWcharTestRec+Private.h" -#import "DJIMarshal+Private.h" +#import "djinni/objc/DJIMarshal+Private.h" #include namespace djinni_generated { diff --git a/test-suite/handwritten-src/cpp/Duration-jni.hpp b/test-suite/handwritten-src/cpp/Duration-jni.hpp index e901b635b..1074c9d8e 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/jni/djinni_support.hpp" #include #include diff --git a/test-suite/java/CMakeLists.txt b/test-suite/java/CMakeLists.txt index 4466cd21e..8debee732 100644 --- a/test-suite/java/CMakeLists.txt +++ b/test-suite/java/CMakeLists.txt @@ -24,12 +24,11 @@ endif() ## Test Suite Shared Library ## -set(support_dir ../../support-lib/jni) set(test_include_dirs ../generated-src/jni/ ../generated-src/cpp/ ../handwritten-src/cpp/) file( GLOB_RECURSE support_srcs - ${support_dir}/*.cpp) + ../../support-lib/src/jni/*.cpp) file( GLOB_RECURSE test_suite_srcs @@ -50,7 +49,8 @@ add_library(DjinniTestNative SHARED ${test_lib_srcs}) include_directories( DjinniTestNative ${test_include_dirs} - ${support_dir} + ../../support-lib/include/ + ../../support-lib/src/ ${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 498d67c09..e83467eb1 100644 --- a/test-suite/objc/DjinniObjcTest.xcodeproj/project.pbxproj +++ b/test-suite/objc/DjinniObjcTest.xcodeproj/project.pbxproj @@ -165,10 +165,9 @@ 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 = ""; }; + 6536CD6C19A6C82200DD7715 /* DJIProxyCaches.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = DJIProxyCaches.mm; path = src/objc/DJIProxyCaches.mm; sourceTree = ""; }; + 6536CD6D19A6C82200DD7715 /* DJIObjcWrapperCache+Private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "DJIObjcWrapperCache+Private.h"; path = "include/djinni/objc/DJIObjcWrapperCache+Private.h"; sourceTree = ""; }; + 6536CD6E19A6C82200DD7715 /* DJICppWrapperCache+Private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "DJICppWrapperCache+Private.h"; path = "include/djinni/objc/DJICppWrapperCache+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 = ""; }; @@ -219,7 +218,7 @@ 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 = ""; }; + A239F3791AF400C600DF27C8 /* DJIMarshal+Private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "DJIMarshal+Private.h"; path = "include/djinni/objc/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 = ""; }; @@ -281,7 +280,7 @@ 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 = ""; }; + A2CB54B319BA6E6000A9E600 /* DJIError.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = DJIError.mm; path = src/objc/DJIError.mm; sourceTree = ""; }; A2CCB9411AF80DFC00E6230A /* DBClientInterface+Private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "DBClientInterface+Private.h"; sourceTree = ""; }; B5153F871D54282C00012654 /* wchar_test_rec.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = wchar_test_rec.hpp; sourceTree = ""; }; B5153F891D54283700012654 /* DBWcharTestRec+Private.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = "DBWcharTestRec+Private.mm"; sourceTree = ""; }; @@ -371,6 +370,10 @@ B5F06AA21D4987EF005BE736 /* DBEnumUsageRecord.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = DBEnumUsageRecord.mm; sourceTree = ""; }; B5F06AA31D4987EF005BE736 /* DBEnumUsageRecord+Private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "DBEnumUsageRecord+Private.h"; sourceTree = ""; }; B5F06AA41D4987EF005BE736 /* DBEnumUsageRecord+Private.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = "DBEnumUsageRecord+Private.mm"; sourceTree = ""; }; + CF19C6131D92BA0F00DF9283 /* DJIError.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DJIError.h; path = include/djinni/objc/DJIError.h; sourceTree = ""; }; + CF19C6141D92BA7000DF9283 /* djinni_common.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = djinni_common.hpp; path = include/djinni/djinni_common.hpp; sourceTree = ""; }; + CF19C6151D92BA7000DF9283 /* proxy_cache_interface.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = proxy_cache_interface.hpp; path = include/djinni/proxy_cache_interface.hpp; sourceTree = ""; }; + CF19C6161D92BA7900DF9283 /* proxy_cache_impl.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = proxy_cache_impl.hpp; path = src/proxy_cache_impl.hpp; sourceTree = ""; }; CFAED8711B54291900E3B8A3 /* DBEmptyRecord.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DBEmptyRecord.h; sourceTree = ""; }; CFAED8721B54291900E3B8A3 /* DBEmptyRecord.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = DBEmptyRecord.mm; sourceTree = ""; }; CFAED8731B54291900E3B8A3 /* DBEmptyRecord+Private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "DBEmptyRecord+Private.h"; sourceTree = ""; }; @@ -444,15 +447,18 @@ 6536CD6919A6C82200DD7715 /* objc-support-lib */ = { isa = PBXGroup; children = ( + CF19C6161D92BA7900DF9283 /* proxy_cache_impl.hpp */, + CF19C6141D92BA7000DF9283 /* djinni_common.hpp */, + CF19C6151D92BA7000DF9283 /* proxy_cache_interface.hpp */, + CF19C6131D92BA0F00DF9283 /* DJIError.h */, A239F3791AF400C600DF27C8 /* DJIMarshal+Private.h */, A2CB54B319BA6E6000A9E600 /* DJIError.mm */, - 6536CD6A19A6C82200DD7715 /* DJIError.h */, 6536CD6C19A6C82200DD7715 /* DJIProxyCaches.mm */, - 6536CD6D19A6C82200DD7715 /* DJICppWrapperCache+Private.h */, - 6536CD6E19A6C82200DD7715 /* DJIObjcWrapperCache+Private.h */, + 6536CD6D19A6C82200DD7715 /* DJIObjcWrapperCache+Private.h */, + 6536CD6E19A6C82200DD7715 /* DJICppWrapperCache+Private.h */, ); name = "objc-support-lib"; - path = "../../support-lib/objc"; + path = "../../support-lib"; sourceTree = ""; }; 6536CD7019A6C96C00DD7715 /* handwritten-objc */ = { @@ -1043,6 +1049,7 @@ GCC_WARN_UNUSED_VARIABLE = YES; HEADER_SEARCH_PATHS = ( "$(inherited)", + "$(SRCROOT)/../../support-lib/include", /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include, "$(SRCROOT)/DjinniObjcTest/objc", "$(SRCROOT)/DjinniObjcTest/cpp", @@ -1081,6 +1088,7 @@ GCC_WARN_UNUSED_VARIABLE = YES; HEADER_SEARCH_PATHS = ( "$(inherited)", + "$(SRCROOT)/../../support-lib/include", /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include, "$(SRCROOT)/DjinniObjcTest/objc", "$(SRCROOT)/DjinniObjcTest/cpp",