diff --git a/storage/storage_tests/storage_tests.cpp b/storage/storage_tests/storage_tests.cpp index f098b4b7e3..5c99283e74 100644 --- a/storage/storage_tests/storage_tests.cpp +++ b/storage/storage_tests/storage_tests.cpp @@ -49,7 +49,6 @@ #include "std/unique_ptr.hpp" #include "std/vector.hpp" -using namespace generator::tests_support; using namespace platform::tests_support; using namespace platform; @@ -1393,6 +1392,7 @@ UNIT_TEST(StorageTest_GetUpdateInfoSingleMwm) LocalCountryFile country1(kVersion1Dir, CountryFile("OutdatedCountry1"), 1); LocalCountryFile country2(kVersion1Dir, CountryFile("OutdatedCountry2"), 1); + using namespace generator::tests_support; { TestMwmBuilder builder(country1, feature::DataHeader::country); } diff --git a/xcode/storage/storage.xcodeproj/project.pbxproj b/xcode/storage/storage.xcodeproj/project.pbxproj index ac681ddf94..fb32957abc 100644 --- a/xcode/storage/storage.xcodeproj/project.pbxproj +++ b/xcode/storage/storage.xcodeproj/project.pbxproj @@ -7,6 +7,11 @@ objects = { /* Begin PBXBuildFile section */ + 3462FDAF1DC1E62F00906FD7 /* libgenerator_tests_support.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3462FDAE1DC1E62F00906FD7 /* libgenerator_tests_support.a */; }; + 3462FDB11DC1E65B00906FD7 /* libgenerator.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3462FDB01DC1E65B00906FD7 /* libgenerator.a */; }; + 3462FDB31DC1E68C00906FD7 /* libtess2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3462FDB21DC1E68C00906FD7 /* libtess2.a */; }; + 349756231DC1E6DD0058742A /* libpartners_api.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 349756221DC1E6DD0058742A /* libpartners_api.a */; }; + 349756251DC1E6EE0058742A /* libtracking.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 349756241DC1E6EE0058742A /* libtracking.a */; }; 34B093221C61F9BA0066F4C3 /* storage_helpers.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 34B0931D1C61F9BA0066F4C3 /* storage_helpers.cpp */; }; 34B093231C61F9BA0066F4C3 /* storage_helpers.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 34B0931E1C61F9BA0066F4C3 /* storage_helpers.hpp */; }; 34B093261C61F9BA0066F4C3 /* app_store.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 34B093211C61F9BA0066F4C3 /* app_store.hpp */; }; @@ -62,9 +67,6 @@ 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 */; }; @@ -162,14 +164,20 @@ /* End PBXBuildFile section */ /* Begin PBXFileReference section */ + 3462FDAE1DC1E62F00906FD7 /* libgenerator_tests_support.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libgenerator_tests_support.a; path = "../../../omim-build/xcode/Debug/libgenerator_tests_support.a"; sourceTree = ""; }; + 3462FDB01DC1E65B00906FD7 /* libgenerator.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libgenerator.a; path = "../../../omim-build/xcode/Debug/libgenerator.a"; sourceTree = ""; }; + 3462FDB21DC1E68C00906FD7 /* libtess2.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libtess2.a; path = "../../../omim-build/xcode/Debug/libtess2.a"; sourceTree = ""; }; + 349756221DC1E6DD0058742A /* libpartners_api.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libpartners_api.a; path = "../../../omim-build/xcode/Debug/libpartners_api.a"; sourceTree = ""; }; + 349756241DC1E6EE0058742A /* libtracking.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libtracking.a; path = "../../../omim-build/xcode/Debug/libtracking.a"; sourceTree = ""; }; 34B0931D1C61F9BA0066F4C3 /* storage_helpers.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = storage_helpers.cpp; sourceTree = ""; }; 34B0931E1C61F9BA0066F4C3 /* storage_helpers.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = storage_helpers.hpp; sourceTree = ""; }; 34B093211C61F9BA0066F4C3 /* app_store.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = app_store.hpp; sourceTree = ""; }; 34C9BCFA1C6CCF85000DC38D /* country_name_getter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = country_name_getter.cpp; sourceTree = ""; }; 34C9BCFB1C6CCF85000DC38D /* country_name_getter.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = country_name_getter.hpp; sourceTree = ""; }; + 34F5584A1DBF2FC000A4FC11 /* common-debug.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = "common-debug.xcconfig"; path = "../common-debug.xcconfig"; sourceTree = ""; }; + 34F5584B1DBF2FC000A4FC11 /* common-release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = "common-release.xcconfig"; path = "../common-release.xcconfig"; sourceTree = ""; }; 56D8CB971CAC17A80003F420 /* test_defines.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = test_defines.cpp; sourceTree = ""; }; 56D8CB981CAC17A80003F420 /* test_defines.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = test_defines.hpp; sourceTree = ""; }; - 670D05A81B0E04450013A7AC /* defaults.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = defaults.xcconfig; path = ../defaults.xcconfig; sourceTree = ""; }; 671182CC1C7E069C00CB8177 /* storage_3levels_tests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = storage_3levels_tests.cpp; sourceTree = ""; }; 671182CF1C7F0D5400CB8177 /* countries_obsolete.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = countries_obsolete.txt; sourceTree = ""; }; 671182D01C7F0D5400CB8177 /* packed_polygons_obsolete.bin */ = {isa = PBXFileReference; lastKnownFileType = archive.macbinary; path = packed_polygons_obsolete.bin; sourceTree = ""; }; @@ -259,9 +267,6 @@ 678CB37F1CA5881B00E9118D /* editor.config */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = editor.config; sourceTree = ""; }; 67AF49FE1BC579DD0048B1ED /* country_info_getter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = country_info_getter.cpp; sourceTree = ""; }; 67AF49FF1BC579DD0048B1ED /* country_info_getter.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = country_info_getter.hpp; sourceTree = ""; }; - 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 = ""; }; - 67BC92E61D1A9F1300A4A378 /* libgenerator.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libgenerator.a; path = "../../../omim-xcode-build/Debug/libgenerator.a"; sourceTree = ""; }; - 67BC92E81D1AA03900A4A378 /* libtess2.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libtess2.a; path = "../../../omim-xcode-build/Debug/libtess2.a"; sourceTree = ""; }; 67BE1DC31CD2180D00572709 /* downloading_policy.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = downloading_policy.cpp; sourceTree = ""; }; 67BE1DC41CD2180D00572709 /* downloading_policy.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = downloading_policy.hpp; sourceTree = ""; }; 67CCFA901CBD1628007FC750 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Images.xcassets; path = ../../iphone/Maps/Images.xcassets; sourceTree = SOURCE_ROOT; }; @@ -281,9 +286,9 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 67BC92E91D1AA03900A4A378 /* libtess2.a in Frameworks */, - 67BC92E71D1A9F1300A4A378 /* libgenerator.a in Frameworks */, - 67BC92E11D1A9EB200A4A378 /* libgenerator_tests_support.a in Frameworks */, + 3462FDB31DC1E68C00906FD7 /* libtess2.a in Frameworks */, + 3462FDB11DC1E65B00906FD7 /* libgenerator.a in Frameworks */, + 3462FDAF1DC1E62F00906FD7 /* libgenerator_tests_support.a in Frameworks */, 67F90B951C6A28C000CD458E /* libstorage.a in Frameworks */, 67F90B961C6A28CA00CD458E /* libz.tbd in Frameworks */, 67F90B7B1C6A278800CD458E /* libfribidi.a in Frameworks */, @@ -323,6 +328,8 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 349756251DC1E6EE0058742A /* libtracking.a in Frameworks */, + 349756231DC1E6DD0058742A /* libpartners_api.a in Frameworks */, 67F90BF21C6A2AAB00CD458E /* libstorage.a in Frameworks */, 67F90BD71C6A2A3000CD458E /* libfribidi.a in Frameworks */, 67F90BEC1C6A2A3000CD458E /* libindexer.a in Frameworks */, @@ -361,6 +368,18 @@ /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ + 34F5584C1DBF327C00A4FC11 /* Frameworks */ = { + isa = PBXGroup; + children = ( + 349756241DC1E6EE0058742A /* libtracking.a */, + 349756221DC1E6DD0058742A /* libpartners_api.a */, + 3462FDB21DC1E68C00906FD7 /* libtess2.a */, + 3462FDB01DC1E65B00906FD7 /* libgenerator.a */, + 3462FDAE1DC1E62F00906FD7 /* libgenerator_tests_support.a */, + ); + name = Frameworks; + sourceTree = ""; + }; 67247FBD1C60B89B00EDE56A /* storage_tests */ = { isa = PBXGroup; children = ( @@ -387,7 +406,6 @@ 672480011C60BF2F00EDE56A /* libs */ = { isa = PBXGroup; children = ( - 67BC92E01D1A9EB200A4A378 /* libgenerator_tests_support.a */, 674709AF1C6215690093DD1B /* libagg.a */, 674709B01C6215690093DD1B /* libapi.a */, 674709B11C6215690093DD1B /* libeditor.a */, @@ -443,15 +461,15 @@ 675342D71A3F59EF00A0A8C3 = { isa = PBXGroup; children = ( - 67BC92E81D1AA03900A4A378 /* libtess2.a */, - 67BC92E61D1A9F1300A4A378 /* libgenerator.a */, - 670D05A81B0E04450013A7AC /* defaults.xcconfig */, + 34F5584A1DBF2FC000A4FC11 /* common-debug.xcconfig */, + 34F5584B1DBF2FC000A4FC11 /* common-release.xcconfig */, 672480011C60BF2F00EDE56A /* libs */, 675342E21A3F59EF00A0A8C3 /* storage */, 67247FBD1C60B89B00EDE56A /* storage_tests */, 672480071C60CE3D00EDE56A /* storage_integration_tests */, 676C83F81C6387D000DC9603 /* Resources */, 675342E11A3F59EF00A0A8C3 /* Products */, + 34F5584C1DBF327C00A4FC11 /* Frameworks */, ); sourceTree = ""; }; @@ -757,116 +775,41 @@ /* Begin XCBuildConfiguration section */ 675342E91A3F59EF00A0A8C3 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 670D05A81B0E04450013A7AC /* defaults.xcconfig */; + baseConfigurationReference = 34F5584A1DBF2FC000A4FC11 /* common-debug.xcconfig */; buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - 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_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - COPY_PHASE_STRIP = NO; - ENABLE_STRICT_OBJC_MSGSEND = YES; - ENABLE_TESTABILITY = YES; - GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_DYNAMIC_NO_PIC = NO; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PREPROCESSOR_DEFINITIONS = ( - "DEBUG=1", - "$(inherited)", - ); - GCC_SYMBOLS_PRIVATE_EXTERN = NO; - 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 = ( "$(inherited)", "$(OMIM_ROOT)/3party/jansson/src", "$(OMIM_ROOT)/3party/glm/", ); - MTL_ENABLE_DEBUG_INFO = YES; - ONLY_ACTIVE_ARCH = YES; - SDKROOT = macosx; }; name = Debug; }; 675342EA1A3F59EF00A0A8C3 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 670D05A81B0E04450013A7AC /* defaults.xcconfig */; + baseConfigurationReference = 34F5584B1DBF2FC000A4FC11 /* common-release.xcconfig */; buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - 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_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - COPY_PHASE_STRIP = YES; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - ENABLE_NS_ASSERTIONS = NO; - ENABLE_STRICT_OBJC_MSGSEND = YES; - GCC_C_LANGUAGE_STANDARD = gnu99; - 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 = ( "$(inherited)", "$(OMIM_ROOT)/3party/jansson/src", "$(OMIM_ROOT)/3party/glm/", ); - MTL_ENABLE_DEBUG_INFO = NO; - SDKROOT = macosx; }; name = Release; }; 675342EC1A3F59EF00A0A8C3 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - COMBINE_HIDPI_IMAGES = YES; EXECUTABLE_PREFIX = lib; - GCC_ENABLE_CPP_EXCEPTIONS = YES; - GCC_ENABLE_CPP_RTTI = YES; - GCC_SYMBOLS_PRIVATE_EXTERN = NO; - HEADER_SEARCH_PATHS = "$(inherited)"; - ONLY_ACTIVE_ARCH = NO; PRODUCT_NAME = "$(TARGET_NAME)"; - SUPPORTED_PLATFORMS = "macosx iphonesimulator iphoneos"; }; name = Debug; }; 675342ED1A3F59EF00A0A8C3 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - COMBINE_HIDPI_IMAGES = YES; EXECUTABLE_PREFIX = lib; - GCC_ENABLE_CPP_EXCEPTIONS = YES; - GCC_ENABLE_CPP_RTTI = YES; - GCC_PREPROCESSOR_DEFINITIONS = "RELEASE=1"; - GCC_SYMBOLS_PRIVATE_EXTERN = NO; - HEADER_SEARCH_PATHS = "$(inherited)"; PRODUCT_NAME = "$(TARGET_NAME)"; - SUPPORTED_PLATFORMS = "macosx iphonesimulator iphoneos"; }; name = Release; }; @@ -874,20 +817,13 @@ isa = XCBuildConfiguration; buildSettings = { ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - DEBUG_INFORMATION_FORMAT = dwarf; - GCC_NO_COMMON_BLOCKS = YES; GCC_PREPROCESSOR_DEFINITIONS = ( - "OMIM_UNIT_TEST_WITH_QT_EVENT_LOOP=1", "$(inherited)", + "OMIM_UNIT_TEST_WITH_QT_EVENT_LOOP=1", ); INFOPLIST_FILE = "$(OMIM_ROOT)/iphone/Maps/MAPSME.plist"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = "mail.ru.storage-tests"; + PRODUCT_BUNDLE_IDENTIFIER = storage_tests; PRODUCT_NAME = "$(TARGET_NAME)"; - SDKROOT = iphoneos; - SUPPORTED_PLATFORMS = "iphonesimulator iphoneos macosx"; - TARGETED_DEVICE_FAMILY = "1,2"; }; name = Debug; }; @@ -895,18 +831,13 @@ isa = XCBuildConfiguration; buildSettings = { ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - COPY_PHASE_STRIP = NO; - GCC_NO_COMMON_BLOCKS = YES; - 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 = "$(OMIM_ROOT)/iphone/Maps/MAPSME.plist"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = "mail.ru.storage-tests"; + PRODUCT_BUNDLE_IDENTIFIER = storage_tests; PRODUCT_NAME = "$(TARGET_NAME)"; - SDKROOT = iphoneos; - SUPPORTED_PLATFORMS = "iphonesimulator iphoneos macosx"; - TARGETED_DEVICE_FAMILY = "1,2"; - VALIDATE_PRODUCT = YES; }; name = Release; }; @@ -914,20 +845,13 @@ isa = XCBuildConfiguration; buildSettings = { ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - DEBUG_INFORMATION_FORMAT = dwarf; - GCC_NO_COMMON_BLOCKS = YES; GCC_PREPROCESSOR_DEFINITIONS = ( - "OMIM_UNIT_TEST_WITH_QT_EVENT_LOOP=1", "$(inherited)", + "OMIM_UNIT_TEST_WITH_QT_EVENT_LOOP=1", ); INFOPLIST_FILE = "$(OMIM_ROOT)/iphone/Maps/MAPSME.plist"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = "mail.ru.storage-integration-tests"; + PRODUCT_BUNDLE_IDENTIFIER = storage_integration_tests; PRODUCT_NAME = "$(TARGET_NAME)"; - SDKROOT = iphoneos; - SUPPORTED_PLATFORMS = "iphonesimulator iphoneos macosx"; - TARGETED_DEVICE_FAMILY = "1,2"; }; name = Debug; }; @@ -935,18 +859,13 @@ isa = XCBuildConfiguration; buildSettings = { ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - COPY_PHASE_STRIP = NO; - GCC_NO_COMMON_BLOCKS = YES; - 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 = "$(OMIM_ROOT)/iphone/Maps/MAPSME.plist"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = "mail.ru.storage-integration-tests"; + PRODUCT_BUNDLE_IDENTIFIER = storage_integration_tests; PRODUCT_NAME = "$(TARGET_NAME)"; - SDKROOT = iphoneos; - SUPPORTED_PLATFORMS = "iphonesimulator iphoneos macosx"; - TARGETED_DEVICE_FAMILY = "1,2"; - VALIDATE_PRODUCT = YES; }; name = Release; };