diff --git a/xcode/partners_api/partners_api.xcodeproj/project.pbxproj b/xcode/partners_api/partners_api.xcodeproj/project.pbxproj index db43d9a290..85aee912de 100644 --- a/xcode/partners_api/partners_api.xcodeproj/project.pbxproj +++ b/xcode/partners_api/partners_api.xcodeproj/project.pbxproj @@ -32,6 +32,8 @@ /* End PBXBuildFile section */ /* Begin PBXFileReference section */ + 3475E0E11DBF581B004C7E69 /* common-debug.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = "common-debug.xcconfig"; path = "../common-debug.xcconfig"; sourceTree = ""; }; + 3475E0E21DBF581B004C7E69 /* common-release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = "common-release.xcconfig"; path = "../common-release.xcconfig"; sourceTree = ""; }; F67E75231DB8F06F00D6741F /* opentable_api.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = opentable_api.cpp; sourceTree = ""; }; F67E75241DB8F06F00D6741F /* opentable_api.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = opentable_api.hpp; sourceTree = ""; }; F6B536341DA5209F0067EEA5 /* libpartners_api.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libpartners_api.a; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -41,8 +43,7 @@ F6B5363F1DA520E40067EEA5 /* uber_api.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = uber_api.hpp; sourceTree = ""; }; F6B536451DA5213D0067EEA5 /* booking_tests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = booking_tests.cpp; sourceTree = ""; }; F6B536461DA5213D0067EEA5 /* uber_tests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = uber_tests.cpp; sourceTree = ""; }; - F6B536491DA521530067EEA5 /* defaults.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = defaults.xcconfig; path = ../defaults.xcconfig; sourceTree = ""; }; - F6B536501DA522BB0067EEA5 /* partnes_api_test.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = partnes_api_test.app; sourceTree = BUILT_PRODUCTS_DIR; }; + F6B536501DA522BB0067EEA5 /* partners_api_test.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = partners_api_test.app; sourceTree = BUILT_PRODUCTS_DIR; }; F6B536691DA523060067EEA5 /* testingmain.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = testingmain.cpp; path = ../../testing/testingmain.cpp; sourceTree = ""; }; F6B5366D1DA523A70067EEA5 /* MAPSME.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = MAPSME.plist; path = ../../iphone/Maps/MAPSME.plist; sourceTree = ""; }; F6B536711DA523D60067EEA5 /* libbase.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libbase.a; path = "../../../omim-xcode-build/Debug/libbase.a"; sourceTree = ""; }; @@ -85,7 +86,8 @@ F6B5362B1DA5209F0067EEA5 = { isa = PBXGroup; children = ( - F6B536491DA521530067EEA5 /* defaults.xcconfig */, + 3475E0E11DBF581B004C7E69 /* common-debug.xcconfig */, + 3475E0E21DBF581B004C7E69 /* common-release.xcconfig */, F6B536441DA521060067EEA5 /* partners_api_tests */, F6B5363B1DA520B20067EEA5 /* partners_api */, F6B536351DA5209F0067EEA5 /* Products */, @@ -98,7 +100,7 @@ isa = PBXGroup; children = ( F6B536341DA5209F0067EEA5 /* libpartners_api.a */, - F6B536501DA522BB0067EEA5 /* partnes_api_test.app */, + F6B536501DA522BB0067EEA5 /* partners_api_test.app */, ); name = Products; sourceTree = ""; @@ -185,9 +187,9 @@ productReference = F6B536341DA5209F0067EEA5 /* libpartners_api.a */; productType = "com.apple.product-type.library.static"; }; - F6B5364F1DA522BB0067EEA5 /* partnes_api_test */ = { + F6B5364F1DA522BB0067EEA5 /* partners_api_test */ = { isa = PBXNativeTarget; - buildConfigurationList = F6B536641DA522BB0067EEA5 /* Build configuration list for PBXNativeTarget "partnes_api_test" */; + buildConfigurationList = F6B536641DA522BB0067EEA5 /* Build configuration list for PBXNativeTarget "partners_api_test" */; buildPhases = ( F6B5364C1DA522BB0067EEA5 /* Sources */, F6B5364D1DA522BB0067EEA5 /* Frameworks */, @@ -197,9 +199,9 @@ ); dependencies = ( ); - name = partnes_api_test; + name = partners_api_test; productName = partnes_api_test; - productReference = F6B536501DA522BB0067EEA5 /* partnes_api_test.app */; + productReference = F6B536501DA522BB0067EEA5 /* partners_api_test.app */; productType = "com.apple.product-type.application"; }; /* End PBXNativeTarget section */ @@ -235,7 +237,7 @@ projectRoot = ""; targets = ( F6B536331DA5209F0067EEA5 /* partners_api */, - F6B5364F1DA522BB0067EEA5 /* partnes_api_test */, + F6B5364F1DA522BB0067EEA5 /* partners_api_test */, ); }; /* End PBXProject section */ @@ -280,99 +282,23 @@ /* Begin XCBuildConfiguration section */ F6B536361DA5209F0067EEA5 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = F6B536491DA521530067EEA5 /* defaults.xcconfig */; + baseConfigurationReference = 3475E0E11DBF581B004C7E69 /* common-debug.xcconfig */; buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_ANALYZER_NONNULL = YES; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_DOCUMENTATION_COMMENTS = YES; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INFINITE_RECURSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_SUSPICIOUS_MOVES = YES; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - CODE_SIGN_IDENTITY = "-"; - COPY_PHASE_STRIP = NO; - DEBUG_INFORMATION_FORMAT = dwarf; - ENABLE_STRICT_OBJC_MSGSEND = YES; - ENABLE_TESTABILITY = YES; - GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_DYNAMIC_NO_PIC = NO; - GCC_NO_COMMON_BLOCKS = YES; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PREPROCESSOR_DEFINITIONS = "DEBUG=1"; - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GCC_WARN_UNUSED_FUNCTION = YES; - GCC_WARN_UNUSED_VARIABLE = YES; HEADER_SEARCH_PATHS = ( - "$(OMIM_ROOT)", - "$(BOOST_ROOT)", + "$(inherited)", "$(OMIM_ROOT)/3party/jansson/src", ); - MACOSX_DEPLOYMENT_TARGET = 10.11; - MTL_ENABLE_DEBUG_INFO = YES; - ONLY_ACTIVE_ARCH = YES; - SDKROOT = macosx; - SUPPORTED_PLATFORMS = "iphonesimulator iphoneos macosx"; }; name = Debug; }; F6B536371DA5209F0067EEA5 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = F6B536491DA521530067EEA5 /* defaults.xcconfig */; + baseConfigurationReference = 3475E0E21DBF581B004C7E69 /* common-release.xcconfig */; buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_ANALYZER_NONNULL = YES; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_DOCUMENTATION_COMMENTS = YES; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INFINITE_RECURSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_SUSPICIOUS_MOVES = YES; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - CODE_SIGN_IDENTITY = "-"; - COPY_PHASE_STRIP = NO; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - ENABLE_NS_ASSERTIONS = NO; - ENABLE_STRICT_OBJC_MSGSEND = YES; - GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_NO_COMMON_BLOCKS = YES; - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GCC_WARN_UNUSED_FUNCTION = YES; - GCC_WARN_UNUSED_VARIABLE = YES; HEADER_SEARCH_PATHS = ( - "$(OMIM_ROOT)", - "$(BOOST_ROOT)", + "$(inherited)", "$(OMIM_ROOT)/3party/jansson/src", ); - MACOSX_DEPLOYMENT_TARGET = 10.11; - MTL_ENABLE_DEBUG_INFO = NO; - SDKROOT = macosx; - SUPPORTED_PLATFORMS = "iphonesimulator iphoneos macosx"; }; name = Release; }; @@ -396,18 +322,13 @@ isa = XCBuildConfiguration; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; GCC_PREPROCESSOR_DEFINITIONS = ( - "DEBUG=1", + "$(inherited)", "OMIM_UNIT_TEST_WITH_QT_EVENT_LOOP=1", ); INFOPLIST_FILE = "$(SRCROOT)/../../iphone/Maps/MAPSME.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = "V.partnes-api-test"; + PRODUCT_BUNDLE_IDENTIFIER = partners_api_test; PRODUCT_NAME = "$(TARGET_NAME)"; - SDKROOT = iphoneos; - TARGETED_DEVICE_FAMILY = "1,2"; }; name = Debug; }; @@ -415,16 +336,13 @@ isa = XCBuildConfiguration; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - GCC_PREPROCESSOR_DEFINITIONS = "OMIM_UNIT_TEST_WITH_QT_EVENT_LOOP=1"; + GCC_PREPROCESSOR_DEFINITIONS = ( + "$(inherited)", + "OMIM_UNIT_TEST_WITH_QT_EVENT_LOOP=1", + ); INFOPLIST_FILE = "$(SRCROOT)/../../iphone/Maps/MAPSME.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = "V.partnes-api-test"; + PRODUCT_BUNDLE_IDENTIFIER = partners_api_test; PRODUCT_NAME = "$(TARGET_NAME)"; - SDKROOT = iphoneos; - TARGETED_DEVICE_FAMILY = "1,2"; - VALIDATE_PRODUCT = YES; }; name = Release; }; @@ -449,7 +367,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - F6B536641DA522BB0067EEA5 /* Build configuration list for PBXNativeTarget "partnes_api_test" */ = { + F6B536641DA522BB0067EEA5 /* Build configuration list for PBXNativeTarget "partners_api_test" */ = { isa = XCConfigurationList; buildConfigurations = ( F6B536651DA522BB0067EEA5 /* Debug */,