Browse Source

Adding static lib version, linked test cases against that to allow running coverage tools without installing.

Samuel Jaffe 8 years ago
parent
commit
730ef2f1ae

+ 192 - 4
json.xcodeproj/project.pbxproj

@@ -19,13 +19,29 @@
 		CD3C80DF1D6A728A00ACC795 /* json_direct_map_binder.hpp in Headers */ = {isa = PBXBuildFile; fileRef = CD472C7B1CCC1DA20084C8D6 /* json_direct_map_binder.hpp */; };
 		CD3C80E01D6A728A00ACC795 /* json_direct_scalar_binder.hpp in Headers */ = {isa = PBXBuildFile; fileRef = CD472C7D1CCC1E120084C8D6 /* json_direct_scalar_binder.hpp */; };
 		CD3C80E11D6A728A00ACC795 /* json_direct_vector_binder.hpp in Headers */ = {isa = PBXBuildFile; fileRef = CD472C7C1CCC1DDF0084C8D6 /* json_direct_vector_binder.hpp */; };
-		CD3C80E41D6A731D00ACC795 /* libjson-direct.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = CD3C80CF1D6A711000ACC795 /* libjson-direct.dylib */; };
-		CD3C80E51D6A731D00ACC795 /* libjson.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = CDB2F7331C5D47F70067C2EC /* libjson.dylib */; };
 		CD472C761CCC1ABD0084C8D6 /* json_common.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CD472C751CCC1ABD0084C8D6 /* json_common.cpp */; };
 		CD472C801CCDA4B00084C8D6 /* json_parser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CD472C7F1CCDA4B00084C8D6 /* json_parser.cpp */; };
 		CD679D7A1E6126CA00F9F843 /* json_tc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CD679D781E6126C700F9F843 /* json_tc.cpp */; };
 		CDB2F7431C5D48090067C2EC /* json.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CDB2F7411C5D48090067C2EC /* json.cpp */; };
 		CDB2F7441C5D48090067C2EC /* json.hpp in Headers */ = {isa = PBXBuildFile; fileRef = CDB2F7421C5D48090067C2EC /* json.hpp */; };
+		CDE6CC0E1EF9E977005E745A /* json_binder_discard.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CD17473E1D4C1DFD000C344B /* json_binder_discard.cpp */; };
+		CDE6CC0F1EF9E977005E745A /* json_common.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CD472C751CCC1ABD0084C8D6 /* json_common.cpp */; };
+		CDE6CC121EF9E977005E745A /* json_object_binder.hpp in Headers */ = {isa = PBXBuildFile; fileRef = CD472C7A1CCC1D440084C8D6 /* json_object_binder.hpp */; };
+		CDE6CC131EF9E977005E745A /* json_direct_scalar_binder.hpp in Headers */ = {isa = PBXBuildFile; fileRef = CD472C7D1CCC1E120084C8D6 /* json_direct_scalar_binder.hpp */; };
+		CDE6CC141EF9E977005E745A /* json.hpp in Headers */ = {isa = PBXBuildFile; fileRef = CDB2F7421C5D48090067C2EC /* json.hpp */; };
+		CDE6CC151EF9E977005E745A /* json_direct_binder.hpp in Headers */ = {isa = PBXBuildFile; fileRef = CD472C7E1CCC498C0084C8D6 /* json_direct_binder.hpp */; };
+		CDE6CC161EF9E977005E745A /* json_binder_parser.hpp in Headers */ = {isa = PBXBuildFile; fileRef = CDB2F7451C5E9BEB0067C2EC /* json_binder_parser.hpp */; };
+		CDE6CC171EF9E977005E745A /* json_tuple_binder.hpp in Headers */ = {isa = PBXBuildFile; fileRef = CD472C791CCC1CD80084C8D6 /* json_tuple_binder.hpp */; };
+		CDE6CC181EF9E977005E745A /* json_direct_vector_binder.hpp in Headers */ = {isa = PBXBuildFile; fileRef = CD472C7C1CCC1DDF0084C8D6 /* json_direct_vector_binder.hpp */; };
+		CDE6CC191EF9E977005E745A /* json_direct_map_binder.hpp in Headers */ = {isa = PBXBuildFile; fileRef = CD472C7B1CCC1DA20084C8D6 /* json_direct_map_binder.hpp */; };
+		CDE6CC1A1EF9E977005E745A /* json_binder.hpp in Headers */ = {isa = PBXBuildFile; fileRef = CDB2F7461C5EA2E80067C2EC /* json_binder.hpp */; settings = {ATTRIBUTES = (Public, ); }; };
+		CDE6CC1B1EF9E977005E745A /* json_binder_discard.hpp in Headers */ = {isa = PBXBuildFile; fileRef = CD17473F1D4C1DFD000C344B /* json_binder_discard.hpp */; };
+		CDE6CC221EF9E984005E745A /* json_parser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CD472C7F1CCDA4B00084C8D6 /* json_parser.cpp */; };
+		CDE6CC231EF9E984005E745A /* json.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CDB2F7411C5D48090067C2EC /* json.cpp */; };
+		CDE6CC241EF9E984005E745A /* json_common.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CD472C751CCC1ABD0084C8D6 /* json_common.cpp */; };
+		CDE6CC271EF9E984005E745A /* json.hpp in Headers */ = {isa = PBXBuildFile; fileRef = CDB2F7421C5D48090067C2EC /* json.hpp */; };
+		CDE6CC2C1EF9E994005E745A /* libjson_s.a in Frameworks */ = {isa = PBXBuildFile; fileRef = CDE6CC2B1EF9E984005E745A /* libjson_s.a */; };
+		CDE6CC2D1EF9E994005E745A /* libjson-direct_s.a in Frameworks */ = {isa = PBXBuildFile; fileRef = CDE6CC1F1EF9E977005E745A /* libjson-direct_s.a */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXCopyFilesBuildPhase section */
@@ -67,6 +83,8 @@
 		CDB2F7421C5D48090067C2EC /* json.hpp */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 2; lastKnownFileType = sourcecode.cpp.h; path = json.hpp; sourceTree = "<group>"; tabWidth = 2; };
 		CDB2F7451C5E9BEB0067C2EC /* json_binder_parser.hpp */ = {isa = PBXFileReference; indentWidth = 2; lastKnownFileType = sourcecode.cpp.h; path = json_binder_parser.hpp; sourceTree = "<group>"; tabWidth = 2; };
 		CDB2F7461C5EA2E80067C2EC /* json_binder.hpp */ = {isa = PBXFileReference; indentWidth = 2; lastKnownFileType = sourcecode.cpp.h; path = json_binder.hpp; sourceTree = SOURCE_ROOT; tabWidth = 2; };
+		CDE6CC1F1EF9E977005E745A /* libjson-direct_s.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libjson-direct_s.a"; sourceTree = BUILT_PRODUCTS_DIR; };
+		CDE6CC2B1EF9E984005E745A /* libjson_s.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libjson_s.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		CDECC7D41E64E6A900BEE842 /* json_binder_collection.t.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = json_binder_collection.t.h; sourceTree = "<group>"; };
 		CDECC7D51E6504C800BEE842 /* json_binder_test_bool.t.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = json_binder_test_bool.t.h; sourceTree = "<group>"; };
 		CDECC7D61E65073E00BEE842 /* json_binder_object.t.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = json_binder_object.t.h; sourceTree = "<group>"; };
@@ -88,12 +106,26 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
+		CDE6CC101EF9E977005E745A /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		CDE6CC251EF9E984005E745A /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 		CDF6432F1C6E9A8B0016A475 /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				CD3C80E41D6A731D00ACC795 /* libjson-direct.dylib in Frameworks */,
-				CD3C80E51D6A731D00ACC795 /* libjson.dylib in Frameworks */,
+				CDE6CC2C1EF9E994005E745A /* libjson_s.a in Frameworks */,
+				CDE6CC2D1EF9E994005E745A /* libjson-direct_s.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -181,6 +213,8 @@
 				CDB2F7331C5D47F70067C2EC /* libjson.dylib */,
 				CDF643321C6E9A8B0016A475 /* json_tc */,
 				CD3C80CF1D6A711000ACC795 /* libjson-direct.dylib */,
+				CDE6CC1F1EF9E977005E745A /* libjson-direct_s.a */,
+				CDE6CC2B1EF9E984005E745A /* libjson_s.a */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -213,6 +247,31 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
+		CDE6CC111EF9E977005E745A /* Headers */ = {
+			isa = PBXHeadersBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				CDE6CC121EF9E977005E745A /* json_object_binder.hpp in Headers */,
+				CDE6CC131EF9E977005E745A /* json_direct_scalar_binder.hpp in Headers */,
+				CDE6CC141EF9E977005E745A /* json.hpp in Headers */,
+				CDE6CC151EF9E977005E745A /* json_direct_binder.hpp in Headers */,
+				CDE6CC161EF9E977005E745A /* json_binder_parser.hpp in Headers */,
+				CDE6CC171EF9E977005E745A /* json_tuple_binder.hpp in Headers */,
+				CDE6CC181EF9E977005E745A /* json_direct_vector_binder.hpp in Headers */,
+				CDE6CC191EF9E977005E745A /* json_direct_map_binder.hpp in Headers */,
+				CDE6CC1A1EF9E977005E745A /* json_binder.hpp in Headers */,
+				CDE6CC1B1EF9E977005E745A /* json_binder_discard.hpp in Headers */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		CDE6CC261EF9E984005E745A /* Headers */ = {
+			isa = PBXHeadersBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				CDE6CC271EF9E984005E745A /* json.hpp in Headers */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 /* End PBXHeadersBuildPhase section */
 
 /* Begin PBXNativeTarget section */
@@ -250,6 +309,40 @@
 			productReference = CDB2F7331C5D47F70067C2EC /* libjson.dylib */;
 			productType = "com.apple.product-type.library.dynamic";
 		};
+		CDE6CC0C1EF9E977005E745A /* json-direct_s */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = CDE6CC1C1EF9E977005E745A /* Build configuration list for PBXNativeTarget "json-direct_s" */;
+			buildPhases = (
+				CDE6CC0D1EF9E977005E745A /* Sources */,
+				CDE6CC101EF9E977005E745A /* Frameworks */,
+				CDE6CC111EF9E977005E745A /* Headers */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = "json-direct_s";
+			productName = json;
+			productReference = CDE6CC1F1EF9E977005E745A /* libjson-direct_s.a */;
+			productType = "com.apple.product-type.library.static";
+		};
+		CDE6CC201EF9E984005E745A /* json_s */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = CDE6CC281EF9E984005E745A /* Build configuration list for PBXNativeTarget "json_s" */;
+			buildPhases = (
+				CDE6CC211EF9E984005E745A /* Sources */,
+				CDE6CC251EF9E984005E745A /* Frameworks */,
+				CDE6CC261EF9E984005E745A /* Headers */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = json_s;
+			productName = json;
+			productReference = CDE6CC2B1EF9E984005E745A /* libjson_s.a */;
+			productType = "com.apple.product-type.library.static";
+		};
 		CDF643311C6E9A8B0016A475 /* json_tc */ = {
 			isa = PBXNativeTarget;
 			buildConfigurationList = CDF643381C6E9A8B0016A475 /* Build configuration list for PBXNativeTarget "json_tc" */;
@@ -300,6 +393,8 @@
 				CDB2F7321C5D47F70067C2EC /* json */,
 				CD3C80C21D6A711000ACC795 /* json-direct */,
 				CDF643311C6E9A8B0016A475 /* json_tc */,
+				CDE6CC0C1EF9E977005E745A /* json-direct_s */,
+				CDE6CC201EF9E984005E745A /* json_s */,
 			);
 		};
 /* End PBXProject section */
