Commit a891fb99 authored by Miro Knejp's avatar Miro Knejp

Cleanup the example project

- Remove all generated code from the primary Xcode project
- Include generated .cpp files in libtextsort for records with derivings
- Handwritten objc sources no longer need to be .mm
- Rename main.m to .mm for C++ standard library linking
- Add libdjinni to Xcode workspace for convenience
parent 1438ed53
......@@ -10,6 +10,7 @@
"sources": [
"../support-lib/jni/djinni_main.cpp",
"<!@(python glob.py generated-src/jni '*.cpp')",
"<!@(python glob.py generated-src/cpp '*.cpp')",
"<!@(python glob.py handwritten-src/cpp '*.cpp')",
],
"include_dirs": [
......@@ -27,6 +28,7 @@
],
"sources": [
"<!@(python glob.py generated-src/objc '*.cpp' '*.mm' '*.m')",
"<!@(python glob.py generated-src/cpp '*.cpp')",
"<!@(python glob.py handwritten-src/cpp '*.cpp')",
],
"include_dirs": [
......
......@@ -13,16 +13,12 @@
65834DEB19AC599E0061AD3F /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 65834DE919AC599E0061AD3F /* InfoPlist.strings */; };
65834DF419AC599E0061AD3F /* Main_iPhone.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 65834DF219AC599E0061AD3F /* Main_iPhone.storyboard */; };
65834DFC19AC599E0061AD3F /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 65834DFB19AC599E0061AD3F /* Images.xcassets */; };
65D7FDFA19AD0CDF0038F82F /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 65D7FDF319AD0CDF0038F82F /* main.m */; };
65D7FDFA19AD0CDF0038F82F /* main.mm in Sources */ = {isa = PBXBuildFile; fileRef = 65D7FDF319AD0CDF0038F82F /* main.mm */; };
65D7FDFB19AD0CDF0038F82F /* TXSAppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 65D7FDF519AD0CDF0038F82F /* TXSAppDelegate.m */; };
65D7FDFC19AD0CDF0038F82F /* TXSTextboxListenerImpl.m in Sources */ = {isa = PBXBuildFile; fileRef = 65D7FDF719AD0CDF0038F82F /* TXSTextboxListenerImpl.m */; };
65D7FDFD19AD0CDF0038F82F /* TXSViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 65D7FDF919AD0CDF0038F82F /* TXSViewController.mm */; };
A29DB13019BCB94300BFC38D /* DJIError.mm in Sources */ = {isa = PBXBuildFile; fileRef = A29DB12C19BCB94300BFC38D /* DJIError.mm */; };
A29DB13119BCB94300BFC38D /* DJIWeakPtrWrapper.mm in Sources */ = {isa = PBXBuildFile; fileRef = A29DB12E19BCB94300BFC38D /* DJIWeakPtrWrapper.mm */; };
65D7FDFD19AD0CDF0038F82F /* TXSViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 65D7FDF919AD0CDF0038F82F /* TXSViewController.m */; };
B003051919B70561008E1F67 /* libdjinni_objc.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B003051819B70561008E1F67 /* libdjinni_objc.a */; };
B05863941A7980CD00C2CFF5 /* DJIDate.mm in Sources */ = {isa = PBXBuildFile; fileRef = B05863931A7980CD00C2CFF5 /* DJIDate.mm */; };
B097B6BC19B1C07E0047653A /* libtextsort_objc.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B097B6BB19B1C07E0047653A /* libtextsort_objc.a */; };
CF8788ED1A24D32D0058F854 /* TXSSortItems.mm in Sources */ = {isa = PBXBuildFile; fileRef = CF8788EB1A24D32D0058F854 /* TXSSortItems.mm */; };
/* End PBXBuildFile section */
/* Begin PBXFileReference section */
......@@ -35,37 +31,15 @@
65834DEE19AC599E0061AD3F /* TextSort-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "TextSort-Prefix.pch"; sourceTree = "<group>"; };
65834DF319AC599E0061AD3F /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main_iPhone.storyboard; sourceTree = "<group>"; };
65834DFB19AC599E0061AD3F /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = "<group>"; };
65834E1D19AC5C9B0061AD3F /* TXSItemList+Private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "TXSItemList+Private.h"; sourceTree = "<group>"; };
65834E1E19AC5C9B0061AD3F /* TXSItemList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TXSItemList.h; sourceTree = "<group>"; };
65834E1F19AC5C9B0061AD3F /* TXSItemList.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = TXSItemList.mm; sourceTree = "<group>"; };
65834E2019AC5C9B0061AD3F /* TXSSortItems.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TXSSortItems.h; sourceTree = "<group>"; };
65834E2419AC5C9B0061AD3F /* TXSTextboxListener.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TXSTextboxListener.h; sourceTree = "<group>"; };
65834E2519AC5C9B0061AD3F /* TXSTextboxListenerObjcProxy+Private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "TXSTextboxListenerObjcProxy+Private.h"; sourceTree = "<group>"; };
65834E2619AC5C9B0061AD3F /* TXSTextboxListenerObjcProxy.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = TXSTextboxListenerObjcProxy.mm; sourceTree = "<group>"; };
65834E2E19AC5CB90061AD3F /* item_list.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = item_list.hpp; sourceTree = "<group>"; };
65834E2F19AC5CB90061AD3F /* sort_items.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = sort_items.hpp; sourceTree = "<group>"; };
65834E3019AC5CB90061AD3F /* textbox_listener.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = textbox_listener.hpp; sourceTree = "<group>"; };
65834E3A19AC5D9F0061AD3F /* sort_items_impl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = sort_items_impl.cpp; sourceTree = "<group>"; };
65834E3B19AC5D9F0061AD3F /* sort_items_impl.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = sort_items_impl.hpp; sourceTree = "<group>"; };
65D7FDF319AD0CDF0038F82F /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
65D7FDF319AD0CDF0038F82F /* main.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = main.mm; sourceTree = "<group>"; };
65D7FDF419AD0CDF0038F82F /* TXSAppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TXSAppDelegate.h; sourceTree = "<group>"; };
65D7FDF519AD0CDF0038F82F /* TXSAppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TXSAppDelegate.m; sourceTree = "<group>"; };
65D7FDF619AD0CDF0038F82F /* TXSTextboxListenerImpl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TXSTextboxListenerImpl.h; sourceTree = "<group>"; };
65D7FDF719AD0CDF0038F82F /* TXSTextboxListenerImpl.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TXSTextboxListenerImpl.m; sourceTree = "<group>"; };
65D7FDF819AD0CDF0038F82F /* TXSViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TXSViewController.h; sourceTree = "<group>"; };
65D7FDF919AD0CDF0038F82F /* TXSViewController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = TXSViewController.mm; sourceTree = "<group>"; };
A29DB12A19BCB94300BFC38D /* DJICppWrapperCache+Private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "DJICppWrapperCache+Private.h"; sourceTree = "<group>"; };
A29DB12B19BCB94300BFC38D /* DJIError.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DJIError.h; sourceTree = "<group>"; };
A29DB12C19BCB94300BFC38D /* DJIError.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = DJIError.mm; sourceTree = "<group>"; };
A29DB12D19BCB94300BFC38D /* DJIObjcWrapperCache+Private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "DJIObjcWrapperCache+Private.h"; sourceTree = "<group>"; };
A29DB12E19BCB94300BFC38D /* DJIWeakPtrWrapper.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = DJIWeakPtrWrapper.mm; sourceTree = "<group>"; };
A29DB12F19BCB94300BFC38D /* DJIWeakPtrWrapper+Private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "DJIWeakPtrWrapper+Private.h"; sourceTree = "<group>"; };
65D7FDF919AD0CDF0038F82F /* TXSViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TXSViewController.m; sourceTree = "<group>"; };
B003051819B70561008E1F67 /* libdjinni_objc.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libdjinni_objc.a; path = "../../support-lib/build/Debug-iphoneos/libdjinni_objc.a"; sourceTree = "<group>"; };
B05863921A7980CD00C2CFF5 /* DJIDate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DJIDate.h; sourceTree = "<group>"; };
B05863931A7980CD00C2CFF5 /* DJIDate.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = DJIDate.mm; sourceTree = "<group>"; };
B097B6BB19B1C07E0047653A /* libtextsort_objc.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libtextsort_objc.a; path = "../../build/Debug-iphoneos/libtextsort_objc.a"; sourceTree = "<group>"; };
CF8788EB1A24D32D0058F854 /* TXSSortItems.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = TXSSortItems.mm; sourceTree = "<group>"; };
CF8788EC1A24D32D0058F854 /* TXSSortItems+Private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "TXSSortItems+Private.h"; sourceTree = "<group>"; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
......@@ -88,10 +62,6 @@
isa = PBXGroup;
children = (
65D7FDF219AD0C730038F82F /* handwritten-objc */,
65834E3919AC5D710061AD3F /* handwritten-cpp */,
65834E3219AC5CDA0061AD3F /* objc-support-lib */,
65834E2B19AC5CB90061AD3F /* generated-cpp */,
65834E1919AC5C9B0061AD3F /* generated-objc */,
65834DE619AC599E0061AD3F /* TextSort */,
65834DDF19AC599E0061AD3F /* Frameworks */,
65834DDE19AC599E0061AD3F /* Products */,
......@@ -138,70 +108,16 @@
name = "Supporting Files";
sourceTree = "<group>";
};
65834E1919AC5C9B0061AD3F /* generated-objc */ = {
isa = PBXGroup;
children = (
65834E1E19AC5C9B0061AD3F /* TXSItemList.h */,
65834E1F19AC5C9B0061AD3F /* TXSItemList.mm */,
65834E1D19AC5C9B0061AD3F /* TXSItemList+Private.h */,
65834E2019AC5C9B0061AD3F /* TXSSortItems.h */,
CF8788EB1A24D32D0058F854 /* TXSSortItems.mm */,
CF8788EC1A24D32D0058F854 /* TXSSortItems+Private.h */,
65834E2419AC5C9B0061AD3F /* TXSTextboxListener.h */,
65834E2619AC5C9B0061AD3F /* TXSTextboxListenerObjcProxy.mm */,
65834E2519AC5C9B0061AD3F /* TXSTextboxListenerObjcProxy+Private.h */,
);
name = "generated-objc";
path = "../generated-src/objc";
sourceTree = "<group>";
};
65834E2B19AC5CB90061AD3F /* generated-cpp */ = {
isa = PBXGroup;
children = (
65834E2E19AC5CB90061AD3F /* item_list.hpp */,
65834E2F19AC5CB90061AD3F /* sort_items.hpp */,
65834E3019AC5CB90061AD3F /* textbox_listener.hpp */,
);
name = "generated-cpp";
path = "../generated-src/cpp";
sourceTree = "<group>";
};
65834E3219AC5CDA0061AD3F /* objc-support-lib */ = {
isa = PBXGroup;
children = (
B05863921A7980CD00C2CFF5 /* DJIDate.h */,
B05863931A7980CD00C2CFF5 /* DJIDate.mm */,
A29DB12A19BCB94300BFC38D /* DJICppWrapperCache+Private.h */,
A29DB12B19BCB94300BFC38D /* DJIError.h */,
A29DB12C19BCB94300BFC38D /* DJIError.mm */,
A29DB12D19BCB94300BFC38D /* DJIObjcWrapperCache+Private.h */,
A29DB12E19BCB94300BFC38D /* DJIWeakPtrWrapper.mm */,
A29DB12F19BCB94300BFC38D /* DJIWeakPtrWrapper+Private.h */,
);
name = "objc-support-lib";
path = "../../support-lib/objc";
sourceTree = "<group>";
};
65834E3919AC5D710061AD3F /* handwritten-cpp */ = {
isa = PBXGroup;
children = (
65834E3A19AC5D9F0061AD3F /* sort_items_impl.cpp */,
65834E3B19AC5D9F0061AD3F /* sort_items_impl.hpp */,
);
name = "handwritten-cpp";
path = "../handwritten-src/cpp";
sourceTree = "<group>";
};
65D7FDF219AD0C730038F82F /* handwritten-objc */ = {
isa = PBXGroup;
children = (
65D7FDF319AD0CDF0038F82F /* main.m */,
65D7FDF319AD0CDF0038F82F /* main.mm */,
65D7FDF419AD0CDF0038F82F /* TXSAppDelegate.h */,
65D7FDF519AD0CDF0038F82F /* TXSAppDelegate.m */,
65D7FDF619AD0CDF0038F82F /* TXSTextboxListenerImpl.h */,
65D7FDF719AD0CDF0038F82F /* TXSTextboxListenerImpl.m */,
65D7FDF819AD0CDF0038F82F /* TXSViewController.h */,
65D7FDF919AD0CDF0038F82F /* TXSViewController.mm */,
65D7FDF919AD0CDF0038F82F /* TXSViewController.m */,
);
name = "handwritten-objc";
path = "../handwritten-src/objc";
......@@ -274,13 +190,9 @@
buildActionMask = 2147483647;
files = (
65D7FDFC19AD0CDF0038F82F /* TXSTextboxListenerImpl.m in Sources */,
A29DB13019BCB94300BFC38D /* DJIError.mm in Sources */,
B05863941A7980CD00C2CFF5 /* DJIDate.mm in Sources */,
65D7FDFB19AD0CDF0038F82F /* TXSAppDelegate.m in Sources */,
65D7FDFD19AD0CDF0038F82F /* TXSViewController.mm in Sources */,
A29DB13119BCB94300BFC38D /* DJIWeakPtrWrapper.mm in Sources */,
65D7FDFA19AD0CDF0038F82F /* main.m in Sources */,
CF8788ED1A24D32D0058F854 /* TXSSortItems.mm in Sources */,
65D7FDFD19AD0CDF0038F82F /* TXSViewController.m in Sources */,
65D7FDFA19AD0CDF0038F82F /* main.mm in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
......@@ -342,6 +254,7 @@
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
TARGETED_DEVICE_FAMILY = "1,2";
USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/../../support-lib/objc $(SRCROOT)/../generated-src/objc";
};
name = Debug;
};
......@@ -374,6 +287,7 @@
IPHONEOS_DEPLOYMENT_TARGET = 7.1;
SDKROOT = iphoneos;
TARGETED_DEVICE_FAMILY = "1,2";
USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/../../support-lib/objc $(SRCROOT)/../generated-src/objc";
VALIDATE_PRODUCT = YES;
};
name = Release;
......
......@@ -7,4 +7,7 @@
<FileRef
location = "group:../../build_ios/example/libtextsort.xcodeproj">
</FileRef>
<FileRef
location = "group:../../build_ios/support-lib/support_lib.xcodeproj">
</FileRef>
</Workspace>
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment