Fix xcode projects

2 files changed, 120 insertions, 0 deletions

diff --git a/xcode/generator/generator.xcodeproj/project.pbxproj b/xcode/generator/generator.xcodeproj/project.pbxproj
index 73a6567f2e..f2959cb590 100644
--- a/xcode/generator/generator.xcodeproj/project.pbxproj
+++ b/xcode/generator/generator.xcodeproj/project.pbxproj
@@ -59,6 +59,10 @@
 		677E2A181CAACC5F001DC42A /* towns_dumper.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 677E2A131CAACC5F001DC42A /* towns_dumper.hpp */; };
 		67A0FEBE1CEB467F008F2A61 /* booking_dataset.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 67A0FEBC1CEB467F008F2A61 /* booking_dataset.cpp */; };
 		67A0FEBF1CEB467F008F2A61 /* booking_dataset.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 67A0FEBD1CEB467F008F2A61 /* booking_dataset.hpp */; };
+		67BC92E21D1A9ED800A4A378 /* test_feature.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 67BC92D81D1A9E9800A4A378 /* test_feature.cpp */; };
+		67BC92E31D1A9ED800A4A378 /* test_feature.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 67BC92D91D1A9E9800A4A378 /* test_feature.hpp */; };
+		67BC92E41D1A9ED800A4A378 /* test_mwm_builder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 67BC92DA1D1A9E9800A4A378 /* test_mwm_builder.cpp */; };
+		67BC92E51D1A9ED800A4A378 /* test_mwm_builder.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 67BC92DB1D1A9E9800A4A378 /* test_mwm_builder.hpp */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
@@ -117,6 +121,11 @@
 		677E2A131CAACC5F001DC42A /* towns_dumper.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = towns_dumper.hpp; sourceTree = "<group>"; };
 		67A0FEBC1CEB467F008F2A61 /* booking_dataset.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = booking_dataset.cpp; sourceTree = "<group>"; };
 		67A0FEBD1CEB467F008F2A61 /* booking_dataset.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = booking_dataset.hpp; sourceTree = "<group>"; };
+		67BC92CC1D1A9E5F00A4A378 /* libgenerator_tests_support.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libgenerator_tests_support.a; sourceTree = BUILT_PRODUCTS_DIR; };
+		67BC92D81D1A9E9800A4A378 /* test_feature.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = test_feature.cpp; sourceTree = "<group>"; };
+		67BC92D91D1A9E9800A4A378 /* test_feature.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = test_feature.hpp; sourceTree = "<group>"; };
+		67BC92DA1D1A9E9800A4A378 /* test_mwm_builder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = test_mwm_builder.cpp; sourceTree = "<group>"; };
+		67BC92DB1D1A9E9800A4A378 /* test_mwm_builder.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = test_mwm_builder.hpp; sourceTree = "<group>"; };
 		67F0F6761B8C9DCE003F52FF /* osm_xml_source.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = osm_xml_source.hpp; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
@@ -128,6 +137,13 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
+		67BC92C91D1A9E5F00A4A378 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
@@ -136,6 +152,7 @@
 			children = (
 				670D05AC1B0E07C30013A7AC /* defaults.xcconfig */,
 				6753401D1A3F2A1B00A0A8C3 /* generator */,
+				67BC92D71D1A9E6A00A4A378 /* generator_tests_support */,
 				6753401C1A3F2A1B00A0A8C3 /* Products */,
 			);
 			sourceTree = "<group>";
@@ -144,6 +161,7 @@
 			isa = PBXGroup;
 			children = (
 				6753401B1A3F2A1B00A0A8C3 /* libgenerator.a */,
+				67BC92CC1D1A9E5F00A4A378 /* libgenerator_tests_support.a */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -210,6 +228,18 @@
 			path = ../../generator;
 			sourceTree = SOURCE_ROOT;
 		};
+		67BC92D71D1A9E6A00A4A378 /* generator_tests_support */ = {
+			isa = PBXGroup;
+			children = (
+				67BC92D81D1A9E9800A4A378 /* test_feature.cpp */,
+				67BC92D91D1A9E9800A4A378 /* test_feature.hpp */,
+				67BC92DA1D1A9E9800A4A378 /* test_mwm_builder.cpp */,
+				67BC92DB1D1A9E9800A4A378 /* test_mwm_builder.hpp */,
+			);
+			name = generator_tests_support;
+			path = ../../generator/generator_tests_support;
+			sourceTree = "<group>";
+		};
 /* End PBXGroup section */
 
 /* Begin PBXHeadersBuildPhase section */
@@ -251,6 +281,15 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
+		67BC92CA1D1A9E5F00A4A378 /* Headers */ = {
+			isa = PBXHeadersBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				67BC92E51D1A9ED800A4A378 /* test_mwm_builder.hpp in Headers */,
+				67BC92E31D1A9ED800A4A378 /* test_feature.hpp in Headers */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 /* End PBXHeadersBuildPhase section */
 
 /* Begin PBXNativeTarget section */
@@ -271,6 +310,23 @@
 			productReference = 6753401B1A3F2A1B00A0A8C3 /* libgenerator.a */;
 			productType = "com.apple.product-type.library.static";
 		};
+		67BC92CB1D1A9E5F00A4A378 /* generator_tests_support */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 67BC92D61D1A9E5F00A4A378 /* Build configuration list for PBXNativeTarget "generator_tests_support" */;
+			buildPhases = (
+				67BC92C81D1A9E5F00A4A378 /* Sources */,
+				67BC92C91D1A9E5F00A4A378 /* Frameworks */,
+				67BC92CA1D1A9E5F00A4A378 /* Headers */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = generator_tests_support;
+			productName = generator_tests_support;
+			productReference = 67BC92CC1D1A9E5F00A4A378 /* libgenerator_tests_support.a */;
+			productType = "com.apple.product-type.library.static";
+		};
 /* End PBXNativeTarget section */
 
 /* Begin PBXProject section */
@@ -283,6 +339,9 @@
 					6753401A1A3F2A1B00A0A8C3 = {
 						CreatedOnToolsVersion = 6.1;
 					};
+					67BC92CB1D1A9E5F00A4A378 = {
+						CreatedOnToolsVersion = 7.3.1;
+					};
 				};
 			};
 			buildConfigurationList = 675340161A3F2A1B00A0A8C3 /* Build configuration list for PBXProject "generator" */;
@@ -298,6 +357,7 @@
 			projectRoot = "";
 			targets = (
 				6753401A1A3F2A1B00A0A8C3 /* generator */,
+				67BC92CB1D1A9E5F00A4A378 /* generator_tests_support */,
 			);
 		};
 /* End PBXProject section */
@@ -331,6 +391,15 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
+		67BC92C81D1A9E5F00A4A378 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				67BC92E21D1A9ED800A4A378 /* test_feature.cpp in Sources */,
+				67BC92E41D1A9ED800A4A378 /* test_mwm_builder.cpp in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 /* End PBXSourcesBuildPhase section */
 
 /* Begin XCBuildConfiguration section */
@@ -451,6 +520,37 @@
 			};
 			name = Release;
 		};
+		67BC92D41D1A9E5F00A4A378 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				CLANG_ANALYZER_NONNULL = YES;
+				CODE_SIGN_IDENTITY = "-";
+				DEBUG_INFORMATION_FORMAT = dwarf;
+				ENABLE_TESTABILITY = YES;
+				EXECUTABLE_PREFIX = lib;
+				GCC_ENABLE_CPP_EXCEPTIONS = YES;
+				GCC_ENABLE_CPP_RTTI = YES;
+				GCC_NO_COMMON_BLOCKS = YES;
+				MACOSX_DEPLOYMENT_TARGET = 10.11;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+			};
+			name = Debug;
+		};
+		67BC92D51D1A9E5F00A4A378 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				CLANG_ANALYZER_NONNULL = YES;
+				CODE_SIGN_IDENTITY = "-";
+				COPY_PHASE_STRIP = NO;
+				EXECUTABLE_PREFIX = lib;
+				GCC_ENABLE_CPP_EXCEPTIONS = YES;
+				GCC_ENABLE_CPP_RTTI = YES;
+				GCC_NO_COMMON_BLOCKS = YES;
+				MACOSX_DEPLOYMENT_TARGET = 10.11;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+			};
+			name = Release;
+		};
 /* End XCBuildConfiguration section */
 
 /* Begin XCConfigurationList section */
@@ -472,6 +572,14 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
+		67BC92D61D1A9E5F00A4A378 /* Build configuration list for PBXNativeTarget "generator_tests_support" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				67BC92D41D1A9E5F00A4A378 /* Debug */,
+				67BC92D51D1A9E5F00A4A378 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+		};
 /* End XCConfigurationList section */
 	};
 	rootObject = 675340131A3F2A1B00A0A8C3 /* Project object */;
diff --git a/xcode/storage/storage.xcodeproj/project.pbxproj b/xcode/storage/storage.xcodeproj/project.pbxproj
index dfe144fae1..ac681ddf94 100644
--- a/xcode/storage/storage.xcodeproj/project.pbxproj
+++ b/xcode/storage/storage.xcodeproj/project.pbxproj
@@ -62,6 +62,9 @@
 		678CB3801CA5884800E9118D /* editor.config in Resources */ = {isa = PBXBuildFile; fileRef = 678CB37F1CA5881B00E9118D /* editor.config */; };
 		67AF4A001BC579DD0048B1ED /* country_info_getter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 67AF49FE1BC579DD0048B1ED /* country_info_getter.cpp */; };
 		67AF4A011BC579DD0048B1ED /* country_info_getter.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 67AF49FF1BC579DD0048B1ED /* country_info_getter.hpp */; };
+		67BC92E11D1A9EB200A4A378 /* libgenerator_tests_support.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 67BC92E01D1A9EB200A4A378 /* libgenerator_tests_support.a */; };
+		67BC92E71D1A9F1300A4A378 /* libgenerator.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 67BC92E61D1A9F1300A4A378 /* libgenerator.a */; };
+		67BC92E91D1AA03900A4A378 /* libtess2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 67BC92E81D1AA03900A4A378 /* libtess2.a */; };
 		67BE1DC51CD2180D00572709 /* downloading_policy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 67BE1DC31CD2180D00572709 /* downloading_policy.cpp */; };
 		67BE1DC61CD2180D00572709 /* downloading_policy.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 67BE1DC41CD2180D00572709 /* downloading_policy.hpp */; };
 		67CCFA911CBD1628007FC750 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 67CCFA901CBD1628007FC750 /* Images.xcassets */; };
@@ -256,6 +259,9 @@
 		678CB37F1CA5881B00E9118D /* editor.config */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = editor.config; sourceTree = "<group>"; };
 		67AF49FE1BC579DD0048B1ED /* country_info_getter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = country_info_getter.cpp; sourceTree = "<group>"; };
 		67AF49FF1BC579DD0048B1ED /* country_info_getter.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = country_info_getter.hpp; sourceTree = "<group>"; };
+		67BC92E01D1A9EB200A4A378 /* libgenerator_tests_support.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libgenerator_tests_support.a; path = "/Users/darkserj/mapsme/omim/xcode/generator/../../../omim-xcode-build/Debug/libgenerator_tests_support.a"; sourceTree = "<absolute>"; };
+		67BC92E61D1A9F1300A4A378 /* libgenerator.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libgenerator.a; path = "../../../omim-xcode-build/Debug/libgenerator.a"; sourceTree = "<group>"; };
+		67BC92E81D1AA03900A4A378 /* libtess2.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libtess2.a; path = "../../../omim-xcode-build/Debug/libtess2.a"; sourceTree = "<group>"; };
 		67BE1DC31CD2180D00572709 /* downloading_policy.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = downloading_policy.cpp; sourceTree = "<group>"; };
 		67BE1DC41CD2180D00572709 /* downloading_policy.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = downloading_policy.hpp; sourceTree = "<group>"; };
 		67CCFA901CBD1628007FC750 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Images.xcassets; path = ../../iphone/Maps/Images.xcassets; sourceTree = SOURCE_ROOT; };
@@ -275,6 +281,9 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				67BC92E91D1AA03900A4A378 /* libtess2.a in Frameworks */,
+				67BC92E71D1A9F1300A4A378 /* libgenerator.a in Frameworks */,
+				67BC92E11D1A9EB200A4A378 /* libgenerator_tests_support.a in Frameworks */,
 				67F90B951C6A28C000CD458E /* libstorage.a in Frameworks */,
 				67F90B961C6A28CA00CD458E /* libz.tbd in Frameworks */,
 				67F90B7B1C6A278800CD458E /* libfribidi.a in Frameworks */,
@@ -378,6 +387,7 @@
 		672480011C60BF2F00EDE56A /* libs */ = {
 			isa = PBXGroup;
 			children = (
+				67BC92E01D1A9EB200A4A378 /* libgenerator_tests_support.a */,
 				674709AF1C6215690093DD1B /* libagg.a */,
 				674709B01C6215690093DD1B /* libapi.a */,
 				674709B11C6215690093DD1B /* libeditor.a */,
@@ -433,6 +443,8 @@
 		675342D71A3F59EF00A0A8C3 = {
 			isa = PBXGroup;
 			children = (
+				67BC92E81D1AA03900A4A378 /* libtess2.a */,
+				67BC92E61D1A9F1300A4A378 /* libgenerator.a */,
 				670D05A81B0E04450013A7AC /* defaults.xcconfig */,
 				672480011C60BF2F00EDE56A /* libs */,
 				675342E21A3F59EF00A0A8C3 /* storage */,