@@ -349,6 +444,25 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
+		CDE6CC0D1EF9E977005E745A /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				CDE6CC0E1EF9E977005E745A /* json_binder_discard.cpp in Sources */,
+				CDE6CC0F1EF9E977005E745A /* json_common.cpp in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		CDE6CC211EF9E984005E745A /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				CDE6CC221EF9E984005E745A /* json_parser.cpp in Sources */,
+				CDE6CC231EF9E984005E745A /* json.cpp in Sources */,
+				CDE6CC241EF9E984005E745A /* json_common.cpp in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 		CDF6432E1C6E9A8B0016A475 /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
@@ -495,6 +609,62 @@
 			};
 			name = Release;
 		};
+		CDE6CC1D1EF9E977005E745A /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				DYLIB_COMPATIBILITY_VERSION = 1;
+				DYLIB_CURRENT_VERSION = 1;
+				EXECUTABLE_PREFIX = lib;
+				GCC_ENABLE_CPP_EXCEPTIONS = YES;
+				GCC_ENABLE_CPP_RTTI = YES;
+				GCC_SYMBOLS_PRIVATE_EXTERN = YES;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				USER_HEADER_SEARCH_PATHS = "../**";
+			};
+			name = Debug;
+		};
+		CDE6CC1E1EF9E977005E745A /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				DYLIB_COMPATIBILITY_VERSION = 1;
+				DYLIB_CURRENT_VERSION = 1;
+				EXECUTABLE_PREFIX = lib;
+				GCC_ENABLE_CPP_EXCEPTIONS = YES;
+				GCC_ENABLE_CPP_RTTI = YES;
+				GCC_SYMBOLS_PRIVATE_EXTERN = YES;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				USER_HEADER_SEARCH_PATHS = "../**";
+			};
+			name = Release;
+		};
+		CDE6CC291EF9E984005E745A /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				DYLIB_COMPATIBILITY_VERSION = 1;
+				DYLIB_CURRENT_VERSION = 1;
+				EXECUTABLE_PREFIX = lib;
+				GCC_ENABLE_CPP_EXCEPTIONS = YES;
+				GCC_ENABLE_CPP_RTTI = YES;
+				GCC_SYMBOLS_PRIVATE_EXTERN = YES;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				USER_HEADER_SEARCH_PATHS = "../**";
+			};
+			name = Debug;
+		};
+		CDE6CC2A1EF9E984005E745A /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				DYLIB_COMPATIBILITY_VERSION = 1;
+				DYLIB_CURRENT_VERSION = 1;
+				EXECUTABLE_PREFIX = lib;
+				GCC_ENABLE_CPP_EXCEPTIONS = YES;
+				GCC_ENABLE_CPP_RTTI = YES;
+				GCC_SYMBOLS_PRIVATE_EXTERN = YES;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				USER_HEADER_SEARCH_PATHS = "../**";
+			};
+			name = Release;
+		};
 		CDF643361C6E9A8B0016A475 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
@@ -547,6 +717,24 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
+		CDE6CC1C1EF9E977005E745A /* Build configuration list for PBXNativeTarget "json-direct_s" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				CDE6CC1D1EF9E977005E745A /* Debug */,
+				CDE6CC1E1EF9E977005E745A /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		CDE6CC281EF9E984005E745A /* Build configuration list for PBXNativeTarget "json_s" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				CDE6CC291EF9E984005E745A /* Debug */,
+				CDE6CC2A1EF9E984005E745A /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
 		CDF643381C6E9A8B0016A475 /* Build configuration list for PBXNativeTarget "json_tc" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (

+ 28 - 0
json.xcodeproj/xcuserdata/samjaffe.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -6,14 +6,32 @@
 	<dict>
 		<key>json-direct.xcscheme</key>
 		<dict>
+			<key>isShown</key>
+			<false/>
 			<key>orderHint</key>
 			<integer>7</integer>
 		</dict>
+		<key>json-direct_s.xcscheme</key>
+		<dict>
+			<key>isShown</key>
+			<false/>
+			<key>orderHint</key>
+			<integer>31</integer>
+		</dict>
 		<key>json.xcscheme</key>
 		<dict>
+			<key>isShown</key>
+			<false/>
 			<key>orderHint</key>
 			<integer>3</integer>
 		</dict>
+		<key>json_s.xcscheme</key>
+		<dict>
+			<key>isShown</key>
+			<false/>
+			<key>orderHint</key>
+			<integer>32</integer>
+		</dict>
 		<key>json_tc.xcscheme</key>
 		<dict>
 			<key>orderHint</key>
@@ -32,6 +50,16 @@
 			<key>primary</key>
 			<true/>
 		</dict>
+		<key>CDE6CC0C1EF9E977005E745A</key>
+		<dict>
+			<key>primary</key>
+			<true/>
+		</dict>
+		<key>CDE6CC201EF9E984005E745A</key>
+		<dict>
+			<key>primary</key>
+			<true/>
+		</dict>
 		<key>CDF643311C6E9A8B0016A475</key>
 		<dict>
 			<key>primary</key>