diff --git a/CMakeLists.txt b/CMakeLists.txt index ece4311ac0..0636a02cef 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,6 +8,16 @@ set(CMAKE_C_STANDARD 11) set(CMAKE_CXX_EXTENSIONS OFF) set(CMAKE_C_EXTENSIONS OFF) +# Force colored errors and warnings for Ninja. +if (CMAKE_GENERATOR MATCHES "Ninja" AND NOT (ENV{COLORS_DISABLE} EQUAL "1") ) + if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") + add_compile_options (-fdiagnostics-color=always) + elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" OR + "${CMAKE_CXX_COMPILER_ID}" STREQUAL "AppleClang") + add_compile_options (-fcolor-diagnostics) + endif() +endif() + get_filename_component(OMIM_ROOT . ABSOLUTE) set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${OMIM_ROOT}/cmake") diff --git a/base/base_tests/fifo_cache_test.cpp b/base/base_tests/fifo_cache_test.cpp index 7b63f1fb93..554e4e9b8a 100644 --- a/base/base_tests/fifo_cache_test.cpp +++ b/base/base_tests/fifo_cache_test.cpp @@ -67,7 +67,7 @@ UNIT_TEST(FifoCache) TEST_EQUAL(cache.GetMap(), expectedMap, ()); list expectedList({2, 3, 1}); boost::circular_buffer expectedCB(expectedList.cbegin(), expectedList.cend()); - TEST_EQUAL(cache.GetFifo(), expectedCB, ()); + TEST(cache.GetFifo() == expectedCB, ()); } TEST_EQUAL(cache.GetValue(7), 7, ()); @@ -77,7 +77,7 @@ UNIT_TEST(FifoCache) TEST_EQUAL(cache.GetMap(), expectedMap, ()); list expectedList({7, 2, 3}); boost::circular_buffer expectedCB(expectedList.cbegin(), expectedList.cend()); - TEST_EQUAL(cache.GetFifo(), expectedCB, ()); + TEST(cache.GetFifo() == expectedCB, ()); } } diff --git a/base/internal/message.hpp b/base/internal/message.hpp index c668ca54b8..99dcae5a05 100644 --- a/base/internal/message.hpp +++ b/base/internal/message.hpp @@ -19,8 +19,6 @@ #include #include -#include - /// @name Declarations. //@{ template inline std::string DebugPrint(T const & t); @@ -42,8 +40,6 @@ template , class Pred = std::equal_to const & v); template , class Pred = std::equal_to> inline std::string DebugPrint(std::unordered_map const & v); - -template inline std::string DebugPrint(boost::circular_buffer const & v); //@} template inline std::string DebugPrint(T const & t) @@ -170,11 +166,6 @@ template inline std::string DebugPrint(std::unique_ptr const & v return out.str(); } -template inline std::string DebugPrint(boost::circular_buffer const & v) -{ - return DebugPrintSequence(v.begin(), v.end()); -} - namespace base { inline std::string Message() { return std::string(); } diff --git a/docs/CPP_STYLE.md b/docs/CPP_STYLE.md index 17b9e76f0e..b2646b9125 100644 --- a/docs/CPP_STYLE.md +++ b/docs/CPP_STYLE.md @@ -206,7 +206,7 @@ v = w * (x + z); ### Some useful macros: -- `#ifdef DEBUG | RELEASE | OMIM_PRODUCTION` +- `#ifdef DEBUG | RELEASE` - `#ifdef OMIM_OS_ANDROID | OMIM_OS_IPHONE | OMIM_OS_MAC` (and some other useful OS-related macros, see `std/target_os.hpp`) - Use `ASSERT(expression, (out message))` and `ASSERT_XXXXXX` macros often to check code validity in DEBUG builds - Use `CHECK(expression, (out message))` and `CHECK_XXXXXX` macros to check code validity in all builds diff --git a/iphone/Chart/Chart.xcodeproj/project.pbxproj b/iphone/Chart/Chart.xcodeproj/project.pbxproj index 7cf7279250..1f1ef136be 100644 --- a/iphone/Chart/Chart.xcodeproj/project.pbxproj +++ b/iphone/Chart/Chart.xcodeproj/project.pbxproj @@ -20,6 +20,8 @@ 47375E522420E97100FFCC49 /* ChartYAxisView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 47375E472420E96F00FFCC49 /* ChartYAxisView.swift */; }; 47375E542420E97100FFCC49 /* ChartPreviewView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 47375E492420E97100FFCC49 /* ChartPreviewView.swift */; }; 47D48BD324302FE200FEFB1F /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 47D48BD524302FE200FEFB1F /* Localizable.strings */; }; + FA4C8E56263B1FA80048FA99 /* common-release.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = FA4C8E53263B1FA80048FA99 /* common-release.xcconfig */; }; + FA4C8E57263B1FA80048FA99 /* common-debug.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = FA4C8E54263B1FA80048FA99 /* common-debug.xcconfig */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ @@ -66,6 +68,8 @@ 47D48BF12430333900FEFB1F /* vi */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = vi; path = vi.lproj/Localizable.strings; sourceTree = ""; }; 47D48BF22430334B00FEFB1F /* sk */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = sk; path = sk.lproj/Localizable.strings; sourceTree = ""; }; 47D48BF32430335F00FEFB1F /* uk */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = uk; path = uk.lproj/Localizable.strings; sourceTree = ""; }; + FA4C8E53263B1FA80048FA99 /* common-release.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = "common-release.xcconfig"; path = "../../xcode/common-release.xcconfig"; sourceTree = ""; }; + FA4C8E54263B1FA80048FA99 /* common-debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = "common-debug.xcconfig"; path = "../../xcode/common-debug.xcconfig"; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -82,6 +86,8 @@ 47375D8C2420D4DB00FFCC49 = { isa = PBXGroup; children = ( + FA4C8E54263B1FA80048FA99 /* common-debug.xcconfig */, + FA4C8E53263B1FA80048FA99 /* common-release.xcconfig */, 47375D982420D4DB00FFCC49 /* Chart */, 47375D972420D4DB00FFCC49 /* Products */, ); @@ -238,6 +244,8 @@ buildActionMask = 2147483647; files = ( 47D48BD324302FE200FEFB1F /* Localizable.strings in Resources */, + FA4C8E57263B1FA80048FA99 /* common-debug.xcconfig in Resources */, + FA4C8E56263B1FA80048FA99 /* common-release.xcconfig in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -307,6 +315,7 @@ /* Begin XCBuildConfiguration section */ 47375D9C2420D4DB00FFCC49 /* Debug */ = { isa = XCBuildConfiguration; + baseConfigurationReference = FA4C8E54263B1FA80048FA99 /* common-debug.xcconfig */; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; @@ -317,32 +326,9 @@ CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; CLANG_ENABLE_OBJC_WEAK = YES; - CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_COMMA = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INFINITE_RECURSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; - CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; - CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; - CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; - CLANG_WARN_STRICT_PROTOTYPES = YES; - CLANG_WARN_SUSPICIOUS_MOVE = YES; - CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - COPY_PHASE_STRIP = NO; CURRENT_PROJECT_VERSION = 1; DEBUG_INFORMATION_FORMAT = dwarf; ENABLE_STRICT_OBJC_MSGSEND = YES; - ENABLE_TESTABILITY = YES; GCC_C_LANGUAGE_STANDARD = c11; GCC_DYNAMIC_NO_PIC = NO; GCC_NO_COMMON_BLOCKS = YES; @@ -351,15 +337,7 @@ "DEBUG=1", "$(inherited)", ); - 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; IPHONEOS_DEPLOYMENT_TARGET = 12.0; - MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; - MTL_FAST_MATH = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; @@ -371,6 +349,7 @@ }; 47375D9D2420D4DB00FFCC49 /* Release */ = { isa = XCBuildConfiguration; + baseConfigurationReference = FA4C8E53263B1FA80048FA99 /* common-release.xcconfig */; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; @@ -381,43 +360,13 @@ CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; CLANG_ENABLE_OBJC_WEAK = YES; - CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_COMMA = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INFINITE_RECURSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; - CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; - CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; - CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; - CLANG_WARN_STRICT_PROTOTYPES = YES; - CLANG_WARN_SUSPICIOUS_MOVE = YES; - CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - COPY_PHASE_STRIP = NO; CURRENT_PROJECT_VERSION = 1; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; GCC_C_LANGUAGE_STANDARD = c11; 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; IPHONEOS_DEPLOYMENT_TARGET = 12.0; - MTL_ENABLE_DEBUG_INFO = NO; - MTL_FAST_MATH = YES; SDKROOT = iphoneos; SWIFT_COMPILATION_MODE = wholemodule; SWIFT_OPTIMIZATION_LEVEL = "-O"; @@ -477,89 +426,6 @@ }; name = Release; }; - 47375E582424D33600FFCC49 /* Production Full */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; - CLANG_ANALYZER_NONNULL = YES; - CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; - CLANG_CXX_LANGUAGE_STANDARD = "c++17"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_ENABLE_OBJC_WEAK = YES; - CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_COMMA = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INFINITE_RECURSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; - CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; - CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; - CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; - CLANG_WARN_STRICT_PROTOTYPES = YES; - CLANG_WARN_SUSPICIOUS_MOVE = YES; - CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 1; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - ENABLE_NS_ASSERTIONS = NO; - ENABLE_STRICT_OBJC_MSGSEND = YES; - GCC_C_LANGUAGE_STANDARD = c11; - 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; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; - MTL_ENABLE_DEBUG_INFO = NO; - MTL_FAST_MATH = YES; - SDKROOT = iphoneos; - SWIFT_COMPILATION_MODE = wholemodule; - SWIFT_OPTIMIZATION_LEVEL = "-O"; - VALIDATE_PRODUCT = YES; - VERSIONING_SYSTEM = "apple-generic"; - VERSION_INFO_PREFIX = ""; - }; - name = "Production Full"; - }; - 47375E592424D33600FFCC49 /* Production Full */ = { - isa = XCBuildConfiguration; - buildSettings = { - CODE_SIGN_IDENTITY = ""; - CODE_SIGN_STYLE = Automatic; - DEFINES_MODULE = YES; - DEVELOPMENT_TEAM = N9X2A789QT; - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; - DYLIB_INSTALL_NAME_BASE = "@rpath"; - INFOPLIST_FILE = Chart/Info.plist; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - "@loader_path/Frameworks", - ); - PRODUCT_BUNDLE_IDENTIFIER = com.mapswithme.Chart; - PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; - SKIP_INSTALL = YES; - SWIFT_VERSION = 5.0; - TARGETED_DEVICE_FAMILY = "1,2"; - }; - name = "Production Full"; - }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ @@ -568,7 +434,6 @@ buildConfigurations = ( 47375D9C2420D4DB00FFCC49 /* Debug */, 47375D9D2420D4DB00FFCC49 /* Release */, - 47375E582424D33600FFCC49 /* Production Full */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -578,7 +443,6 @@ buildConfigurations = ( 47375D9F2420D4DB00FFCC49 /* Debug */, 47375DA02420D4DB00FFCC49 /* Release */, - 47375E592424D33600FFCC49 /* Production Full */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; diff --git a/iphone/CoreApi/CoreApi.xcodeproj/project.pbxproj b/iphone/CoreApi/CoreApi.xcodeproj/project.pbxproj index f97388373e..0d3dba5df5 100644 --- a/iphone/CoreApi/CoreApi.xcodeproj/project.pbxproj +++ b/iphone/CoreApi/CoreApi.xcodeproj/project.pbxproj @@ -523,7 +523,7 @@ 470015E62342509C00EBF03D /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 1240; + LastUpgradeCheck = 1250; ORGANIZATIONNAME = maps.me; TargetAttributes = { 470015EE2342509C00EBF03D = { @@ -537,6 +537,7 @@ hasScannedForEncodings = 0; knownRegions = ( en, + Base, ); mainGroup = 470015E52342509C00EBF03D; productRefGroup = 470015F02342509C00EBF03D /* Products */; @@ -613,26 +614,6 @@ CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; CLANG_ENABLE_OBJC_WEAK = YES; - CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_COMMA = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INFINITE_RECURSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; - CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; - CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; - CLANG_WARN_STRICT_PROTOTYPES = YES; - CLANG_WARN_SUSPICIOUS_MOVE = YES; - CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CODE_SIGN_IDENTITY = "iPhone Developer"; COPY_PHASE_STRIP = NO; CURRENT_PROJECT_VERSION = 1; @@ -646,15 +627,7 @@ "DEBUG=1", "$(inherited)", ); - 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; IPHONEOS_DEPLOYMENT_TARGET = 12.0; - MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; - MTL_FAST_MATH = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; VERSIONING_SYSTEM = "apple-generic"; @@ -673,26 +646,6 @@ CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; CLANG_ENABLE_OBJC_WEAK = YES; - CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_COMMA = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INFINITE_RECURSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; - CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; - CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; - CLANG_WARN_STRICT_PROTOTYPES = YES; - CLANG_WARN_SUSPICIOUS_MOVE = YES; - CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CODE_SIGN_IDENTITY = "iPhone Developer"; COPY_PHASE_STRIP = NO; CURRENT_PROJECT_VERSION = 1; @@ -700,15 +653,7 @@ ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; 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; IPHONEOS_DEPLOYMENT_TARGET = 12.0; - MTL_ENABLE_DEBUG_INFO = NO; - MTL_FAST_MATH = YES; SDKROOT = iphoneos; VALIDATE_PRODUCT = YES; VERSIONING_SYSTEM = "apple-generic"; @@ -718,7 +663,6 @@ }; 470015F82342509C00EBF03D /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 479834EE23426C0100724D1E /* common-debug.xcconfig */; buildSettings = { CLANG_WARN_COMMA = NO; CODE_SIGN_IDENTITY = ""; @@ -752,7 +696,6 @@ }; 470015F92342509C00EBF03D /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 479834EF23426C0100724D1E /* common-release.xcconfig */; buildSettings = { CLANG_WARN_COMMA = NO; CODE_SIGN_IDENTITY = ""; @@ -785,95 +728,6 @@ }; name = Release; }; - 999602D823AA395E009FFE99 /* Production Full */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 479834EF23426C0100724D1E /* common-release.xcconfig */; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_ANALYZER_NONNULL = YES; - CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_ENABLE_OBJC_WEAK = YES; - CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_COMMA = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INFINITE_RECURSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; - CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; - CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; - CLANG_WARN_STRICT_PROTOTYPES = YES; - CLANG_WARN_SUSPICIOUS_MOVE = YES; - CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - CODE_SIGN_IDENTITY = "iPhone Developer"; - COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 1; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - ENABLE_NS_ASSERTIONS = NO; - ENABLE_STRICT_OBJC_MSGSEND = YES; - 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; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; - MTL_ENABLE_DEBUG_INFO = NO; - MTL_FAST_MATH = YES; - SDKROOT = iphoneos; - VALIDATE_PRODUCT = YES; - VERSIONING_SYSTEM = "apple-generic"; - VERSION_INFO_PREFIX = ""; - }; - name = "Production Full"; - }; - 999602D923AA395E009FFE99 /* Production Full */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 479834EF23426C0100724D1E /* common-release.xcconfig */; - buildSettings = { - CLANG_WARN_COMMA = NO; - CODE_SIGN_IDENTITY = ""; - CODE_SIGN_STYLE = Automatic; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - DEFINES_MODULE = YES; - DEVELOPMENT_TEAM = N9X2A789QT; - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; - DYLIB_INSTALL_NAME_BASE = "@rpath"; - HEADER_SEARCH_PATHS = ( - "$(inherited)", - "$(OMIM_ROOT)", - "$(BOOST_ROOT)", - "$(OMIM_ROOT)/3party/glm", - ); - INFOPLIST_FILE = CoreApi/Info.plist; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - "@loader_path/Frameworks", - ); - MACH_O_TYPE = staticlib; - MODULEMAP_FILE = CoreApi.modulemap; - PRODUCT_BUNDLE_IDENTIFIER = com.mapswithme.CoreApi; - PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; - SKIP_INSTALL = YES; - TARGETED_DEVICE_FAMILY = "1,2"; - }; - name = "Production Full"; - }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ @@ -882,7 +736,6 @@ buildConfigurations = ( 470015F52342509C00EBF03D /* Debug */, 470015F62342509C00EBF03D /* Release */, - 999602D823AA395E009FFE99 /* Production Full */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -892,7 +745,6 @@ buildConfigurations = ( 470015F82342509C00EBF03D /* Debug */, 470015F92342509C00EBF03D /* Release */, - 999602D923AA395E009FFE99 /* Production Full */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; diff --git a/iphone/DatePicker/DatePicker.xcodeproj/project.pbxproj b/iphone/DatePicker/DatePicker.xcodeproj/project.pbxproj index 54b9e9d1d3..2575ab3b37 100644 --- a/iphone/DatePicker/DatePicker.xcodeproj/project.pbxproj +++ b/iphone/DatePicker/DatePicker.xcodeproj/project.pbxproj @@ -23,6 +23,8 @@ 47A13C9E24BD3F3400027D4F /* RangeMiddleCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 47A13C9D24BD3F3400027D4F /* RangeMiddleCell.swift */; }; 47A13CA024BDEFF400027D4F /* CellStrategy.swift in Sources */ = {isa = PBXBuildFile; fileRef = 47A13C9F24BDEFF400027D4F /* CellStrategy.swift */; }; 47A13CA224BE6E4B00027D4F /* DatePickerViewTheme.swift in Sources */ = {isa = PBXBuildFile; fileRef = 47A13CA124BE6E4B00027D4F /* DatePickerViewTheme.swift */; }; + FA4C8E5C263B1FC20048FA99 /* common-release.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = FA4C8E59263B1FC20048FA99 /* common-release.xcconfig */; }; + FA4C8E5D263B1FC20048FA99 /* common-debug.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = FA4C8E5A263B1FC20048FA99 /* common-debug.xcconfig */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ @@ -44,6 +46,8 @@ 47A13C9D24BD3F3400027D4F /* RangeMiddleCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RangeMiddleCell.swift; sourceTree = ""; }; 47A13C9F24BDEFF400027D4F /* CellStrategy.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CellStrategy.swift; sourceTree = ""; }; 47A13CA124BE6E4B00027D4F /* DatePickerViewTheme.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DatePickerViewTheme.swift; sourceTree = ""; }; + FA4C8E59263B1FC20048FA99 /* common-release.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = "common-release.xcconfig"; path = "../../xcode/common-release.xcconfig"; sourceTree = ""; }; + FA4C8E5A263B1FC20048FA99 /* common-debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = "common-debug.xcconfig"; path = "../../xcode/common-debug.xcconfig"; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -60,6 +64,8 @@ 47A13C5B24B4A86000027D4F = { isa = PBXGroup; children = ( + FA4C8E5A263B1FC20048FA99 /* common-debug.xcconfig */, + FA4C8E59263B1FC20048FA99 /* common-release.xcconfig */, 47A13C6724B4A86000027D4F /* DatePicker */, 47A13C6624B4A86000027D4F /* Products */, ); @@ -142,7 +148,7 @@ 47A13C5C24B4A86000027D4F /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 1240; + LastUpgradeCheck = 1250; ORGANIZATIONNAME = maps.me; TargetAttributes = { 47A13C6424B4A86000027D4F = { @@ -174,6 +180,8 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( + FA4C8E5D263B1FC20048FA99 /* common-debug.xcconfig in Resources */, + FA4C8E5C263B1FC20048FA99 /* common-release.xcconfig in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -208,40 +216,16 @@ /* Begin XCBuildConfiguration section */ 47A13C6B24B4A86000027D4F /* Debug */ = { isa = XCBuildConfiguration; + baseConfigurationReference = FA4C8E5A263B1FC20048FA99 /* common-debug.xcconfig */; buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_ANALYZER_NONNULL = YES; - CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; CLANG_CXX_LANGUAGE_STANDARD = "c++17"; CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; CLANG_ENABLE_OBJC_WEAK = YES; - CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_COMMA = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INFINITE_RECURSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; - CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; - CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; - CLANG_WARN_STRICT_PROTOTYPES = YES; - CLANG_WARN_SUSPICIOUS_MOVE = YES; - CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - COPY_PHASE_STRIP = NO; CURRENT_PROJECT_VERSION = 1; DEBUG_INFORMATION_FORMAT = dwarf; ENABLE_STRICT_OBJC_MSGSEND = YES; - ENABLE_TESTABILITY = YES; GCC_C_LANGUAGE_STANDARD = c11; GCC_DYNAMIC_NO_PIC = NO; GCC_NO_COMMON_BLOCKS = YES; @@ -250,15 +234,6 @@ "DEBUG=1", "$(inherited)", ); - 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; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; - MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; - MTL_FAST_MATH = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; @@ -270,55 +245,22 @@ }; 47A13C6C24B4A86000027D4F /* Release */ = { isa = XCBuildConfiguration; + baseConfigurationReference = FA4C8E59263B1FC20048FA99 /* common-release.xcconfig */; buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_ANALYZER_NONNULL = YES; - CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; CLANG_CXX_LANGUAGE_STANDARD = "c++17"; CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; CLANG_ENABLE_OBJC_WEAK = YES; - CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_COMMA = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INFINITE_RECURSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; - CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; - CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; - CLANG_WARN_STRICT_PROTOTYPES = YES; - CLANG_WARN_SUSPICIOUS_MOVE = YES; - CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - COPY_PHASE_STRIP = NO; CURRENT_PROJECT_VERSION = 1; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; GCC_C_LANGUAGE_STANDARD = c11; 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; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; - MTL_ENABLE_DEBUG_INFO = NO; - MTL_FAST_MATH = YES; SDKROOT = iphoneos; SWIFT_COMPILATION_MODE = wholemodule; SWIFT_OPTIMIZATION_LEVEL = "-O"; - VALIDATE_PRODUCT = YES; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; }; @@ -375,87 +317,6 @@ }; name = Release; }; - 47CA68CC24FD32EA00671019 /* Production Full */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_ANALYZER_NONNULL = YES; - CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; - CLANG_CXX_LANGUAGE_STANDARD = "c++17"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_ENABLE_OBJC_WEAK = YES; - CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_COMMA = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INFINITE_RECURSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; - CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; - CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; - CLANG_WARN_STRICT_PROTOTYPES = YES; - CLANG_WARN_SUSPICIOUS_MOVE = YES; - CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 1; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - ENABLE_NS_ASSERTIONS = NO; - ENABLE_STRICT_OBJC_MSGSEND = YES; - GCC_C_LANGUAGE_STANDARD = c11; - 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; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; - MTL_ENABLE_DEBUG_INFO = NO; - MTL_FAST_MATH = YES; - SDKROOT = iphoneos; - SWIFT_COMPILATION_MODE = wholemodule; - SWIFT_OPTIMIZATION_LEVEL = "-O"; - VALIDATE_PRODUCT = YES; - VERSIONING_SYSTEM = "apple-generic"; - VERSION_INFO_PREFIX = ""; - }; - name = "Production Full"; - }; - 47CA68CD24FD32EA00671019 /* Production Full */ = { - isa = XCBuildConfiguration; - buildSettings = { - CLANG_ENABLE_MODULES = YES; - CODE_SIGN_STYLE = Automatic; - DEFINES_MODULE = YES; - DEVELOPMENT_TEAM = ""; - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; - DYLIB_INSTALL_NAME_BASE = "@rpath"; - INFOPLIST_FILE = DatePicker/Info.plist; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - "@loader_path/Frameworks", - ); - PRODUCT_BUNDLE_IDENTIFIER = com.mapswithme.DatePicker; - PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; - SKIP_INSTALL = YES; - SWIFT_VERSION = 5.0; - TARGETED_DEVICE_FAMILY = "1,2"; - }; - name = "Production Full"; - }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ @@ -464,7 +325,6 @@ buildConfigurations = ( 47A13C6B24B4A86000027D4F /* Debug */, 47A13C6C24B4A86000027D4F /* Release */, - 47CA68CC24FD32EA00671019 /* Production Full */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -474,7 +334,6 @@ buildConfigurations = ( 47A13C6E24B4A86000027D4F /* Debug */, 47A13C6F24B4A86000027D4F /* Release */, - 47CA68CD24FD32EA00671019 /* Production Full */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; diff --git a/iphone/Maps/Maps.xcodeproj/project.pbxproj b/iphone/Maps/Maps.xcodeproj/project.pbxproj index 2abfdc3f98..cb4849b525 100644 --- a/iphone/Maps/Maps.xcodeproj/project.pbxproj +++ b/iphone/Maps/Maps.xcodeproj/project.pbxproj @@ -3738,7 +3738,7 @@ 29B97313FDCFA39411CA2CEA /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 1240; + LastUpgradeCheck = 1250; ORGANIZATIONNAME = OMaps.app; TargetAttributes = { 6741A93D1BF340DE002C974C = { diff --git a/iphone/Maps/UI/BottomMenu/Menu/BottomMenuViewController.swift b/iphone/Maps/UI/BottomMenu/Menu/BottomMenuViewController.swift index ec16bf5f14..5a9f35ec88 100644 --- a/iphone/Maps/UI/BottomMenu/Menu/BottomMenuViewController.swift +++ b/iphone/Maps/UI/BottomMenu/Menu/BottomMenuViewController.swift @@ -33,9 +33,6 @@ class BottomMenuViewController: MWMViewController { tableView.delegate = presenter tableView.registerNib(cell: BottomMenuItemCell.self) tableView.registerNib(cell: BottomMenuLayersCell.self) - performOnce({ - Toast.toast(withText: L("routes_layer_in_menu_toast")).show(withAlignment: .top) - }, "routes_layer_in_menu_toast") } override func viewDidLayoutSubviews() { diff --git a/platform/background_downloader_ios.mm b/platform/background_downloader_ios.mm index 494475c9ca..fd97769627 100644 --- a/platform/background_downloader_ios.mm +++ b/platform/background_downloader_ios.mm @@ -138,7 +138,6 @@ } - (void)cancelTaskWithIdentifier:(NSUInteger)taskIdentifier { - BOOL needNotify = [self.tasks count] > 0; TaskInfo *info = self.tasks[@(taskIdentifier)]; if (info) { [info.task cancel]; @@ -156,7 +155,6 @@ } - (void)clear { - BOOL needNotify = [self.tasks count] > 0; for (TaskInfo *info in self.tasks) { [info.task cancel]; } diff --git a/platform/platform_ios.h b/platform/platform_ios.h index 805f120670..2d12a17d48 100644 --- a/platform/platform_ios.h +++ b/platform/platform_ios.h @@ -11,7 +11,6 @@ NSDictionary * const kDeviceModelsBeforeMetalDriver = @{ @"iPad1,1" : @"iPad WiFi", @"iPad1,2" : @"iPad GSM", @"iPad2,1" : @"iPad 2 WiFi", - @"iPad2,2" : @"iPad 2 CDMA", @"iPad2,2" : @"iPad 2 GSM", @"iPad2,3" : @"iPad 2 GSM EV-DO", @"iPad2,4" : @"iPad 2", diff --git a/platform/platform_win.cpp b/platform/platform_win.cpp index c9dc2dc54c..14c36cad51 100644 --- a/platform/platform_win.cpp +++ b/platform/platform_win.cpp @@ -57,7 +57,7 @@ Platform::Platform() m_resourcesDir = path + "\\data\\"; else { -#ifndef OMIM_PRODUCTION +#ifndef RELEASE path.erase(path.find_last_of('\\')); path.erase(path.find_last_of('\\')); if (IsFileExistsByFullPath(path + "\\data\\")) diff --git a/platform/socket_apple.mm b/platform/socket_apple.mm index 92f17cd25b..f9ec11caaa 100644 --- a/platform/socket_apple.mm +++ b/platform/socket_apple.mm @@ -34,7 +34,7 @@ &writeStream); NSDictionary * settings = @{ -#ifndef OMIM_PRODUCTION +#ifndef RELEASE (id)kCFStreamSSLValidatesCertificateChain : @NO, #endif (id)kCFStreamSSLLevel : (id)kCFStreamSocketSecurityLevelNegotiatedSSL @@ -101,7 +101,7 @@ else { LOG(LERROR, ("An error has occurred on the read stream.")); -#ifdef OMIM_PRODUCTION +#ifdef RELEASE LOG(LERROR, (self.inputStream.streamError)); #else NSLog(@"%@", self.inputStream.streamError); @@ -138,7 +138,7 @@ else { LOG(LERROR, ("An error has occurred on the write stream.")); -#ifdef OMIM_PRODUCTION +#ifdef RELEASE LOG(LERROR, (self.outputStream.streamError)); #else NSLog(@"%@", self.outputStream.streamError); diff --git a/tools/unix/build_omim.sh b/tools/unix/build_omim.sh index fea88c396c..13c22c0d2e 100755 --- a/tools/unix/build_omim.sh +++ b/tools/unix/build_omim.sh @@ -1,5 +1,6 @@ -#!/bin/bash -set -u -e +#!/usr/bin/env bash + +set -eu OPT_DEBUG= OPT_RELEASE= @@ -117,6 +118,15 @@ fi build() { + local MAKE_COMMAND=$(which ninja) + local CMAKE_GENERATOR= + if [ -z "$MAKE_COMMAND" ]; then + echo "Ninja is not found, using make instead" + MAKE_COMMAND="make -j $PROCESSES" + else + CMAKE_GENERATOR=-GNinja + fi + CONF=$1 if [ -n "$OPT_PATH" ]; then DIRNAME="$OPT_PATH/omim-build-$(echo "$CONF" | tr '[:upper:]' '[:lower:]')" @@ -129,28 +139,19 @@ build() ln -s "$OMIM_PATH/data" "$DIRNAME/data" fi cd "$DIRNAME" - TMP_FILE="build_error.log" if [ -z "$OPT_DESIGNER" ]; then if [ -n "$OPT_STANDALONE" ]; then - "$CMAKE" "$OMIM_PATH" -DCMAKE_BUILD_TYPE="$CONF" \ + "$CMAKE" "$CMAKE_GENERATOR" "$OMIM_PATH" -DCMAKE_BUILD_TYPE="$CONF" \ -DBUILD_STANDALONE:bool=True ${CMAKE_CONFIG:-} else - "$CMAKE" "$OMIM_PATH" -DCMAKE_BUILD_TYPE="$CONF" ${CMAKE_CONFIG:-} + "$CMAKE" "$CMAKE_GENERATOR" "$OMIM_PATH" -DCMAKE_BUILD_TYPE="$CONF" ${CMAKE_CONFIG:-} fi echo "" - if ! make $OPT_TARGET -j $PROCESSES 2> "$TMP_FILE"; then - echo '--------------------' - cat "$TMP_FILE" - exit 1 - fi + $MAKE_COMMAND $OPT_TARGET else - "$CMAKE" "$OMIM_PATH" -DCMAKE_BUILD_TYPE="$CONF" \ + "$CMAKE" "$CMAKE_GENERATOR" "$OMIM_PATH" -DCMAKE_BUILD_TYPE="$CONF" \ -DBUILD_DESIGNER:bool=True ${CMAKE_CONFIG:-} - if ! make package -j $PROCESSES 2> "$TMP_FILE"; then - echo '--------------------' - cat "$TMP_FILE" - exit 1 - fi + $MAKE_COMMAND package fi if [ -n "$OPT_COMPILE_DATABASE" ]; then cp "$DIRNAME/compile_commands.json" "$OMIM_PATH" diff --git a/xcode/agg/agg.xcodeproj/project.pbxproj b/xcode/agg/agg.xcodeproj/project.pbxproj index 5538673112..488a5eaf36 100644 --- a/xcode/agg/agg.xcodeproj/project.pbxproj +++ b/xcode/agg/agg.xcodeproj/project.pbxproj @@ -678,23 +678,6 @@ }; name = Release; }; - A8E541151F9FBCC300A1B8FA /* Production Full */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 34F558631DBF440C00A4FC11 /* common-release.xcconfig */; - buildSettings = { - CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; - GCC_WARN_INHIBIT_ALL_WARNINGS = YES; - }; - name = "Production Full"; - }; - A8E541161F9FBCC300A1B8FA /* Production Full */ = { - isa = XCBuildConfiguration; - buildSettings = { - EXECUTABLE_PREFIX = lib; - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = "Production Full"; - }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ @@ -703,7 +686,6 @@ buildConfigurations = ( 67E8DB861BBC19810053C5BA /* Debug */, 67E8DB871BBC19810053C5BA /* Release */, - A8E541151F9FBCC300A1B8FA /* Production Full */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -713,7 +695,6 @@ buildConfigurations = ( 67E8DB891BBC19810053C5BA /* Debug */, 67E8DB8A1BBC19810053C5BA /* Release */, - A8E541161F9FBCC300A1B8FA /* Production Full */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; diff --git a/xcode/base/base.xcodeproj/project.pbxproj b/xcode/base/base.xcodeproj/project.pbxproj index 1c1a5bce34..70e836312a 100644 --- a/xcode/base/base.xcodeproj/project.pbxproj +++ b/xcode/base/base.xcodeproj/project.pbxproj @@ -672,7 +672,7 @@ 6753416F1A3F57BF00A0A8C3 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0630; + LastUpgradeCheck = 1250; TargetAttributes = { 39FD27061CC65A7100AFF551 = { CreatedOnToolsVersion = 7.2.1; @@ -685,10 +685,9 @@ }; buildConfigurationList = 675341721A3F57BF00A0A8C3 /* Build configuration list for PBXProject "base" */; compatibilityVersion = "Xcode 12.0"; - developmentRegion = English; + developmentRegion = en; hasScannedForEncodings = 0; knownRegions = ( - English, en, Base, ); @@ -813,6 +812,7 @@ 39FD271C1CC65A7100AFF551 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + CODE_SIGN_IDENTITY = "-"; GCC_PREPROCESSOR_DEFINITIONS = ( "$(inherited)", "OMIM_UNIT_TEST_DISABLE_PLATFORM_INIT=1", @@ -826,6 +826,7 @@ 39FD271D1CC65A7100AFF551 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + CODE_SIGN_IDENTITY = "-"; GCC_PREPROCESSOR_DEFINITIONS = ( "$(inherited)", "OMIM_UNIT_TEST_DISABLE_PLATFORM_INIT=1", @@ -841,6 +842,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = 34BA2D6A1DBE169E00FAB345 /* common-debug.xcconfig */; buildSettings = { + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; GCC_PREFIX_HEADER = "$(OMIM_ROOT)/precompiled_headers.hpp"; }; name = Debug; @@ -849,6 +851,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = 34BA2D6B1DBE169E00FAB345 /* common-release.xcconfig */; buildSettings = { + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; GCC_PREFIX_HEADER = "$(OMIM_ROOT)/precompiled_headers.hpp"; }; name = Release; @@ -869,36 +872,6 @@ }; name = Release; }; - A8E5413D1F9FBD6300A1B8FA /* Production Full */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 34BA2D6B1DBE169E00FAB345 /* common-release.xcconfig */; - buildSettings = { - GCC_PREFIX_HEADER = "$(OMIM_ROOT)/precompiled_headers.hpp"; - }; - name = "Production Full"; - }; - A8E5413E1F9FBD6300A1B8FA /* Production Full */ = { - isa = XCBuildConfiguration; - buildSettings = { - EXECUTABLE_PREFIX = lib; - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = "Production Full"; - }; - A8E5413F1F9FBD6300A1B8FA /* Production Full */ = { - isa = XCBuildConfiguration; - buildSettings = { - GCC_PREPROCESSOR_DEFINITIONS = ( - "$(inherited)", - "OMIM_UNIT_TEST_DISABLE_PLATFORM_INIT=1", - ); - INFOPLIST_FILE = ""; - PRODUCT_BUNDLE_IDENTIFIER = maps.me.base_tests; - PRODUCT_NAME = "$(TARGET_NAME)"; - VALIDATE_PRODUCT = YES; - }; - name = "Production Full"; - }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ @@ -907,7 +880,6 @@ buildConfigurations = ( 39FD271C1CC65A7100AFF551 /* Debug */, 39FD271D1CC65A7100AFF551 /* Release */, - A8E5413F1F9FBD6300A1B8FA /* Production Full */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -917,7 +889,6 @@ buildConfigurations = ( 675341801A3F57BF00A0A8C3 /* Debug */, 675341811A3F57BF00A0A8C3 /* Release */, - A8E5413D1F9FBD6300A1B8FA /* Production Full */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -927,7 +898,6 @@ buildConfigurations = ( 675341831A3F57BF00A0A8C3 /* Debug */, 675341841A3F57BF00A0A8C3 /* Release */, - A8E5413E1F9FBD6300A1B8FA /* Production Full */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; diff --git a/xcode/bsdiff/bsdiff.xcodeproj/project.pbxproj b/xcode/bsdiff/bsdiff.xcodeproj/project.pbxproj index c2327b742d..6e9ff656d0 100644 --- a/xcode/bsdiff/bsdiff.xcodeproj/project.pbxproj +++ b/xcode/bsdiff/bsdiff.xcodeproj/project.pbxproj @@ -195,23 +195,6 @@ }; name = Release; }; - A8E540FC1F9FBB7700A1B8FA /* Production Full */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 4586D0B01F4810A700DF9CE5 /* common-release.xcconfig */; - buildSettings = { - CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; - }; - name = "Production Full"; - }; - A8E540FD1F9FBB7700A1B8FA /* Production Full */ = { - isa = XCBuildConfiguration; - buildSettings = { - EXECUTABLE_PREFIX = lib; - GCC_WARN_INHIBIT_ALL_WARNINGS = YES; - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = "Production Full"; - }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ @@ -220,7 +203,6 @@ buildConfigurations = ( 4586D0AA1F480FE600DF9CE5 /* Debug */, 4586D0AB1F480FE600DF9CE5 /* Release */, - A8E540FC1F9FBB7700A1B8FA /* Production Full */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -230,7 +212,6 @@ buildConfigurations = ( 4586D0AD1F480FE600DF9CE5 /* Debug */, 4586D0AE1F480FE600DF9CE5 /* Release */, - A8E540FD1F9FBB7700A1B8FA /* Production Full */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; diff --git a/xcode/coding/coding.xcodeproj/project.pbxproj b/xcode/coding/coding.xcodeproj/project.pbxproj index 35a9c7704b..a635be982b 100644 --- a/xcode/coding/coding.xcodeproj/project.pbxproj +++ b/xcode/coding/coding.xcodeproj/project.pbxproj @@ -887,48 +887,6 @@ }; name = Release; }; - A8E541401F9FBD6B00A1B8FA /* Production Full */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 34A72A441DBE4989003D1F5F /* common-release.xcconfig */; - buildSettings = { - CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; - GCC_PREPROCESSOR_DEFINITIONS = ( - "$(inherited)", - "U_DISABLE_RENAMING=1", - ); - HEADER_SEARCH_PATHS = ( - "$(inherited)", - "$(OMIM_ROOT)", - "$(BOOST_ROOT)", - "$(OMIM_ROOT)/3party/icu/common", - "$(OMIM_ROOT)/3party/icu/i18n", - ); - }; - name = "Production Full"; - }; - A8E541411F9FBD6B00A1B8FA /* Production Full */ = { - isa = XCBuildConfiguration; - buildSettings = { - EXECUTABLE_PREFIX = lib; - GCC_PREFIX_HEADER = "$(OMIM_ROOT)/precompiled_headers.hpp"; - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = "Production Full"; - }; - A8E541421F9FBD6B00A1B8FA /* Production Full */ = { - isa = XCBuildConfiguration; - buildSettings = { - CODE_SIGN_IDENTITY = "-"; - INFOPLIST_FILE = "$(OMIM_ROOT)/iphone/Maps/OMaps.plist"; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/../Frameworks", - ); - PRODUCT_BUNDLE_IDENTIFIER = maps.me.coding_tests; - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = "Production Full"; - }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ @@ -937,7 +895,6 @@ buildConfigurations = ( 394916941BAC3A5F002A8C4F /* Debug */, 394916951BAC3A5F002A8C4F /* Release */, - A8E541421F9FBD6B00A1B8FA /* Production Full */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -947,7 +904,6 @@ buildConfigurations = ( 675342241A3F586300A0A8C3 /* Debug */, 675342251A3F586300A0A8C3 /* Release */, - A8E541401F9FBD6B00A1B8FA /* Production Full */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -957,7 +913,6 @@ buildConfigurations = ( 675342271A3F586300A0A8C3 /* Debug */, 675342281A3F586300A0A8C3 /* Release */, - A8E541411F9FBD6B00A1B8FA /* Production Full */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; diff --git a/xcode/common-debug.xcconfig b/xcode/common-debug.xcconfig index 8354606bb5..09cccd2eac 100644 --- a/xcode/common-debug.xcconfig +++ b/xcode/common-debug.xcconfig @@ -6,6 +6,6 @@ ENABLE_TESTABILITY = YES GCC_OPTIMIZATION_LEVEL = 0 GCC_PREPROCESSOR_DEFINITIONS = $(inherited) DEBUG _DEBUG HAVE_PTHREAD GCC_UNROLL_LOOPS = NO -MTL_ENABLE_DEBUG_INFO = YES +MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE OTHER_SWIFT_FLAGS = -Xfrontend -warn-long-function-bodies=400 -Xfrontend -warn-long-expression-type-checking=150 -DDEBUG SWIFT_OPTIMIZATION_LEVEL = -Onone diff --git a/xcode/common-release.xcconfig b/xcode/common-release.xcconfig index b3d569692e..980d367569 100644 --- a/xcode/common-release.xcconfig +++ b/xcode/common-release.xcconfig @@ -4,7 +4,7 @@ COPY_PHASE_STRIP = YES ENABLE_NS_ASSERTIONS = NO ENABLE_TESTABILITY = NO GCC_OPTIMIZATION_LEVEL = 3 -GCC_PREPROCESSOR_DEFINITIONS = $(inherited) RELEASE _RELEASE NDEBUG OMIM_PRODUCTION HAVE_PTHREAD +GCC_PREPROCESSOR_DEFINITIONS = $(inherited) RELEASE _RELEASE NDEBUG HAVE_PTHREAD GCC_UNROLL_LOOPS = YES MTL_ENABLE_DEBUG_INFO = NO NS_BLOCK_ASSERTIONS = NO diff --git a/xcode/common.xcconfig b/xcode/common.xcconfig index 8ddeff323c..0ecb4a3f11 100644 --- a/xcode/common.xcconfig +++ b/xcode/common.xcconfig @@ -76,6 +76,7 @@ GCC_PRECOMPILE_PREFIX_HEADER = YES // Silence "Migrate from OpenGL to Metal" warnings. GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COREVIDEO_SILENCE_GL_DEPRECATION GLES_SILENCE_DEPRECATION GCC_SYMBOLS_PRIVATE_EXTERN = YES +MTL_FAST_MATH = YES ONLY_ACTIVE_ARCH = YES PRODUCT_NAME = $(TARGET_NAME) SKIP_INSTALL = YES diff --git a/xcode/descriptions/descriptions.xcodeproj/project.pbxproj b/xcode/descriptions/descriptions.xcodeproj/project.pbxproj index 0f291b89bf..faf25a0b76 100644 --- a/xcode/descriptions/descriptions.xcodeproj/project.pbxproj +++ b/xcode/descriptions/descriptions.xcodeproj/project.pbxproj @@ -145,34 +145,6 @@ /* End PBXSourcesBuildPhase section */ /* Begin XCBuildConfiguration section */ - B7A5517A21CAFB4B00789B7E /* Production Full */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = BBD4574621A6D1B900B0A79C /* common-release.xcconfig */; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_ANALYZER_NONNULL = YES; - CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; - CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; - MTL_ENABLE_DEBUG_INFO = NO; - MTL_FAST_MATH = YES; - }; - name = "Production Full"; - }; - B7A5517B21CAFB4B00789B7E /* Production Full */ = { - isa = XCBuildConfiguration; - buildSettings = { - CODE_SIGN_STYLE = Automatic; - DEVELOPMENT_TEAM = 3T6FSDE8C7; - EXECUTABLE_PREFIX = lib; - GCC_ENABLE_CPP_EXCEPTIONS = YES; - GCC_ENABLE_CPP_RTTI = YES; - PRODUCT_NAME = "$(TARGET_NAME)"; - SKIP_INSTALL = YES; - }; - name = "Production Full"; - }; BBD4571B21A6BD0400B0A79C /* Debug */ = { isa = XCBuildConfiguration; baseConfigurationReference = BBD4574521A6D1B900B0A79C /* common-debug.xcconfig */; @@ -188,8 +160,6 @@ "DEBUG=1", "$(inherited)", ); - MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; - MTL_FAST_MATH = YES; }; name = Debug; }; @@ -203,8 +173,6 @@ CLANG_CXX_LIBRARY = "libc++"; CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; - MTL_ENABLE_DEBUG_INFO = NO; - MTL_FAST_MATH = YES; }; name = Release; }; @@ -242,7 +210,6 @@ buildConfigurations = ( BBD4571B21A6BD0400B0A79C /* Debug */, BBD4571C21A6BD0400B0A79C /* Release */, - B7A5517A21CAFB4B00789B7E /* Production Full */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -252,7 +219,6 @@ buildConfigurations = ( BBD4571E21A6BD0400B0A79C /* Debug */, BBD4571F21A6BD0400B0A79C /* Release */, - B7A5517B21CAFB4B00789B7E /* Production Full */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; diff --git a/xcode/drape/drape.xcodeproj/project.pbxproj b/xcode/drape/drape.xcodeproj/project.pbxproj index 0517287025..b4ec6fd546 100644 --- a/xcode/drape/drape.xcodeproj/project.pbxproj +++ b/xcode/drape/drape.xcodeproj/project.pbxproj @@ -624,11 +624,11 @@ }; buildConfigurationList = 6729A4EC1A691F6A007D5872 /* Build configuration list for PBXProject "drape" */; compatibilityVersion = "Xcode 12.0"; - developmentRegion = English; + developmentRegion = en; hasScannedForEncodings = 0; knownRegions = ( - English, en, + Base, ); mainGroup = 6729A4E81A691F6A007D5872; productRefGroup = 6729A4F21A691F6A007D5872 /* Products */; @@ -825,59 +825,6 @@ }; name = Release; }; - A8E541431F9FBD7400A1B8FA /* Production Full */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 34AF87CA1DBE4F4900E5E7DC /* common-release.xcconfig */; - buildSettings = { - CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; - GCC_PREPROCESSOR_DEFINITIONS = ( - "$(inherited)", - "U_DISABLE_RENAMING=1", - ); - HEADER_SEARCH_PATHS = ( - "$(inherited)", - "$(OMIM_ROOT)/3party/glm/", - "$(OMIM_ROOT)/3party/freetype/include", - "$(OMIM_ROOT)/3party/expat/lib", - "$(OMIM_ROOT)/3party/icu/common", - "$(OMIM_ROOT)/3party/icu/i18n", - "$(OMIM_ROOT)/3party/Vulkan-Headers/include", - "$(OMIM_ROOT)/3party/vulkan_wrapper", - ); - }; - name = "Production Full"; - }; - A8E541441F9FBD7400A1B8FA /* Production Full */ = { - isa = XCBuildConfiguration; - buildSettings = { - EXCLUDED_SOURCE_FILE_NAMES = ""; - "EXCLUDED_SOURCE_FILE_NAMES[sdk=iphonesimulator*]" = ( - metal_base_context.mm, - metal_gpu_buffer_impl.mm, - metal_mesh_object_impl.mm, - metal_states.mm, - metal_texture.mm, - metal_vertex_array_buffer_impl.mm, - render_state_metal.mm, - metal_cleaner.mm, - ); - "EXCLUDED_SOURCE_FILE_NAMES[sdk=macosx*]" = ( - hw_texture_ios.mm, - metal_base_context.mm, - metal_gpu_buffer_impl.mm, - metal_mesh_object_impl.mm, - metal_states.mm, - metal_texture.mm, - metal_vertex_array_buffer_impl.mm, - render_state_metal.mm, - metal_cleaner.mm, - ); - EXECUTABLE_PREFIX = lib; - GCC_PREFIX_HEADER = "$(OMIM_ROOT)/precompiled_headers.hpp"; - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = "Production Full"; - }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ @@ -886,7 +833,6 @@ buildConfigurations = ( 6729A4FA1A691F6A007D5872 /* Debug */, 6729A4FB1A691F6A007D5872 /* Release */, - A8E541431F9FBD7400A1B8FA /* Production Full */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -896,7 +842,6 @@ buildConfigurations = ( 6729A4FD1A691F6A007D5872 /* Debug */, 6729A4FE1A691F6A007D5872 /* Release */, - A8E541441F9FBD7400A1B8FA /* Production Full */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; diff --git a/xcode/drape_frontend/drape_frontend.xcodeproj/project.pbxproj b/xcode/drape_frontend/drape_frontend.xcodeproj/project.pbxproj index 7793fe86a8..8d9e35debb 100644 --- a/xcode/drape_frontend/drape_frontend.xcodeproj/project.pbxproj +++ b/xcode/drape_frontend/drape_frontend.xcodeproj/project.pbxproj @@ -1017,35 +1017,6 @@ }; name = Release; }; - A8E541451F9FBD7B00A1B8FA /* Production Full */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 34AF87CC1DBE508400E5E7DC /* common-release.xcconfig */; - buildSettings = { - CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; - GCC_PREPROCESSOR_DEFINITIONS = ( - "$(inherited)", - "U_DISABLE_RENAMING=1", - ); - HEADER_SEARCH_PATHS = ( - "$(OMIM_ROOT)", - "$(BOOST_ROOT)", - "$(OMIM_ROOT)/3party/glm", - "$(OMIM_ROOT)/3party/protobuf/protobuf/src", - "$(OMIM_ROOT)/3party/protobuf", - "$(OMIM_ROOT)/3party/freetype/include", - ); - }; - name = "Production Full"; - }; - A8E541461F9FBD7B00A1B8FA /* Production Full */ = { - isa = XCBuildConfiguration; - buildSettings = { - EXECUTABLE_PREFIX = lib; - GCC_PREFIX_HEADER = "$(OMIM_ROOT)/precompiled_headers.hpp"; - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = "Production Full"; - }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ @@ -1054,7 +1025,6 @@ buildConfigurations = ( 6709473C1BDF9B82005014C0 /* Debug */, 6709473D1BDF9B82005014C0 /* Release */, - A8E541451F9FBD7B00A1B8FA /* Production Full */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -1064,7 +1034,6 @@ buildConfigurations = ( 6709473F1BDF9B82005014C0 /* Debug */, 670947401BDF9B82005014C0 /* Release */, - A8E541461F9FBD7B00A1B8FA /* Production Full */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; diff --git a/xcode/editor/editor.xcodeproj/project.pbxproj b/xcode/editor/editor.xcodeproj/project.pbxproj index c7e2a4cebf..2a2f1dc81d 100644 --- a/xcode/editor/editor.xcodeproj/project.pbxproj +++ b/xcode/editor/editor.xcodeproj/project.pbxproj @@ -598,41 +598,6 @@ }; name = Release; }; - 6715564C20BF0267002BA3B4 /* Production Full */ = { - isa = XCBuildConfiguration; - buildSettings = { - EXECUTABLE_PREFIX = lib; - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = "Production Full"; - }; - A8E541471F9FBD8400A1B8FA /* Production Full */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 34F5586F1DBF49B200A4FC11 /* common-release.xcconfig */; - buildSettings = { - CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; - }; - name = "Production Full"; - }; - A8E541481F9FBD8400A1B8FA /* Production Full */ = { - isa = XCBuildConfiguration; - buildSettings = { - EXECUTABLE_PREFIX = lib; - GCC_PREFIX_HEADER = "$(OMIM_ROOT)/precompiled_headers.hpp"; - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = "Production Full"; - }; - A8E541491F9FBD8400A1B8FA /* Production Full */ = { - isa = XCBuildConfiguration; - buildSettings = { - CODE_SIGN_IDENTITY = "-"; - INFOPLIST_FILE = ""; - PRODUCT_BUNDLE_IDENTIFIER = ru.mail.editor_tests; - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = "Production Full"; - }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ @@ -641,7 +606,6 @@ buildConfigurations = ( 3411386D1C15AD97002E3B3E /* Debug */, 3411386E1C15AD97002E3B3E /* Release */, - A8E541471F9FBD8400A1B8FA /* Production Full */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -651,7 +615,6 @@ buildConfigurations = ( 341138701C15AD97002E3B3E /* Debug */, 341138711C15AD97002E3B3E /* Release */, - A8E541481F9FBD8400A1B8FA /* Production Full */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -661,7 +624,6 @@ buildConfigurations = ( 3496ABCE1DC2031900C5DDBA /* Debug */, 3496ABCF1DC2031900C5DDBA /* Release */, - A8E541491F9FBD8400A1B8FA /* Production Full */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -671,7 +633,6 @@ buildConfigurations = ( 6715564A20BF0267002BA3B4 /* Debug */, 6715564B20BF0267002BA3B4 /* Release */, - 6715564C20BF0267002BA3B4 /* Production Full */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; diff --git a/xcode/expat/expat.xcodeproj/project.pbxproj b/xcode/expat/expat.xcodeproj/project.pbxproj index abdcf30477..7fc4d2c4f8 100644 --- a/xcode/expat/expat.xcodeproj/project.pbxproj +++ b/xcode/expat/expat.xcodeproj/project.pbxproj @@ -244,28 +244,6 @@ }; name = Release; }; - A8E541191F9FBCD200A1B8FA /* Production Full */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 34EBB47B1DBF51D4005BE9B8 /* common-release.xcconfig */; - buildSettings = { - CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; - GCC_PREPROCESSOR_DEFINITIONS = ( - "$(inherited)", - HAVE_MEMMOVE, - XML_POOR_ENTROPY, - ); - GCC_WARN_INHIBIT_ALL_WARNINGS = YES; - }; - name = "Production Full"; - }; - A8E5411A1F9FBCD200A1B8FA /* Production Full */ = { - isa = XCBuildConfiguration; - buildSettings = { - EXECUTABLE_PREFIX = lib; - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = "Production Full"; - }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ @@ -274,7 +252,6 @@ buildConfigurations = ( 670D05011B0BAEE50013A7AC /* Debug */, 670D05021B0BAEE50013A7AC /* Release */, - A8E541191F9FBCD200A1B8FA /* Production Full */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -284,7 +261,6 @@ buildConfigurations = ( 670D05041B0BAEE50013A7AC /* Debug */, 670D05051B0BAEE50013A7AC /* Release */, - A8E5411A1F9FBCD200A1B8FA /* Production Full */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; diff --git a/xcode/freetype/freetype.xcodeproj/project.pbxproj b/xcode/freetype/freetype.xcodeproj/project.pbxproj index fc1fa5a3a2..19c02b2b81 100644 --- a/xcode/freetype/freetype.xcodeproj/project.pbxproj +++ b/xcode/freetype/freetype.xcodeproj/project.pbxproj @@ -1978,33 +1978,6 @@ }; name = Release; }; - A8E5411B1F9FBCDC00A1B8FA /* Production Full */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 34F558671DBF474D00A4FC11 /* common-release.xcconfig */; - buildSettings = { - CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; - FT2_BUILD_LIBRARY = 1; - GCC_WARN_INHIBIT_ALL_WARNINGS = YES; - HEADER_SEARCH_PATHS = ( - "$(inherited)", - "$(OMIM_ROOT)/3party/freetype/include", - ); - WARNING_CFLAGS = "-Wno-implicit-function-declaration"; - }; - name = "Production Full"; - }; - A8E5411C1F9FBCDC00A1B8FA /* Production Full */ = { - isa = XCBuildConfiguration; - buildSettings = { - EXECUTABLE_PREFIX = lib; - GCC_PREPROCESSOR_DEFINITIONS = ( - "$(inherited)", - "FT2_BUILD_LIBRARY=1", - ); - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = "Production Full"; - }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ @@ -2013,7 +1986,6 @@ buildConfigurations = ( 6753485B1A408D9300A0A8C3 /* Debug */, 6753485C1A408D9300A0A8C3 /* Release */, - A8E5411B1F9FBCDC00A1B8FA /* Production Full */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -2023,7 +1995,6 @@ buildConfigurations = ( 6753485E1A408D9300A0A8C3 /* Debug */, 6753485F1A408D9300A0A8C3 /* Release */, - A8E5411C1F9FBCDC00A1B8FA /* Production Full */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; diff --git a/xcode/ge0/ge0.xcodeproj/project.pbxproj b/xcode/ge0/ge0.xcodeproj/project.pbxproj index b66077d63f..698f500513 100644 --- a/xcode/ge0/ge0.xcodeproj/project.pbxproj +++ b/xcode/ge0/ge0.xcodeproj/project.pbxproj @@ -289,32 +289,6 @@ }; name = Release; }; - A8E5413A1F9FBD5B00A1B8FA /* Production Full */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 34763F481DBE28F800D370CF /* common-release.xcconfig */; - buildSettings = { - CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; - }; - name = "Production Full"; - }; - A8E5413B1F9FBD5B00A1B8FA /* Production Full */ = { - isa = XCBuildConfiguration; - buildSettings = { - EXECUTABLE_PREFIX = lib; - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = "Production Full"; - }; - A8E5413C1F9FBD5B00A1B8FA /* Production Full */ = { - isa = XCBuildConfiguration; - buildSettings = { - CODE_SIGN_IDENTITY = "-"; - INFOPLIST_FILE = "$(OMIM_ROOT)/iphone/Maps/OMaps.plist"; - PRODUCT_BUNDLE_IDENTIFIER = maps.me.ge0_tests; - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = "Production Full"; - }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ @@ -323,7 +297,6 @@ buildConfigurations = ( 3496AB8A1DC1F6CE00C5DDBA /* Debug */, 3496AB8B1DC1F6CE00C5DDBA /* Release */, - A8E5413C1F9FBD5B00A1B8FA /* Production Full */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -333,7 +306,6 @@ buildConfigurations = ( 675347201A40577A00A0A8C3 /* Debug */, 675347211A40577A00A0A8C3 /* Release */, - A8E5413A1F9FBD5B00A1B8FA /* Production Full */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -343,7 +315,6 @@ buildConfigurations = ( 675347231A40577A00A0A8C3 /* Debug */, 675347241A40577A00A0A8C3 /* Release */, - A8E5413B1F9FBD5B00A1B8FA /* Production Full */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; diff --git a/xcode/generator/generator.xcodeproj/project.pbxproj b/xcode/generator/generator.xcodeproj/project.pbxproj index 4c9a612ecc..c586c9e599 100644 --- a/xcode/generator/generator.xcodeproj/project.pbxproj +++ b/xcode/generator/generator.xcodeproj/project.pbxproj @@ -1265,38 +1265,6 @@ }; name = Release; }; - A8E5414D1F9FBD9200A1B8FA /* Production Full */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 34AF87D01DBE52DC00E5E7DC /* common-release.xcconfig */; - buildSettings = { - CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; - HEADER_SEARCH_PATHS = ( - "$(inherited)", - "$(OMIM_ROOT)/3party/gflags/src", - "$(QT_PATH)/include", - "$(OMIM_ROOT)/3party/glm", - "$(OMIM_ROOT)/3party/jansson/src", - ); - }; - name = "Production Full"; - }; - A8E5414E1F9FBD9200A1B8FA /* Production Full */ = { - isa = XCBuildConfiguration; - buildSettings = { - EXECUTABLE_PREFIX = lib; - GCC_PREFIX_HEADER = "$(OMIM_ROOT)/precompiled_headers.hpp"; - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = "Production Full"; - }; - A8E5414F1F9FBD9200A1B8FA /* Production Full */ = { - isa = XCBuildConfiguration; - buildSettings = { - EXECUTABLE_PREFIX = lib; - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = "Production Full"; - }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ @@ -1305,7 +1273,6 @@ buildConfigurations = ( 675340241A3F2A1B00A0A8C3 /* Debug */, 675340251A3F2A1B00A0A8C3 /* Release */, - A8E5414D1F9FBD9200A1B8FA /* Production Full */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -1315,7 +1282,6 @@ buildConfigurations = ( 675340271A3F2A1B00A0A8C3 /* Debug */, 675340281A3F2A1B00A0A8C3 /* Release */, - A8E5414E1F9FBD9200A1B8FA /* Production Full */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -1325,7 +1291,6 @@ buildConfigurations = ( 67BC92D41D1A9E5F00A4A378 /* Debug */, 67BC92D51D1A9E5F00A4A378 /* Release */, - A8E5414F1F9FBD9200A1B8FA /* Production Full */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; diff --git a/xcode/generator_tool/generator_tool.xcodeproj/project.pbxproj b/xcode/generator_tool/generator_tool.xcodeproj/project.pbxproj index e043d55ca0..8421635511 100644 --- a/xcode/generator_tool/generator_tool.xcodeproj/project.pbxproj +++ b/xcode/generator_tool/generator_tool.xcodeproj/project.pbxproj @@ -16,26 +16,15 @@ 3462FD9D1DC1E27D00906FD7 /* liboauthcpp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3462FD961DC1E1FC00906FD7 /* liboauthcpp.a */; }; 3462FD9F1DC1E28D00906FD7 /* libsearch.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3462FD9E1DC1E28D00906FD7 /* libsearch.a */; }; 3462FDA11DC1E29E00906FD7 /* libsuccinct.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3462FDA01DC1E29E00906FD7 /* libsuccinct.a */; }; - 3462FDA31DC1E2D600906FD7 /* libpugixml.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3462FD941DC1E1EF00906FD7 /* libpugixml.a */; }; - 3462FDA41DC1E2DA00906FD7 /* libeditor.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3462FD921DC1E1DD00906FD7 /* libeditor.a */; }; - 3462FDA51DC1E2F300906FD7 /* liboauthcpp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3462FD961DC1E1FC00906FD7 /* liboauthcpp.a */; }; - 3462FDA71DC1E30B00906FD7 /* libopening_hours.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3462FDA61DC1E30B00906FD7 /* libopening_hours.a */; }; - 3462FDA91DC1E31E00906FD7 /* libprotobuf.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3462FDA81DC1E31E00906FD7 /* libprotobuf.a */; }; - 3462FDAA1DC1E32C00906FD7 /* libsearch.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3462FD9E1DC1E28D00906FD7 /* libsearch.a */; }; - 3462FDAB1DC1E33400906FD7 /* libsuccinct.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3462FDA01DC1E29E00906FD7 /* libsuccinct.a */; }; 34F558571DBF3CD800A4FC11 /* libstdc++.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F558561DBF3CD800A4FC11 /* libstdc++.tbd */; }; 395784D5230303E700F2CC07 /* merge_collectors_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 395784D2230303E700F2CC07 /* merge_collectors_tests.cpp */; }; 395784D7230303E700F2CC07 /* metalines_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 395784D4230303E700F2CC07 /* metalines_tests.cpp */; }; - 395784D923030D5000F2CC07 /* booking_addr_match.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 395784D823030D4F00F2CC07 /* booking_addr_match.cpp */; }; 397057C022CB57F9001A55CA /* cities_ids_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 397057BD22CB57F8001A55CA /* cities_ids_tests.cpp */; }; 39B9681E23E1AC3700D3B8E3 /* libge0.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 39B9681D23E1AC3700D3B8E3 /* libge0.a */; }; - 39C4345222CE13F00002AEE3 /* booking_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 39C4345122CE13F00002AEE3 /* booking_tests.cpp */; }; 401E3189225C988500DE7EB8 /* libdescriptions.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 401E3188225C988500DE7EB8 /* libdescriptions.a */; }; 4491F494213D6B470011834F /* speed_cameras_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4491F490213D46380011834F /* speed_cameras_test.cpp */; }; 4491F496213D6B8E0011834F /* osm2meta_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 677E2A0B1CAAC7CB001DC42A /* osm2meta_test.cpp */; }; 4491F497213D6BA00011834F /* tag_admixer_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 677E2A0C1CAAC7CB001DC42A /* tag_admixer_test.cpp */; }; - 4740184B23F5BE1B00A93C81 /* minizip.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4740184A23F5BE1B00A93C81 /* minizip.framework */; }; - 4740184C23F5BE1C00A93C81 /* minizip.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 4740184A23F5BE1B00A93C81 /* minizip.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 4740184E23F5BE3900A93C81 /* minizip.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4740184D23F5BE3900A93C81 /* minizip.framework */; }; 4740184F23F5BE3A00A93C81 /* minizip.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 4740184D23F5BE3900A93C81 /* minizip.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 4740185123F5BE6500A93C81 /* minizip.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4740185023F5BE6500A93C81 /* minizip.framework */; }; @@ -85,27 +74,12 @@ 671ED3C220D4098100D4317E /* restriction_collector_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 671ED3BB20D4098100D4317E /* restriction_collector_test.cpp */; }; 671ED3C320D4098100D4317E /* altitude_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 671ED3BC20D4098100D4317E /* altitude_test.cpp */; }; 671ED3C420D4098100D4317E /* road_access_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 671ED3BD20D4098100D4317E /* road_access_test.cpp */; }; - 671ED3C520D4098100D4317E /* sponsored_storage_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 671ED3BE20D4098100D4317E /* sponsored_storage_tests.cpp */; }; 671ED3C720D40A2000D4317E /* libplatform_tests_support.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 671ED3C620D40A2000D4317E /* libplatform_tests_support.a */; }; 671ED3C920D40A3E00D4317E /* libgenerator_tests_support.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 671ED3C820D40A3E00D4317E /* libgenerator_tests_support.a */; }; 671F58B91B8611360032311E /* intermediate_data_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 671F58B71B86109B0032311E /* intermediate_data_test.cpp */; }; 6726C2231A4C2BBD005EEA39 /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 675343E01A3F600D00A0A8C3 /* IOKit.framework */; }; 6726C2261A4C2BBD005EEA39 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 675343E21A3F607600A0A8C3 /* Cocoa.framework */; }; 6726C2411A4C2D9F005EEA39 /* testingmain.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6726C2401A4C2D9F005EEA39 /* testingmain.cpp */; }; - 673746671CF4641B005E6D1F /* booking_quality_check.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 673746661CF4641B005E6D1F /* booking_quality_check.cpp */; }; - 673746681CF47A7B005E6D1F /* libgflags.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 674A28CC1B1C7FED001A525C /* libgflags.a */; }; - 673746691CF47BD9005E6D1F /* libgenerator.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 674A28CA1B1C7FED001A525C /* libgenerator.a */; }; - 6737466A1CF47D82005E6D1F /* libbase.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 674A28D71B1C800D001A525C /* libbase.a */; }; - 6737466B1CF47D82005E6D1F /* libplatform.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 674A28D31B1C8001001A525C /* libplatform.a */; }; - 6737466C1CF47D82005E6D1F /* libcoding.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 674A28C91B1C7FED001A525C /* libcoding.a */; }; - 6737466D1CF47D82005E6D1F /* libgeometry.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 674A28CB1B1C7FED001A525C /* libgeometry.a */; }; - 6737466E1CF47D82005E6D1F /* libindexer.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 674A28CD1B1C7FED001A525C /* libindexer.a */; }; - 6737466F1CF47D82005E6D1F /* libexpat.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 674A28C71B1C7FC9001A525C /* libexpat.a */; }; - 673746711CF47E14005E6D1F /* librouting.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 674A28D41B1C8001001A525C /* librouting.a */; }; - 673746731CF47E54005E6D1F /* libjansson.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 674A28ED1B1C80FB001A525C /* libjansson.a */; }; - 673746751CF47E7A005E6D1F /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 675343DE1A3F5FE500A0A8C3 /* CoreFoundation.framework */; }; - 673746761CF47E7F005E6D1F /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 675343E01A3F600D00A0A8C3 /* IOKit.framework */; }; - 673746771CF47E83005E6D1F /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 675343E21A3F607600A0A8C3 /* Cocoa.framework */; }; 674A28C81B1C7FC9001A525C /* libexpat.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 674A28C71B1C7FC9001A525C /* libexpat.a */; }; 674A28CE1B1C7FED001A525C /* libcoding.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 674A28C91B1C7FED001A525C /* libcoding.a */; }; 674A28CF1B1C7FED001A525C /* libgenerator.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 674A28CA1B1C7FED001A525C /* libgenerator.a */; }; @@ -136,35 +110,6 @@ 677792521C1B2E9700EC9499 /* metadata_parser_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 677792501C1B2E9300EC9499 /* metadata_parser_test.cpp */; }; 677E2A0A1CAAC771001DC42A /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 677E2A091CAAC771001DC42A /* libz.tbd */; }; 677E2A191CAACCB3001DC42A /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 677E2A091CAAC771001DC42A /* libz.tbd */; }; - 679624661D100F7C00AE4E3C /* libbase.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 674A28D71B1C800D001A525C /* libbase.a */; }; - 679624671D100F7C00AE4E3C /* libcoding.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 674A28C91B1C7FED001A525C /* libcoding.a */; }; - 679624681D100F7C00AE4E3C /* libexpat.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 674A28C71B1C7FC9001A525C /* libexpat.a */; }; - 679624691D100F7C00AE4E3C /* libgenerator.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 674A28CA1B1C7FED001A525C /* libgenerator.a */; }; - 6796246A1D100F7C00AE4E3C /* libgeometry.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 674A28CB1B1C7FED001A525C /* libgeometry.a */; }; - 6796246B1D100F7C00AE4E3C /* libgflags.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 674A28CC1B1C7FED001A525C /* libgflags.a */; }; - 6796246C1D100F7C00AE4E3C /* libindexer.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 674A28CD1B1C7FED001A525C /* libindexer.a */; }; - 6796246D1D100F7C00AE4E3C /* libjansson.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 674A28ED1B1C80FB001A525C /* libjansson.a */; }; - 6796246E1D100F7C00AE4E3C /* libplatform.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 674A28D31B1C8001001A525C /* libplatform.a */; }; - 6796246F1D100F7C00AE4E3C /* libsearch.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 674A28EF1B1C8104001A525C /* libsearch.a */; }; - 679624701D100F7C00AE4E3C /* libstorage.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 674A28EB1B1C80F4001A525C /* libstorage.a */; }; - 679624711D100F7C00AE4E3C /* libsuccinct.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 674A28F11B1C8119001A525C /* libsuccinct.a */; }; - 679624741D1012B700AE4E3C /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 679624731D1012B700AE4E3C /* Foundation.framework */; }; - 679624751D1012BD00AE4E3C /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 675343E01A3F600D00A0A8C3 /* IOKit.framework */; }; - 679624771D1012C700AE4E3C /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 679624761D1012C700AE4E3C /* SystemConfiguration.framework */; }; - 6796247B1D1012F500AE4E3C /* libprotobuf.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 674A28DB1B1C801D001A525C /* libprotobuf.a */; }; - 6796247D1D1012F500AE4E3C /* libopening_hours.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 6796247C1D1012F500AE4E3C /* libopening_hours.a */; }; - 6796247E1D10130A00AE4E3C /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 677E2A091CAAC771001DC42A /* libz.tbd */; }; - 6796249F1D1013AD00AE4E3C /* libsearch_tests_support.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 6796249E1D1013AD00AE4E3C /* libsearch_tests_support.a */; }; - 679624B51D11773A00AE4E3C /* libmap.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 67AB92C61B73D03500AB5194 /* libmap.a */; }; - 679624C11D11775300AE4E3C /* libdrape_frontend.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 679624B71D11775300AE4E3C /* libdrape_frontend.a */; }; - 679624C21D11775300AE4E3C /* libdrape.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 679624B81D11775300AE4E3C /* libdrape.a */; }; - 679624C31D11775300AE4E3C /* libfreetype.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 679624B91D11775300AE4E3C /* libfreetype.a */; }; - 679624C71D11775300AE4E3C /* libplatform_tests_support.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 679624BD1D11775300AE4E3C /* libplatform_tests_support.a */; }; - 679624C81D11775300AE4E3C /* libsdf_image.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 679624BE1D11775300AE4E3C /* libsdf_image.a */; }; - 679624C91D11775300AE4E3C /* libstb_image.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 679624BF1D11775300AE4E3C /* libstb_image.a */; }; - 679624CB1D11775F00AE4E3C /* librouting.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 674A28D41B1C8001001A525C /* librouting.a */; }; - 679624CD1D11775F00AE4E3C /* libagg.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 679624CC1D11775F00AE4E3C /* libagg.a */; }; - 679624CF1D11779700AE4E3C /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 679624CE1D11779700AE4E3C /* OpenGL.framework */; }; 67AB92C21B73C27300AB5194 /* source_data.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 67AB92B31B738DE800AB5194 /* source_data.cpp */; }; 67AB92C31B73C29000AB5194 /* source_to_element_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 674A39D21B727589001DDB91 /* source_to_element_test.cpp */; }; 67AB92D01B75156400AB5194 /* coasts_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6726C1E51A4C28D5005EEA39 /* coasts_test.cpp */; }; @@ -184,7 +129,6 @@ 67BC92C61D17FDE600A4A378 /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 679624CE1D11779700AE4E3C /* OpenGL.framework */; }; E1DE929B239E61CB0073F304 /* hierarchy_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E1DE9299239E61CB0073F304 /* hierarchy_tests.cpp */; }; E1DE929C239E61CB0073F304 /* collector_building_parts_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E1DE929A239E61CB0073F304 /* collector_building_parts_tests.cpp */; }; - E9502E301D2BD6E600CAB86B /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 677E2A091CAAC771001DC42A /* libz.tbd */; }; /* End PBXBuildFile section */ /* Begin PBXCopyFilesBuildPhase section */ @@ -210,17 +154,6 @@ name = "Embed Frameworks"; runOnlyForDeploymentPostprocessing = 0; }; - 4740181D23F5BBAA00A93C81 /* Embed Frameworks */ = { - isa = PBXCopyFilesBuildPhase; - buildActionMask = 2147483647; - dstPath = ""; - dstSubfolderSpec = 10; - files = ( - 4740184C23F5BE1C00A93C81 /* minizip.framework in Embed Frameworks */, - ); - name = "Embed Frameworks"; - runOnlyForDeploymentPostprocessing = 0; - }; 6726C2311A4C2BBD005EEA39 /* CopyFiles */ = { isa = PBXCopyFilesBuildPhase; buildActionMask = 2147483647; @@ -230,15 +163,6 @@ ); runOnlyForDeploymentPostprocessing = 1; }; - 6737465D1CF4639F005E6D1F /* CopyFiles */ = { - isa = PBXCopyFilesBuildPhase; - buildActionMask = 2147483647; - dstPath = /usr/share/man/man1/; - dstSubfolderSpec = 0; - files = ( - ); - runOnlyForDeploymentPostprocessing = 1; - }; 675341561A3F54D800A0A8C3 /* CopyFiles */ = { isa = PBXCopyFilesBuildPhase; buildActionMask = 2147483647; @@ -248,15 +172,6 @@ ); runOnlyForDeploymentPostprocessing = 1; }; - 6796245B1D100F2500AE4E3C /* CopyFiles */ = { - isa = PBXCopyFilesBuildPhase; - buildActionMask = 2147483647; - dstPath = /usr/share/man/man1/; - dstSubfolderSpec = 0; - files = ( - ); - runOnlyForDeploymentPostprocessing = 1; - }; /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ @@ -273,10 +188,8 @@ 34F558561DBF3CD800A4FC11 /* libstdc++.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = "libstdc++.tbd"; path = "usr/lib/libstdc++.tbd"; sourceTree = SDKROOT; }; 395784D2230303E700F2CC07 /* merge_collectors_tests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = merge_collectors_tests.cpp; sourceTree = ""; }; 395784D4230303E700F2CC07 /* metalines_tests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = metalines_tests.cpp; sourceTree = ""; }; - 395784D823030D4F00F2CC07 /* booking_addr_match.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = booking_addr_match.cpp; sourceTree = ""; }; 397057BD22CB57F8001A55CA /* cities_ids_tests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = cities_ids_tests.cpp; sourceTree = ""; }; 39B9681D23E1AC3700D3B8E3 /* libge0.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libge0.a; sourceTree = BUILT_PRODUCTS_DIR; }; - 39C4345122CE13F00002AEE3 /* booking_tests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = booking_tests.cpp; sourceTree = ""; }; 401E3188225C988500DE7EB8 /* libdescriptions.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libdescriptions.a; sourceTree = BUILT_PRODUCTS_DIR; }; 4491F490213D46380011834F /* speed_cameras_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = speed_cameras_test.cpp; sourceTree = ""; }; 4740184A23F5BE1B00A93C81 /* minizip.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = minizip.framework; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -323,7 +236,6 @@ 671ED3BB20D4098100D4317E /* restriction_collector_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = restriction_collector_test.cpp; sourceTree = ""; }; 671ED3BC20D4098100D4317E /* altitude_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = altitude_test.cpp; sourceTree = ""; }; 671ED3BD20D4098100D4317E /* road_access_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = road_access_test.cpp; sourceTree = ""; }; - 671ED3BE20D4098100D4317E /* sponsored_storage_tests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = sponsored_storage_tests.cpp; sourceTree = ""; }; 671ED3C620D40A2000D4317E /* libplatform_tests_support.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libplatform_tests_support.a; sourceTree = BUILT_PRODUCTS_DIR; }; 671ED3C820D40A3E00D4317E /* libgenerator_tests_support.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libgenerator_tests_support.a; sourceTree = BUILT_PRODUCTS_DIR; }; 671F58B71B86109B0032311E /* intermediate_data_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = intermediate_data_test.cpp; sourceTree = ""; }; @@ -335,8 +247,6 @@ 6726C1EC1A4C28D5005EEA39 /* triangles_tree_coding_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = triangles_tree_coding_test.cpp; sourceTree = ""; }; 6726C2351A4C2BBD005EEA39 /* generator_tests */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = generator_tests; sourceTree = BUILT_PRODUCTS_DIR; }; 6726C2401A4C2D9F005EEA39 /* testingmain.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = testingmain.cpp; path = ../../testing/testingmain.cpp; sourceTree = ""; }; - 6737465F1CF4639F005E6D1F /* booking_quality_check */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = booking_quality_check; sourceTree = BUILT_PRODUCTS_DIR; }; - 673746661CF4641B005E6D1F /* booking_quality_check.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = booking_quality_check.cpp; sourceTree = ""; }; 674A28C71B1C7FC9001A525C /* libexpat.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libexpat.a; path = "../../../omim-xcode-build/Debug/libexpat.a"; sourceTree = ""; }; 674A28C91B1C7FED001A525C /* libcoding.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libcoding.a; path = "../../../omim-xcode-build/Debug/libcoding.a"; sourceTree = ""; }; 674A28CA1B1C7FED001A525C /* libgenerator.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libgenerator.a; path = "../../../omim-xcode-build/Debug/libgenerator.a"; sourceTree = ""; }; @@ -362,7 +272,6 @@ 677E2A091CAAC771001DC42A /* libz.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = usr/lib/libz.tbd; sourceTree = SDKROOT; }; 677E2A0B1CAAC7CB001DC42A /* osm2meta_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = osm2meta_test.cpp; sourceTree = ""; }; 677E2A0C1CAAC7CB001DC42A /* tag_admixer_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = tag_admixer_test.cpp; sourceTree = ""; }; - 6796245D1D100F2500AE4E3C /* booking_addr_match */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = booking_addr_match; sourceTree = BUILT_PRODUCTS_DIR; }; 679624731D1012B700AE4E3C /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; }; 679624761D1012C700AE4E3C /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = System/Library/Frameworks/SystemConfiguration.framework; sourceTree = SDKROOT; }; 6796247C1D1012F500AE4E3C /* libopening_hours.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libopening_hours.a; path = "../../../omim-xcode-build/Debug/libopening_hours.a"; sourceTree = ""; }; @@ -423,34 +332,6 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - 6737465C1CF4639F005E6D1F /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - 3462FDA91DC1E31E00906FD7 /* libprotobuf.a in Frameworks */, - 3462FDA71DC1E30B00906FD7 /* libopening_hours.a in Frameworks */, - 3462FDA41DC1E2DA00906FD7 /* libeditor.a in Frameworks */, - E9502E301D2BD6E600CAB86B /* libz.tbd in Frameworks */, - 673746771CF47E83005E6D1F /* Cocoa.framework in Frameworks */, - 3462FDAA1DC1E32C00906FD7 /* libsearch.a in Frameworks */, - 6737466B1CF47D82005E6D1F /* libplatform.a in Frameworks */, - 673746711CF47E14005E6D1F /* librouting.a in Frameworks */, - 6737466D1CF47D82005E6D1F /* libgeometry.a in Frameworks */, - 3462FDA51DC1E2F300906FD7 /* liboauthcpp.a in Frameworks */, - 6737466F1CF47D82005E6D1F /* libexpat.a in Frameworks */, - 673746681CF47A7B005E6D1F /* libgflags.a in Frameworks */, - 673746731CF47E54005E6D1F /* libjansson.a in Frameworks */, - 3462FDAB1DC1E33400906FD7 /* libsuccinct.a in Frameworks */, - 673746761CF47E7F005E6D1F /* IOKit.framework in Frameworks */, - 673746691CF47BD9005E6D1F /* libgenerator.a in Frameworks */, - 6737466E1CF47D82005E6D1F /* libindexer.a in Frameworks */, - 673746751CF47E7A005E6D1F /* CoreFoundation.framework in Frameworks */, - 6737466C1CF47D82005E6D1F /* libcoding.a in Frameworks */, - 6737466A1CF47D82005E6D1F /* libbase.a in Frameworks */, - 3462FDA31DC1E2D600906FD7 /* libpugixml.a in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; 675341551A3F54D800A0A8C3 /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; @@ -499,43 +380,6 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - 6796245A1D100F2500AE4E3C /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - 679624CF1D11779700AE4E3C /* OpenGL.framework in Frameworks */, - 679624CD1D11775F00AE4E3C /* libagg.a in Frameworks */, - 679624CB1D11775F00AE4E3C /* librouting.a in Frameworks */, - 679624C11D11775300AE4E3C /* libdrape_frontend.a in Frameworks */, - 679624C21D11775300AE4E3C /* libdrape.a in Frameworks */, - 679624C31D11775300AE4E3C /* libfreetype.a in Frameworks */, - 679624C71D11775300AE4E3C /* libplatform_tests_support.a in Frameworks */, - 679624C81D11775300AE4E3C /* libsdf_image.a in Frameworks */, - 679624C91D11775300AE4E3C /* libstb_image.a in Frameworks */, - 679624B51D11773A00AE4E3C /* libmap.a in Frameworks */, - 6796249F1D1013AD00AE4E3C /* libsearch_tests_support.a in Frameworks */, - 4740184B23F5BE1B00A93C81 /* minizip.framework in Frameworks */, - 6796247E1D10130A00AE4E3C /* libz.tbd in Frameworks */, - 6796247D1D1012F500AE4E3C /* libopening_hours.a in Frameworks */, - 6796247B1D1012F500AE4E3C /* libprotobuf.a in Frameworks */, - 679624771D1012C700AE4E3C /* SystemConfiguration.framework in Frameworks */, - 679624751D1012BD00AE4E3C /* IOKit.framework in Frameworks */, - 679624741D1012B700AE4E3C /* Foundation.framework in Frameworks */, - 679624661D100F7C00AE4E3C /* libbase.a in Frameworks */, - 679624671D100F7C00AE4E3C /* libcoding.a in Frameworks */, - 679624681D100F7C00AE4E3C /* libexpat.a in Frameworks */, - 679624691D100F7C00AE4E3C /* libgenerator.a in Frameworks */, - 6796246A1D100F7C00AE4E3C /* libgeometry.a in Frameworks */, - 6796246B1D100F7C00AE4E3C /* libgflags.a in Frameworks */, - 6796246C1D100F7C00AE4E3C /* libindexer.a in Frameworks */, - 6796246D1D100F7C00AE4E3C /* libjansson.a in Frameworks */, - 6796246E1D100F7C00AE4E3C /* libplatform.a in Frameworks */, - 6796246F1D100F7C00AE4E3C /* libsearch.a in Frameworks */, - 679624701D100F7C00AE4E3C /* libstorage.a in Frameworks */, - 679624711D100F7C00AE4E3C /* libsuccinct.a in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ @@ -592,7 +436,6 @@ 56DAC34F239914C2000BC50D /* place_processor_tests.cpp */, 395784D2230303E700F2CC07 /* merge_collectors_tests.cpp */, 395784D4230303E700F2CC07 /* metalines_tests.cpp */, - 39C4345122CE13F00002AEE3 /* booking_tests.cpp */, 397057BD22CB57F8001A55CA /* cities_ids_tests.cpp */, 671C2D7F22AFDAB4008B2B8B /* brands_loader_test.cpp */, 671C2D7C22AFDAB4008B2B8B /* camera_collector_tests.cpp */, @@ -620,7 +463,6 @@ 67AB92B31B738DE800AB5194 /* source_data.cpp */, 67AB92B41B738DE800AB5194 /* source_data.hpp */, 674A39D21B727589001DDB91 /* source_to_element_test.cpp */, - 671ED3BE20D4098100D4317E /* sponsored_storage_tests.cpp */, 671ED3B920D4098000D4317E /* srtm_parser_test.cpp */, 677E2A0C1CAAC7CB001DC42A /* tag_admixer_test.cpp */, 6726C1EB1A4C28D5005EEA39 /* tesselator_test.cpp */, @@ -632,22 +474,11 @@ path = ../../generator/generator_tests; sourceTree = ""; }; - 6737465A1CF46324005E6D1F /* booking_quality_check */ = { - isa = PBXGroup; - children = ( - 395784D823030D4F00F2CC07 /* booking_addr_match.cpp */, - 673746661CF4641B005E6D1F /* booking_quality_check.cpp */, - ); - name = booking_quality_check; - path = ../../generator/booking_quality_check; - sourceTree = ""; - }; 6753414F1A3F54D800A0A8C3 = { isa = PBXGroup; children = ( 34F558531DBF3ACC00A4FC11 /* common-debug.xcconfig */, 34F558541DBF3ACC00A4FC11 /* common-release.xcconfig */, - 6737465A1CF46324005E6D1F /* booking_quality_check */, 6753453F1A3F6FA600A0A8C3 /* libs */, 6726C1D71A4C27A5005EEA39 /* generator_tests */, 6753415A1A3F54D800A0A8C3 /* generator_tool */, @@ -661,8 +492,6 @@ children = ( 675341581A3F54D800A0A8C3 /* generator_tool */, 6726C2351A4C2BBD005EEA39 /* generator_tests */, - 6737465F1CF4639F005E6D1F /* booking_quality_check */, - 6796245D1D100F2500AE4E3C /* booking_addr_match */, ); name = Products; sourceTree = ""; @@ -738,23 +567,6 @@ productReference = 6726C2351A4C2BBD005EEA39 /* generator_tests */; productType = "com.apple.product-type.tool"; }; - 6737465E1CF4639F005E6D1F /* booking_quality_check */ = { - isa = PBXNativeTarget; - buildConfigurationList = 673746631CF4639F005E6D1F /* Build configuration list for PBXNativeTarget "booking_quality_check" */; - buildPhases = ( - 6737465B1CF4639F005E6D1F /* Sources */, - 6737465C1CF4639F005E6D1F /* Frameworks */, - 6737465D1CF4639F005E6D1F /* CopyFiles */, - ); - buildRules = ( - ); - dependencies = ( - ); - name = booking_quality_check; - productName = booking_quality_check; - productReference = 6737465F1CF4639F005E6D1F /* booking_quality_check */; - productType = "com.apple.product-type.tool"; - }; 675341571A3F54D800A0A8C3 /* generator_tool */ = { isa = PBXNativeTarget; buildConfigurationList = 6753415F1A3F54D800A0A8C3 /* Build configuration list for PBXNativeTarget "generator_tool" */; @@ -773,24 +585,6 @@ productReference = 675341581A3F54D800A0A8C3 /* generator_tool */; productType = "com.apple.product-type.tool"; }; - 6796245C1D100F2500AE4E3C /* booking_addr_match */ = { - isa = PBXNativeTarget; - buildConfigurationList = 679624611D100F2500AE4E3C /* Build configuration list for PBXNativeTarget "booking_addr_match" */; - buildPhases = ( - 679624591D100F2500AE4E3C /* Sources */, - 6796245A1D100F2500AE4E3C /* Frameworks */, - 6796245B1D100F2500AE4E3C /* CopyFiles */, - 4740181D23F5BBAA00A93C81 /* Embed Frameworks */, - ); - buildRules = ( - ); - dependencies = ( - ); - name = booking_addr_match; - productName = booking_addr_match; - productReference = 6796245D1D100F2500AE4E3C /* booking_addr_match */; - productType = "com.apple.product-type.tool"; - }; /* End PBXNativeTarget section */ /* Begin PBXProject section */ @@ -799,15 +593,9 @@ attributes = { LastUpgradeCheck = 1240; TargetAttributes = { - 6737465E1CF4639F005E6D1F = { - CreatedOnToolsVersion = 7.3.1; - }; 675341571A3F54D800A0A8C3 = { CreatedOnToolsVersion = 6.1; }; - 6796245C1D100F2500AE4E3C = { - CreatedOnToolsVersion = 7.3.1; - }; }; }; buildConfigurationList = 675341531A3F54D800A0A8C3 /* Build configuration list for PBXProject "generator_tool" */; @@ -825,8 +613,6 @@ targets = ( 675341571A3F54D800A0A8C3 /* generator_tool */, 6726C21C1A4C2BBD005EEA39 /* generator_tests */, - 6737465E1CF4639F005E6D1F /* booking_quality_check */, - 6796245C1D100F2500AE4E3C /* booking_addr_match */, ); }; /* End PBXProject section */ @@ -850,7 +636,6 @@ 67AB92D61B75157700AB5194 /* tesselator_test.cpp in Sources */, 56DAC35C239914C2000BC50D /* cross_mwm_osm_ways_collector_tests.cpp in Sources */, 671ED3C420D4098100D4317E /* road_access_test.cpp in Sources */, - 39C4345222CE13F00002AEE3 /* booking_tests.cpp in Sources */, 4491F494213D6B470011834F /* speed_cameras_test.cpp in Sources */, 56829A4C2134238800A09A28 /* cities_boundaries_checker_tests.cpp in Sources */, 56DAC353239914C2000BC50D /* gen_mwm_info_tests.cpp in Sources */, @@ -865,7 +650,6 @@ 67AB92D21B75156B00AB5194 /* feature_merger_test.cpp in Sources */, 67AB92C31B73C29000AB5194 /* source_to_element_test.cpp in Sources */, 671C2D8622AFDAB4008B2B8B /* brands_loader_test.cpp in Sources */, - 671ED3C520D4098100D4317E /* sponsored_storage_tests.cpp in Sources */, 56DAC358239914C2000BC50D /* collector_routing_city_boundaries_tests.cpp in Sources */, 671C2D8222AFDAB4008B2B8B /* descriptions_section_builder_tests.cpp in Sources */, 56DAC355239914C2000BC50D /* collector_boundary_postcode_tests.cpp in Sources */, @@ -885,14 +669,6 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - 6737465B1CF4639F005E6D1F /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 673746671CF4641B005E6D1F /* booking_quality_check.cpp in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; 675341541A3F54D800A0A8C3 /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; @@ -903,14 +679,6 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - 679624591D100F2500AE4E3C /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 395784D923030D5000F2CC07 /* booking_addr_match.cpp in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; /* End PBXSourcesBuildPhase section */ /* Begin XCBuildConfiguration section */ @@ -941,22 +709,6 @@ }; name = Release; }; - 673746641CF4639F005E6D1F /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - CODE_SIGN_IDENTITY = "-"; - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = Debug; - }; - 673746651CF4639F005E6D1F /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - CODE_SIGN_IDENTITY = "-"; - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = Release; - }; 6753415D1A3F54D800A0A8C3 /* Debug */ = { isa = XCBuildConfiguration; baseConfigurationReference = 34F558531DBF3ACC00A4FC11 /* common-debug.xcconfig */; @@ -1005,72 +757,6 @@ }; name = Release; }; - 679624621D100F2500AE4E3C /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - CODE_SIGN_IDENTITY = "-"; - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = Debug; - }; - 679624631D100F2500AE4E3C /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - CODE_SIGN_IDENTITY = "-"; - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = Release; - }; - A8E541501F9FBD9900A1B8FA /* Production Full */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 34F558541DBF3ACC00A4FC11 /* common-release.xcconfig */; - buildSettings = { - CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; - HEADER_SEARCH_PATHS = ( - "$(inherited)", - "$(OMIM_ROOT)/3party/gflags/src/", - "$(OMIM_ROOT)/3party/glm", - "$(OMIM_ROOT)/3party/jansson/src", - ); - }; - name = "Production Full"; - }; - A8E541511F9FBD9900A1B8FA /* Production Full */ = { - isa = XCBuildConfiguration; - buildSettings = { - CODE_SIGN_IDENTITY = "-"; - GCC_INLINES_ARE_PRIVATE_EXTERN = NO; - GCC_PREFIX_HEADER = "$(OMIM_ROOT)/precompiled_headers.hpp"; - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = "Production Full"; - }; - A8E541521F9FBD9900A1B8FA /* Production Full */ = { - isa = XCBuildConfiguration; - buildSettings = { - CODE_SIGN_IDENTITY = "-"; - GCC_INLINES_ARE_PRIVATE_EXTERN = NO; - PRODUCT_NAME = generator_tests; - WARNING_CFLAGS = "-Wnull-conversion"; - }; - name = "Production Full"; - }; - A8E541531F9FBD9900A1B8FA /* Production Full */ = { - isa = XCBuildConfiguration; - buildSettings = { - CODE_SIGN_IDENTITY = "-"; - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = "Production Full"; - }; - A8E541541F9FBD9900A1B8FA /* Production Full */ = { - isa = XCBuildConfiguration; - buildSettings = { - CODE_SIGN_IDENTITY = "-"; - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = "Production Full"; - }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ @@ -1079,17 +765,6 @@ buildConfigurations = ( 6726C2331A4C2BBD005EEA39 /* Debug */, 6726C2341A4C2BBD005EEA39 /* Release */, - A8E541521F9FBD9900A1B8FA /* Production Full */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - 673746631CF4639F005E6D1F /* Build configuration list for PBXNativeTarget "booking_quality_check" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 673746641CF4639F005E6D1F /* Debug */, - 673746651CF4639F005E6D1F /* Release */, - A8E541531F9FBD9900A1B8FA /* Production Full */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -1099,7 +774,6 @@ buildConfigurations = ( 6753415D1A3F54D800A0A8C3 /* Debug */, 6753415E1A3F54D800A0A8C3 /* Release */, - A8E541501F9FBD9900A1B8FA /* Production Full */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -1109,17 +783,6 @@ buildConfigurations = ( 675341601A3F54D800A0A8C3 /* Debug */, 675341611A3F54D800A0A8C3 /* Release */, - A8E541511F9FBD9900A1B8FA /* Production Full */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - 679624611D100F2500AE4E3C /* Build configuration list for PBXNativeTarget "booking_addr_match" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 679624621D100F2500AE4E3C /* Debug */, - 679624631D100F2500AE4E3C /* Release */, - A8E541541F9FBD9900A1B8FA /* Production Full */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; diff --git a/xcode/geometry/geometry.xcodeproj/project.pbxproj b/xcode/geometry/geometry.xcodeproj/project.pbxproj index 725aa6b466..db855f42d5 100644 --- a/xcode/geometry/geometry.xcodeproj/project.pbxproj +++ b/xcode/geometry/geometry.xcodeproj/project.pbxproj @@ -692,37 +692,6 @@ }; name = Release; }; - A8E5414A1F9FBD8B00A1B8FA /* Production Full */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 34AF87CE1DBE517700E5E7DC /* common-release.xcconfig */; - buildSettings = { - CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; - }; - name = "Production Full"; - }; - A8E5414B1F9FBD8B00A1B8FA /* Production Full */ = { - isa = XCBuildConfiguration; - buildSettings = { - EXECUTABLE_PREFIX = lib; - GCC_PREFIX_HEADER = "$(OMIM_ROOT)/precompiled_headers.hpp"; - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = "Production Full"; - }; - A8E5414C1F9FBD8B00A1B8FA /* Production Full */ = { - isa = XCBuildConfiguration; - buildSettings = { - CODE_SIGN_IDENTITY = "-"; - GCC_PREPROCESSOR_DEFINITIONS = ( - "$(inherited)", - "OMIM_UNIT_TEST_DISABLE_PLATFORM_INIT=1", - ); - INFOPLIST_FILE = ""; - PRODUCT_BUNDLE_IDENTIFIER = maps.me.geometry_tests; - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = "Production Full"; - }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ @@ -731,7 +700,6 @@ buildConfigurations = ( 670F29611BA9D39A00F2ABF4 /* Debug */, 670F29621BA9D39A00F2ABF4 /* Release */, - A8E5414C1F9FBD8B00A1B8FA /* Production Full */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -741,7 +709,6 @@ buildConfigurations = ( 6753449A1A3F684600A0A8C3 /* Debug */, 6753449B1A3F684600A0A8C3 /* Release */, - A8E5414A1F9FBD8B00A1B8FA /* Production Full */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -751,7 +718,6 @@ buildConfigurations = ( 6753449D1A3F684600A0A8C3 /* Debug */, 6753449E1A3F684600A0A8C3 /* Release */, - A8E5414B1F9FBD8B00A1B8FA /* Production Full */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; diff --git a/xcode/gflags/gflags.xcodeproj/project.pbxproj b/xcode/gflags/gflags.xcodeproj/project.pbxproj index e35843356a..18dd004f44 100644 --- a/xcode/gflags/gflags.xcodeproj/project.pbxproj +++ b/xcode/gflags/gflags.xcodeproj/project.pbxproj @@ -182,27 +182,6 @@ }; name = Release; }; - A8E5411D1F9FBCE900A1B8FA /* Production Full */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 34F558611DBF434600A4FC11 /* common-release.xcconfig */; - buildSettings = { - CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; - GCC_WARN_INHIBIT_ALL_WARNINGS = YES; - HEADER_SEARCH_PATHS = ( - "$(inherited)", - "$(OMIM_ROOT)/3party/gflags/src", - ); - }; - name = "Production Full"; - }; - A8E5411E1F9FBCE900A1B8FA /* Production Full */ = { - isa = XCBuildConfiguration; - buildSettings = { - EXECUTABLE_PREFIX = lib; - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = "Production Full"; - }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ @@ -211,7 +190,6 @@ buildConfigurations = ( 675344361A3F64E400A0A8C3 /* Debug */, 675344371A3F64E400A0A8C3 /* Release */, - A8E5411D1F9FBCE900A1B8FA /* Production Full */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -221,7 +199,6 @@ buildConfigurations = ( 675344391A3F64E400A0A8C3 /* Debug */, 6753443A1A3F64E400A0A8C3 /* Release */, - A8E5411E1F9FBCE900A1B8FA /* Production Full */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; diff --git a/xcode/icu/icu.xcodeproj/project.pbxproj b/xcode/icu/icu.xcodeproj/project.pbxproj index 2e364e428a..7091179615 100644 --- a/xcode/icu/icu.xcodeproj/project.pbxproj +++ b/xcode/icu/icu.xcodeproj/project.pbxproj @@ -2511,39 +2511,6 @@ /* End PBXSourcesBuildPhase section */ /* Begin XCBuildConfiguration section */ - A8E541041F9FBBF800A1B8FA /* Production Full */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = BBB16C1B1E8276A50058BF1E /* common-release.xcconfig */; - buildSettings = { - CLANG_ENABLE_MODULES = NO; - CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; - GCC_PREPROCESSOR_DEFINITIONS = ( - "$(inherited)", - "U_I18N_IMPLEMENTATION=1", - "U_COMMON_IMPLEMENTATION=1", - "U_STATIC_IMPLEMENTATION=1", - "U_CHARSET_IS_UTF8=1", - "U_DISABLE_RENAMING=1", - ); - GCC_WARN_INHIBIT_ALL_WARNINGS = YES; - HEADER_SEARCH_PATHS = ( - "$(inherited)", - "$(OMIM_ROOT)", - "$(BOOST_ROOT)", - "$(OMIM_ROOT)/3party/icu/i18n", - "$(OMIM_ROOT)/3party/icu/common", - ); - }; - name = "Production Full"; - }; - A8E541051F9FBBF800A1B8FA /* Production Full */ = { - isa = XCBuildConfiguration; - buildSettings = { - EXECUTABLE_PREFIX = lib; - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = "Production Full"; - }; BBB165E01E8275120058BF1E /* Debug */ = { isa = XCBuildConfiguration; baseConfigurationReference = BBB16C1A1E8276A50058BF1E /* common-debug.xcconfig */; @@ -2618,7 +2585,6 @@ buildConfigurations = ( BBB165E01E8275120058BF1E /* Debug */, BBB165E11E8275120058BF1E /* Release */, - A8E541041F9FBBF800A1B8FA /* Production Full */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -2628,7 +2594,6 @@ buildConfigurations = ( BBB165E31E8275120058BF1E /* Debug */, BBB165E41E8275120058BF1E /* Release */, - A8E541051F9FBBF800A1B8FA /* Production Full */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; diff --git a/xcode/indexer/indexer.xcodeproj/project.pbxproj b/xcode/indexer/indexer.xcodeproj/project.pbxproj index 291bdbdcc0..17b2c6522b 100644 --- a/xcode/indexer/indexer.xcodeproj/project.pbxproj +++ b/xcode/indexer/indexer.xcodeproj/project.pbxproj @@ -1151,38 +1151,6 @@ }; name = Release; }; - A8E541551F9FBDA300A1B8FA /* Production Full */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 34AF87D21DBE540700E5E7DC /* common-release.xcconfig */; - buildSettings = { - CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; - HEADER_SEARCH_PATHS = ( - "$(inherited)", - "$(OMIM_ROOT)/3party/protobuf/protobuf/src", - ); - }; - name = "Production Full"; - }; - A8E541561F9FBDA300A1B8FA /* Production Full */ = { - isa = XCBuildConfiguration; - buildSettings = { - EXECUTABLE_PREFIX = lib; - GCC_PREFIX_HEADER = "$(OMIM_ROOT)/precompiled_headers.hpp"; - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = "Production Full"; - }; - A8E541581F9FBDA300A1B8FA /* Production Full */ = { - isa = XCBuildConfiguration; - buildSettings = { - CODE_SIGN_IDENTITY = "-"; - GCC_INLINES_ARE_PRIVATE_EXTERN = NO; - INFOPLIST_FILE = ""; - PRODUCT_BUNDLE_IDENTIFIER = "maps.me.indexer-tests"; - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = "Production Full"; - }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ @@ -1191,7 +1159,6 @@ buildConfigurations = ( 670C612A1AB0661100C38A8C /* Debug */, 670C612B1AB0661100C38A8C /* Release */, - A8E541581F9FBDA300A1B8FA /* Production Full */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -1201,7 +1168,6 @@ buildConfigurations = ( 675340A31A3F53CB00A0A8C3 /* Debug */, 675340A41A3F53CB00A0A8C3 /* Release */, - A8E541551F9FBDA300A1B8FA /* Production Full */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -1211,7 +1177,6 @@ buildConfigurations = ( 675340A61A3F53CB00A0A8C3 /* Debug */, 675340A71A3F53CB00A0A8C3 /* Release */, - A8E541561F9FBDA300A1B8FA /* Production Full */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; diff --git a/xcode/jansson/jansson.xcodeproj/project.pbxproj b/xcode/jansson/jansson.xcodeproj/project.pbxproj index c5d048088d..5adc8235cf 100644 --- a/xcode/jansson/jansson.xcodeproj/project.pbxproj +++ b/xcode/jansson/jansson.xcodeproj/project.pbxproj @@ -262,27 +262,6 @@ }; name = Release; }; - A8E5411F1F9FBCF500A1B8FA /* Production Full */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 34F558691DBF483000A4FC11 /* common-release.xcconfig */; - buildSettings = { - CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; - GCC_WARN_INHIBIT_ALL_WARNINGS = YES; - HEADER_SEARCH_PATHS = ( - "$(inherited)", - "$(OMIM_ROOT)/3party/jansson/src", - ); - }; - name = "Production Full"; - }; - A8E541201F9FBCF500A1B8FA /* Production Full */ = { - isa = XCBuildConfiguration; - buildSettings = { - EXECUTABLE_PREFIX = lib; - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = "Production Full"; - }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ @@ -291,7 +270,6 @@ buildConfigurations = ( 675344561A3F664300A0A8C3 /* Debug */, 675344571A3F664300A0A8C3 /* Release */, - A8E5411F1F9FBCF500A1B8FA /* Production Full */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -301,7 +279,6 @@ buildConfigurations = ( 675344591A3F664300A0A8C3 /* Debug */, 6753445A1A3F664300A0A8C3 /* Release */, - A8E541201F9FBCF500A1B8FA /* Production Full */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; diff --git a/xcode/kml/kml.xcodeproj/project.pbxproj b/xcode/kml/kml.xcodeproj/project.pbxproj index 6384955c59..acf0721541 100644 --- a/xcode/kml/kml.xcodeproj/project.pbxproj +++ b/xcode/kml/kml.xcodeproj/project.pbxproj @@ -327,21 +327,6 @@ }; name = Release; }; - 45E4558B205849F400D9F45E /* Production Full */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 45E45589205849DC00D9F45E /* common-release.xcconfig */; - buildSettings = { - CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; - }; - name = "Production Full"; - }; - 45E4558C205849F400D9F45E /* Production Full */ = { - isa = XCBuildConfiguration; - buildSettings = { - GCC_PREFIX_HEADER = "$(OMIM_ROOT)/precompiled_headers.hpp"; - }; - name = "Production Full"; - }; 45E455FC20584DCC00D9F45E /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { @@ -358,14 +343,6 @@ }; name = Release; }; - 45E455FE20584DCC00D9F45E /* Production Full */ = { - isa = XCBuildConfiguration; - buildSettings = { - CODE_SIGN_IDENTITY = "-"; - INFOPLIST_FILE = ""; - }; - name = "Production Full"; - }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ @@ -374,7 +351,6 @@ buildConfigurations = ( 45E45584205849A600D9F45E /* Debug */, 45E45585205849A600D9F45E /* Release */, - 45E4558B205849F400D9F45E /* Production Full */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -384,7 +360,6 @@ buildConfigurations = ( 45E45587205849A600D9F45E /* Debug */, 45E45588205849A600D9F45E /* Release */, - 45E4558C205849F400D9F45E /* Production Full */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -394,7 +369,6 @@ buildConfigurations = ( 45E455FC20584DCC00D9F45E /* Debug */, 45E455FD20584DCC00D9F45E /* Release */, - 45E455FE20584DCC00D9F45E /* Production Full */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; diff --git a/xcode/map/map.xcodeproj/project.pbxproj b/xcode/map/map.xcodeproj/project.pbxproj index b9f308927d..a322b5074e 100644 --- a/xcode/map/map.xcodeproj/project.pbxproj +++ b/xcode/map/map.xcodeproj/project.pbxproj @@ -25,7 +25,6 @@ 3D0BBAE723F3EF2700A50354 /* libvulkan_wrapper.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3D0BBAE623F3EF2700A50354 /* libvulkan_wrapper.a */; }; 3D0BBAE923F3EF4B00A50354 /* CoreLocation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3D0BBAE823F3EF4B00A50354 /* CoreLocation.framework */; }; 3D0BBAEB23F3EF9D00A50354 /* libdescriptions.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3D0BBAEA23F3EF9D00A50354 /* libdescriptions.a */; }; - 3D0BBAED23F3EFBC00A50354 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3D0BBAEC23F3EFBC00A50354 /* Security.framework */; }; 3D47B2C71F20EF06000828D2 /* displayed_categories_modifiers.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3D47B2C51F20EF06000828D2 /* displayed_categories_modifiers.cpp */; }; 3D47B2C81F20EF06000828D2 /* displayed_categories_modifiers.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3D47B2C61F20EF06000828D2 /* displayed_categories_modifiers.hpp */; }; 3D4E99821FB462B60025B48C /* everywhere_search_params.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3D4E99801FB462B60025B48C /* everywhere_search_params.hpp */; }; @@ -85,7 +84,7 @@ 45F6EE9E1FB1C77600019892 /* mwm_tree.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 45F6EE9B1FB1C77500019892 /* mwm_tree.hpp */; }; 45F6EE9F1FB1C77600019892 /* search_api.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 45F6EE9C1FB1C77500019892 /* search_api.cpp */; }; 4740185423F5BE8A00A93C81 /* minizip.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4740185323F5BE8A00A93C81 /* minizip.framework */; }; - 4740185523F5BE8B00A93C81 /* minizip.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 4740185323F5BE8A00A93C81 /* minizip.framework */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; }; + 4740185523F5BE8B00A93C81 /* minizip.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 4740185323F5BE8A00A93C81 /* minizip.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 475BD61B211C5FDC00E298C6 /* libshaders.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 475BD61A211C5FDC00E298C6 /* libshaders.a */; }; 47A9D82220A19E9E00E4671B /* libopen_location_code.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 47A9D82120A19E9E00E4671B /* libopen_location_code.a */; }; 47A9D82420A19EC300E4671B /* libkml.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 47A9D82320A19EC300E4671B /* libkml.a */; }; @@ -469,7 +468,6 @@ 56DAC37223992491000BC50D /* libweb_api.a in Frameworks */, 56DAC3702399248B000BC50D /* libdescriptions.a in Frameworks */, 56DAC36E23992467000BC50D /* libvulkan_wrapper.a in Frameworks */, - 3D0BBAED23F3EFBC00A50354 /* Security.framework in Frameworks */, 3D0BBAEB23F3EF9D00A50354 /* libdescriptions.a in Frameworks */, 3D0BBAE923F3EF4B00A50354 /* CoreLocation.framework in Frameworks */, 3D0BBAE723F3EF2700A50354 /* libvulkan_wrapper.a in Frameworks */, @@ -920,7 +918,7 @@ 675345B31A4054AD00A0A8C3 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0700; + LastUpgradeCheck = 1250; TargetAttributes = { 3DA571D720C1921D007BDE27 = { CreatedOnToolsVersion = 9.3.1; @@ -935,10 +933,9 @@ }; buildConfigurationList = 675345B61A4054AD00A0A8C3 /* Build configuration list for PBXProject "map" */; compatibilityVersion = "Xcode 12.0"; - developmentRegion = English; + developmentRegion = en; hasScannedForEncodings = 0; knownRegions = ( - English, en, Base, ); @@ -1047,6 +1044,7 @@ 3DA571EB20C1921E007BDE27 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + CODE_SIGN_IDENTITY = "-"; PRODUCT_BUNDLE_IDENTIFIER = "maps.me.map-integration-tests"; PRODUCT_NAME = "$(TARGET_NAME)"; }; @@ -1055,22 +1053,16 @@ 3DA571EC20C1921E007BDE27 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + CODE_SIGN_IDENTITY = "-"; PRODUCT_BUNDLE_IDENTIFIER = "maps.me.map-integration-tests"; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Release; }; - 3DA571ED20C1921E007BDE27 /* Production Full */ = { - isa = XCBuildConfiguration; - buildSettings = { - PRODUCT_BUNDLE_IDENTIFIER = "maps.me.map-integration-tests"; - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = "Production Full"; - }; 674A29E41B26FD1C001A525C /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + CODE_SIGN_IDENTITY = "-"; GCC_PREPROCESSOR_DEFINITIONS = ( "$(inherited)", "OMIM_UNIT_TEST_WITH_QT_EVENT_LOOP=1", @@ -1088,6 +1080,7 @@ 674A29E51B26FD1C001A525C /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + CODE_SIGN_IDENTITY = "-"; GCC_PREPROCESSOR_DEFINITIONS = ( "$(inherited)", "OMIM_UNIT_TEST_WITH_QT_EVENT_LOOP=1", @@ -1106,6 +1099,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = 34AF87E91DBE5AD000E5E7DC /* common-debug.xcconfig */; buildSettings = { + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; EXCLUDED_SOURCE_FILE_NAMES = ""; "EXCLUDED_SOURCE_FILE_NAMES[sdk=iphoneos*]" = "qgl_render_context.*"; "EXCLUDED_SOURCE_FILE_NAMES[sdk=iphonesimulator*]" = "qgl_render_context.*"; @@ -1125,6 +1119,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = 34AF87EA1DBE5AD000E5E7DC /* common-release.xcconfig */; buildSettings = { + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; EXCLUDED_SOURCE_FILE_NAMES = ""; "EXCLUDED_SOURCE_FILE_NAMES[sdk=iphoneos*]" = "qgl_render_context.*"; "EXCLUDED_SOURCE_FILE_NAMES[sdk=iphonesimulator*]" = "qgl_render_context.*"; @@ -1160,52 +1155,6 @@ }; name = Release; }; - A8E541591F9FBDAC00A1B8FA /* Production Full */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 34AF87EA1DBE5AD000E5E7DC /* common-release.xcconfig */; - buildSettings = { - EXCLUDED_SOURCE_FILE_NAMES = ""; - "EXCLUDED_SOURCE_FILE_NAMES[sdk=iphoneos*]" = "qgl_render_context.*"; - "EXCLUDED_SOURCE_FILE_NAMES[sdk=iphonesimulator*]" = "qgl_render_context.*"; - HEADER_SEARCH_PATHS = ( - "$(inherited)", - "$(QT_PATH)/include", - "$(OMIM_ROOT)/3party/freetype/include", - "$(OMIM_ROOT)/3party/expat/lib", - "$(OMIM_ROOT)/3party/glm", - "$(OMIM_ROOT)/3party/jansson/src", - "$(OMIM_ROOT)/3party/protobuf/protobuf/src", - ); - }; - name = "Production Full"; - }; - A8E5415A1F9FBDAC00A1B8FA /* Production Full */ = { - isa = XCBuildConfiguration; - buildSettings = { - EXECUTABLE_PREFIX = lib; - GCC_PREFIX_HEADER = "$(OMIM_ROOT)/precompiled_headers.hpp"; - PRODUCT_NAME = "$(TARGET_NAME)"; - WARNING_CFLAGS = "-Wno-deprecated-register "; - }; - name = "Production Full"; - }; - A8E5415B1F9FBDAC00A1B8FA /* Production Full */ = { - isa = XCBuildConfiguration; - buildSettings = { - GCC_PREPROCESSOR_DEFINITIONS = ( - "$(inherited)", - "OMIM_UNIT_TEST_WITH_QT_EVENT_LOOP=1", - ); - INFOPLIST_FILE = ""; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/../Frameworks", - ); - PRODUCT_BUNDLE_IDENTIFIER = maps.me.map_tests; - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = "Production Full"; - }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ @@ -1214,7 +1163,6 @@ buildConfigurations = ( 3DA571EB20C1921E007BDE27 /* Debug */, 3DA571EC20C1921E007BDE27 /* Release */, - 3DA571ED20C1921E007BDE27 /* Production Full */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -1224,7 +1172,6 @@ buildConfigurations = ( 674A29E41B26FD1C001A525C /* Debug */, 674A29E51B26FD1C001A525C /* Release */, - A8E5415B1F9FBDAC00A1B8FA /* Production Full */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -1234,7 +1181,6 @@ buildConfigurations = ( 675345C41A4054AD00A0A8C3 /* Debug */, 675345C51A4054AD00A0A8C3 /* Release */, - A8E541591F9FBDAC00A1B8FA /* Production Full */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -1244,7 +1190,6 @@ buildConfigurations = ( 675345C71A4054AD00A0A8C3 /* Debug */, 675345C81A4054AD00A0A8C3 /* Release */, - A8E5415A1F9FBDAC00A1B8FA /* Production Full */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; diff --git a/xcode/mapshot/mapshot.xcodeproj/project.pbxproj b/xcode/mapshot/mapshot.xcodeproj/project.pbxproj index 58d542d746..97a3d2e7f4 100644 --- a/xcode/mapshot/mapshot.xcodeproj/project.pbxproj +++ b/xcode/mapshot/mapshot.xcodeproj/project.pbxproj @@ -349,27 +349,6 @@ }; name = Release; }; - A8E5415C1F9FBDB300A1B8FA /* Production Full */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 3475E0E01DBF57AC004C7E69 /* common-release.xcconfig */; - buildSettings = { - CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; - HEADER_SEARCH_PATHS = ( - "$(inherited)", - "$(OMIM_ROOT)/3party/glm", - "$(OMIM_ROOT)/3party/gflags/src/", - ); - }; - name = "Production Full"; - }; - A8E5415D1F9FBDB300A1B8FA /* Production Full */ = { - isa = XCBuildConfiguration; - buildSettings = { - CODE_SIGN_IDENTITY = "-"; - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = "Production Full"; - }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ @@ -378,7 +357,6 @@ buildConfigurations = ( 675D21361BFB6F3D00717E4F /* Debug */, 675D21371BFB6F3D00717E4F /* Release */, - A8E5415C1F9FBDB300A1B8FA /* Production Full */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -388,7 +366,6 @@ buildConfigurations = ( 675D21391BFB6F3D00717E4F /* Debug */, 675D213A1BFB6F3D00717E4F /* Release */, - A8E5415D1F9FBDB300A1B8FA /* Production Full */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; diff --git a/xcode/minizip/minizip.xcodeproj/project.pbxproj b/xcode/minizip/minizip.xcodeproj/project.pbxproj index 9e3bf8a017..b9f4fc56f5 100644 --- a/xcode/minizip/minizip.xcodeproj/project.pbxproj +++ b/xcode/minizip/minizip.xcodeproj/project.pbxproj @@ -144,11 +144,11 @@ }; buildConfigurationList = 671F59071B87568D0032311E /* Build configuration list for PBXProject "minizip" */; compatibilityVersion = "Xcode 3.2"; - developmentRegion = English; + developmentRegion = en; hasScannedForEncodings = 0; knownRegions = ( - English, en, + Base, ); mainGroup = 671F59031B87568D0032311E; productRefGroup = 671F590D1B87568D0032311E /* Products */; @@ -195,28 +195,8 @@ CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; CLANG_ENABLE_OBJC_WEAK = YES; - CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_COMMA = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INFINITE_RECURSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; - CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; - CLANG_WARN_STRICT_PROTOTYPES = YES; - CLANG_WARN_SUSPICIOUS_MOVE = YES; - CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CODE_SIGN_STYLE = Automatic; - COPY_PHASE_STRIP = NO; CURRENT_PROJECT_VERSION = 1; DEBUG_INFORMATION_FORMAT = dwarf; DEFINES_MODULE = YES; @@ -224,26 +204,13 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; - ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; GCC_DYNAMIC_NO_PIC = NO; GCC_NO_COMMON_BLOCKS = YES; GCC_OPTIMIZATION_LEVEL = 0; - GCC_PREPROCESSOR_DEFINITIONS = ( - "DEBUG=1", - "$(inherited)", - ); - 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; INFOPLIST_FILE = minizip_framework/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; - MTL_FAST_MATH = YES; ONLY_ACTIVE_ARCH = YES; PRODUCT_BUNDLE_IDENTIFIER = "com.mapswithme.minizip-ios"; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; @@ -265,28 +232,8 @@ CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; CLANG_ENABLE_OBJC_WEAK = YES; - CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_COMMA = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INFINITE_RECURSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; - CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; - CLANG_WARN_STRICT_PROTOTYPES = YES; - CLANG_WARN_SUSPICIOUS_MOVE = YES; - CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CODE_SIGN_STYLE = Automatic; - COPY_PHASE_STRIP = NO; CURRENT_PROJECT_VERSION = 1; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEFINES_MODULE = YES; @@ -294,20 +241,10 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; - ENABLE_NS_ASSERTIONS = NO; - ENABLE_STRICT_OBJC_MSGSEND = YES; 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; INFOPLIST_FILE = minizip_framework/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - MTL_ENABLE_DEBUG_INFO = NO; - MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = "com.mapswithme.minizip-ios"; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; SDKROOT = iphoneos; @@ -319,70 +256,6 @@ }; name = Release; }; - 474017FD23F5B2CE00A93C81 /* Production Full */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_ANALYZER_NONNULL = YES; - CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_ENABLE_OBJC_WEAK = YES; - CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_COMMA = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INFINITE_RECURSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; - CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; - CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; - CLANG_WARN_STRICT_PROTOTYPES = YES; - CLANG_WARN_SUSPICIOUS_MOVE = YES; - CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - CODE_SIGN_STYLE = Automatic; - COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 1; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - DEFINES_MODULE = YES; - DEVELOPMENT_TEAM = ""; - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; - DYLIB_INSTALL_NAME_BASE = "@rpath"; - ENABLE_NS_ASSERTIONS = NO; - ENABLE_STRICT_OBJC_MSGSEND = YES; - 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; - INFOPLIST_FILE = minizip_framework/Info.plist; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - MTL_ENABLE_DEBUG_INFO = NO; - MTL_FAST_MATH = YES; - PRODUCT_BUNDLE_IDENTIFIER = "com.mapswithme.minizip-ios"; - PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; - SDKROOT = iphoneos; - SKIP_INSTALL = YES; - TARGETED_DEVICE_FAMILY = "1,2"; - VALIDATE_PRODUCT = YES; - VERSIONING_SYSTEM = "apple-generic"; - VERSION_INFO_PREFIX = ""; - }; - name = "Production Full"; - }; 671F590E1B87568D0032311E /* Debug */ = { isa = XCBuildConfiguration; baseConfigurationReference = 34EBB47C1DBF525A005BE9B8 /* common-debug.xcconfig */; @@ -411,20 +284,6 @@ }; name = Release; }; - A8E541211F9FBCFE00A1B8FA /* Production Full */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 34EBB47D1DBF525A005BE9B8 /* common-release.xcconfig */; - buildSettings = { - CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; - GCC_PREPROCESSOR_DEFINITIONS = ( - "$(inherited)", - "NOCRYPT=1", - ); - GCC_SYMBOLS_PRIVATE_EXTERN = NO; - GCC_WARN_INHIBIT_ALL_WARNINGS = YES; - }; - name = "Production Full"; - }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ @@ -433,7 +292,6 @@ buildConfigurations = ( 474017FB23F5B2CE00A93C81 /* Debug */, 474017FC23F5B2CE00A93C81 /* Release */, - 474017FD23F5B2CE00A93C81 /* Production Full */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -443,7 +301,6 @@ buildConfigurations = ( 671F590E1B87568D0032311E /* Debug */, 671F590F1B87568D0032311E /* Release */, - A8E541211F9FBCFE00A1B8FA /* Production Full */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; diff --git a/xcode/mwm_diff/mwm_diff.xcodeproj/project.pbxproj b/xcode/mwm_diff/mwm_diff.xcodeproj/project.pbxproj index 95e14b316e..4bc80363e9 100644 --- a/xcode/mwm_diff/mwm_diff.xcodeproj/project.pbxproj +++ b/xcode/mwm_diff/mwm_diff.xcodeproj/project.pbxproj @@ -167,23 +167,6 @@ }; name = Release; }; - A8E540FA1F9FBB3400A1B8FA /* Production Full */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 4586D0E11F48132A00DF9CE5 /* common-release.xcconfig */; - buildSettings = { - CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; - }; - name = "Production Full"; - }; - A8E540FB1F9FBB3400A1B8FA /* Production Full */ = { - isa = XCBuildConfiguration; - buildSettings = { - EXECUTABLE_PREFIX = lib; - GCC_PREFIX_HEADER = "$(OMIM_ROOT)/precompiled_headers.hpp"; - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = "Production Full"; - }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ @@ -192,7 +175,6 @@ buildConfigurations = ( 4586D0DB1F48130600DF9CE5 /* Debug */, 4586D0DC1F48130600DF9CE5 /* Release */, - A8E540FA1F9FBB3400A1B8FA /* Production Full */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -202,7 +184,6 @@ buildConfigurations = ( 4586D0DE1F48130600DF9CE5 /* Debug */, 4586D0DF1F48130600DF9CE5 /* Release */, - A8E540FB1F9FBB3400A1B8FA /* Production Full */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; diff --git a/xcode/oauthcpp/oauthcpp.xcodeproj/project.pbxproj b/xcode/oauthcpp/oauthcpp.xcodeproj/project.pbxproj index 4344e725b7..b232a06f78 100644 --- a/xcode/oauthcpp/oauthcpp.xcodeproj/project.pbxproj +++ b/xcode/oauthcpp/oauthcpp.xcodeproj/project.pbxproj @@ -206,27 +206,6 @@ }; name = Release; }; - A8E541231F9FBD0600A1B8FA /* Production Full */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 34F558711DBF4AB300A4FC11 /* common-release.xcconfig */; - buildSettings = { - CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; - GCC_WARN_INHIBIT_ALL_WARNINGS = YES; - HEADER_SEARCH_PATHS = ( - "$(inherited)", - "$(OMIM_ROOT)/3party/liboauthcpp/include", - ); - }; - name = "Production Full"; - }; - A8E541241F9FBD0600A1B8FA /* Production Full */ = { - isa = XCBuildConfiguration; - buildSettings = { - EXECUTABLE_PREFIX = lib; - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = "Production Full"; - }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ @@ -235,7 +214,6 @@ buildConfigurations = ( 340C20F11C3E5E5000111D22 /* Debug */, 340C20F21C3E5E5000111D22 /* Release */, - A8E541231F9FBD0600A1B8FA /* Production Full */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -245,7 +223,6 @@ buildConfigurations = ( 340C20F41C3E5E5000111D22 /* Debug */, 340C20F51C3E5E5000111D22 /* Release */, - A8E541241F9FBD0600A1B8FA /* Production Full */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; diff --git a/xcode/open_location_code/open_location_code.xcodeproj/project.pbxproj b/xcode/open_location_code/open_location_code.xcodeproj/project.pbxproj index 50722e3a03..e03fab8b6b 100644 --- a/xcode/open_location_code/open_location_code.xcodeproj/project.pbxproj +++ b/xcode/open_location_code/open_location_code.xcodeproj/project.pbxproj @@ -114,7 +114,7 @@ 1D5F8AA4207616D300CAADFC /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 1240; + LastUpgradeCheck = 1250; TargetAttributes = { 1D5F8AAB207616D300CAADFC = { CreatedOnToolsVersion = 9.2; @@ -153,22 +153,6 @@ /* End PBXSourcesBuildPhase section */ /* Begin XCBuildConfiguration section */ - 1D5C088120764D3900EFC411 /* Production Full */ = { - isa = XCBuildConfiguration; - buildSettings = { - SKIP_INSTALL = YES; - }; - name = "Production Full"; - }; - 1D5C088220764D3900EFC411 /* Production Full */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 1D5F8AC42076182E00CAADFC /* common-release.xcconfig */; - buildSettings = { - GCC_WARN_INHIBIT_ALL_WARNINGS = YES; - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = "Production Full"; - }; 1D5F8AB3207616D300CAADFC /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { @@ -209,7 +193,6 @@ buildConfigurations = ( 1D5F8AB3207616D300CAADFC /* Debug */, 1D5F8AB4207616D300CAADFC /* Release */, - 1D5C088120764D3900EFC411 /* Production Full */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -219,7 +202,6 @@ buildConfigurations = ( 1D5F8AB6207616D300CAADFC /* Debug */, 1D5F8AB7207616D300CAADFC /* Release */, - 1D5C088220764D3900EFC411 /* Production Full */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; diff --git a/xcode/opening_hours/opening_hours.xcodeproj/project.pbxproj b/xcode/opening_hours/opening_hours.xcodeproj/project.pbxproj index 808d32039d..7baf19c610 100644 --- a/xcode/opening_hours/opening_hours.xcodeproj/project.pbxproj +++ b/xcode/opening_hours/opening_hours.xcodeproj/project.pbxproj @@ -533,70 +533,6 @@ }; name = Release; }; - A8E541251F9FBD0F00A1B8FA /* Production Full */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 34F558651DBF460300A4FC11 /* common-release.xcconfig */; - buildSettings = { - CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; - GCC_WARN_INHIBIT_ALL_WARNINGS = YES; - }; - name = "Production Full"; - }; - A8E541261F9FBD0F00A1B8FA /* Production Full */ = { - isa = XCBuildConfiguration; - buildSettings = { - COMBINE_HIDPI_IMAGES = YES; - EXECUTABLE_PREFIX = lib; - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = "Production Full"; - }; - A8E541271F9FBD0F00A1B8FA /* Production Full */ = { - isa = XCBuildConfiguration; - buildSettings = { - CODE_SIGN_IDENTITY = "-"; - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = "Production Full"; - }; - A8E541281F9FBD0F00A1B8FA /* Production Full */ = { - isa = XCBuildConfiguration; - buildSettings = { - CODE_SIGN_IDENTITY = "-"; - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = "Production Full"; - }; - A8E541291F9FBD0F00A1B8FA /* Production Full */ = { - isa = XCBuildConfiguration; - buildSettings = { - CODE_SIGN_IDENTITY = "-"; - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = "Production Full"; - }; - A8E5412A1F9FBD0F00A1B8FA /* Production Full */ = { - isa = XCBuildConfiguration; - buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - CODE_SIGN_IDENTITY = "-"; - INFOPLIST_FILE = opening_hours_tests_ios/Info.plist; - PRODUCT_BUNDLE_IDENTIFIER = opening_hours_tests_ios; - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = "Production Full"; - }; - A8E5412B1F9FBD0F00A1B8FA /* Production Full */ = { - isa = XCBuildConfiguration; - buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - CODE_SIGN_IDENTITY = "-"; - INFOPLIST_FILE = opening_hours_integration_tests_ios/Info.plist; - PRODUCT_BUNDLE_IDENTIFIER = opening_hours_integration_tests_ios; - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = "Production Full"; - }; E91738B81BECD02B00717F6E /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { @@ -681,7 +617,6 @@ buildConfigurations = ( 670C61F01AC3511700C38A8C /* Debug */, 670C61F11AC3511700C38A8C /* Release */, - A8E541251F9FBD0F00A1B8FA /* Production Full */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -691,7 +626,6 @@ buildConfigurations = ( 670C61F31AC3511700C38A8C /* Debug */, 670C61F41AC3511700C38A8C /* Release */, - A8E541261F9FBD0F00A1B8FA /* Production Full */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -701,7 +635,6 @@ buildConfigurations = ( 670C62041AC351AC00C38A8C /* Debug */, 670C62051AC351AC00C38A8C /* Release */, - A8E541271F9FBD0F00A1B8FA /* Production Full */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -711,7 +644,6 @@ buildConfigurations = ( E91738B81BECD02B00717F6E /* Debug */, E91738B91BECD02B00717F6E /* Release */, - A8E541281F9FBD0F00A1B8FA /* Production Full */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -721,7 +653,6 @@ buildConfigurations = ( E91738C51BECD08500717F6E /* Debug */, E91738C61BECD08500717F6E /* Release */, - A8E541291F9FBD0F00A1B8FA /* Production Full */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -731,7 +662,6 @@ buildConfigurations = ( E91738FA1BECD36F00717F6E /* Debug */, E91738FB1BECD36F00717F6E /* Release */, - A8E5412A1F9FBD0F00A1B8FA /* Production Full */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -741,7 +671,6 @@ buildConfigurations = ( E917391D1BECD60000717F6E /* Debug */, E917391E1BECD60000717F6E /* Release */, - A8E5412B1F9FBD0F00A1B8FA /* Production Full */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; diff --git a/xcode/openlr/openlr.xcodeproj/project.pbxproj b/xcode/openlr/openlr.xcodeproj/project.pbxproj index 8b89ee5236..6a34325154 100644 --- a/xcode/openlr/openlr.xcodeproj/project.pbxproj +++ b/xcode/openlr/openlr.xcodeproj/project.pbxproj @@ -300,29 +300,6 @@ }; name = Release; }; - A8E5415E1F9FBDBA00A1B8FA /* Production Full */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 671E79201E6A503F00B2859B /* common-release.xcconfig */; - buildSettings = { - CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; - HEADER_SEARCH_PATHS = ( - "$(inherited)", - "$(OMIM_ROOT)", - "$(BOOST_ROOT)", - "$(OMIM_ROOT)/3party/jansson/src", - ); - }; - name = "Production Full"; - }; - A8E5415F1F9FBDBA00A1B8FA /* Production Full */ = { - isa = XCBuildConfiguration; - buildSettings = { - EXECUTABLE_PREFIX = lib; - GCC_PREFIX_HEADER = "$(OMIM_ROOT)/precompiled_headers.hpp"; - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = "Production Full"; - }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ @@ -331,7 +308,6 @@ buildConfigurations = ( 671E78FC1E6A4FE400B2859B /* Debug */, 671E78FD1E6A4FE400B2859B /* Release */, - A8E5415E1F9FBDBA00A1B8FA /* Production Full */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -341,7 +317,6 @@ buildConfigurations = ( 671E78FF1E6A4FE400B2859B /* Debug */, 671E79001E6A4FE400B2859B /* Release */, - A8E5415F1F9FBDBA00A1B8FA /* Production Full */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; diff --git a/xcode/osrm/osrm.xcodeproj/project.pbxproj b/xcode/osrm/osrm.xcodeproj/project.pbxproj index 4680db7dbb..97cf9fb9f6 100644 --- a/xcode/osrm/osrm.xcodeproj/project.pbxproj +++ b/xcode/osrm/osrm.xcodeproj/project.pbxproj @@ -490,28 +490,6 @@ }; name = Release; }; - A8E5412C1F9FBD1900A1B8FA /* Production Full */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 34F558731DBF4B3400A4FC11 /* common-release.xcconfig */; - buildSettings = { - CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; - GCC_WARN_INHIBIT_ALL_WARNINGS = YES; - HEADER_SEARCH_PATHS = ( - "$(inherited)", - "$(OMIM_ROOT)/3party/osrm/osrm-backend/third_party", - "$(OMIM_ROOT)/3party/osrm/osrm-backend/include", - ); - }; - name = "Production Full"; - }; - A8E5412D1F9FBD1900A1B8FA /* Production Full */ = { - isa = XCBuildConfiguration; - buildSettings = { - EXECUTABLE_PREFIX = lib; - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = "Production Full"; - }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ @@ -520,7 +498,6 @@ buildConfigurations = ( 67534D4A1A40B7ED00A0A8C3 /* Debug */, 67534D4B1A40B7ED00A0A8C3 /* Release */, - A8E5412C1F9FBD1900A1B8FA /* Production Full */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -530,7 +507,6 @@ buildConfigurations = ( 67534D4D1A40B7ED00A0A8C3 /* Debug */, 67534D4E1A40B7ED00A0A8C3 /* Release */, - A8E5412D1F9FBD1900A1B8FA /* Production Full */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; diff --git a/xcode/platform/platform.xcodeproj/project.pbxproj b/xcode/platform/platform.xcodeproj/project.pbxproj index 17d9c1f5e4..07fc0bdcfa 100644 --- a/xcode/platform/platform.xcodeproj/project.pbxproj +++ b/xcode/platform/platform.xcodeproj/project.pbxproj @@ -979,110 +979,6 @@ }; name = Release; }; - A8E5410E1F9FBC4C00A1B8FA /* Production Full */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 34F558341DBF273C00A4FC11 /* common-release.xcconfig */; - buildSettings = { - CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; - "EXCLUDED_SOURCE_FILE_NAMES[sdk=iphoneos*]" = ( - platform_mac.mm, - secure_storage_qt.cpp, - platform_qt.cpp, - ); - "EXCLUDED_SOURCE_FILE_NAMES[sdk=iphonesimulator*]" = ( - platform_mac.mm, - secure_storage_qt.cpp, - platform_qt.cpp, - ); - "EXCLUDED_SOURCE_FILE_NAMES[sdk=macosx*]" = ( - "ios_*", - platform_ios.mm, - secure_storage_ios.mm, - ); - "FRAMEWORK_SEARCH_PATHS[sdk=iphoneos*]" = ( - "$(inherited)", - "$(OMIM_ROOT)/iphone/Maps/3party/Carthage/Build/iOS", - ); - "FRAMEWORK_SEARCH_PATHS[sdk=iphonesimulator*]" = ( - "$(inherited)", - "$(OMIM_ROOT)/iphone/Maps/3party/Carthage/Build/iOS", - ); - "FRAMEWORK_SEARCH_PATHS[sdk=macosx*]" = ( - "$(inherited)", - "$(QT_PATH)/lib", - "$(OMIM_ROOT)/iphone/Maps/3party/Carthage/Build/Mac", - ); - "HEADER_SEARCH_PATHS[sdk=iphoneos*]" = ( - "$(inherited)", - "$(OMIM_ROOT)/iphone/Maps/3party/Carthage/Build/iOS/Alamofire.framework/Headers", - "$(OMIM_ROOT)/3party/jansson/src", - ); - "HEADER_SEARCH_PATHS[sdk=iphonesimulator*]" = ( - "$(inherited)", - "$(OMIM_ROOT)/iphone/Maps/3party/Carthage/Build/iOS/Alamofire.framework/Headers", - "$(OMIM_ROOT)/3party/jansson/src", - ); - "HEADER_SEARCH_PATHS[sdk=macosx*]" = ( - "$(inherited)", - "$(OMIM_ROOT)/iphone/Maps/3party/Carthage/Build/Mac/Alamofire.framework/Headers", - "$(OMIM_ROOT)/3party/jansson/src", - "$(QT_PATH)/include", - ); - "LIBRARY_SEARCH_PATHS[sdk=iphoneos*]" = ( - "$(inherited)", - "$(OMIM_ROOT)/iphone/Maps/3party/Carthage/Build/iOS", - ); - "LIBRARY_SEARCH_PATHS[sdk=iphonesimulator*]" = ( - "$(inherited)", - "$(OMIM_ROOT)/iphone/Maps/3party/Carthage/Build/iOS", - ); - "LIBRARY_SEARCH_PATHS[sdk=macosx*]" = ( - "$(inherited)", - "$(QT_PATH)/lib", - "$(OMIM_ROOT)/iphone/Maps/3party/Carthage/Build/Mac", - ); - }; - name = "Production Full"; - }; - A8E5410F1F9FBC4C00A1B8FA /* Production Full */ = { - isa = XCBuildConfiguration; - buildSettings = { - EXECUTABLE_PREFIX = lib; - GCC_PREFIX_HEADER = "$(OMIM_ROOT)/precompiled_headers.hpp"; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - "@loader_path/Frameworks", - ); - PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_OBJC_BRIDGING_HEADER = "platform-Bridging-Header.h"; - }; - name = "Production Full"; - }; - A8E541101F9FBC4C00A1B8FA /* Production Full */ = { - isa = XCBuildConfiguration; - buildSettings = { - EXECUTABLE_PREFIX = lib; - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = "Production Full"; - }; - A8E541111F9FBC4C00A1B8FA /* Production Full */ = { - isa = XCBuildConfiguration; - buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - CLANG_ENABLE_MODULES = YES; - CODE_SIGN_IDENTITY = "-"; - INFOPLIST_FILE = ""; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - ); - PRODUCT_BUNDLE_IDENTIFIER = "mail.ru.platform-tests"; - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = "Production Full"; - }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ @@ -1091,7 +987,6 @@ buildConfigurations = ( 675340F21C58C496002CF0D9 /* Debug */, 675340F31C58C496002CF0D9 /* Release */, - A8E541101F9FBC4C00A1B8FA /* Production Full */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -1101,7 +996,6 @@ buildConfigurations = ( 675343811A3F5CF500A0A8C3 /* Debug */, 675343821A3F5CF500A0A8C3 /* Release */, - A8E5410E1F9FBC4C00A1B8FA /* Production Full */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -1111,7 +1005,6 @@ buildConfigurations = ( 675343841A3F5CF500A0A8C3 /* Debug */, 675343851A3F5CF500A0A8C3 /* Release */, - A8E5410F1F9FBC4C00A1B8FA /* Production Full */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -1121,7 +1014,6 @@ buildConfigurations = ( 678338931C6DE54700FD6263 /* Debug */, 678338941C6DE54700FD6263 /* Release */, - A8E541111F9FBC4C00A1B8FA /* Production Full */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; diff --git a/xcode/protobuf/protobuf.xcodeproj/project.pbxproj b/xcode/protobuf/protobuf.xcodeproj/project.pbxproj index 1d58a6e54d..67e17d2acb 100644 --- a/xcode/protobuf/protobuf.xcodeproj/project.pbxproj +++ b/xcode/protobuf/protobuf.xcodeproj/project.pbxproj @@ -272,28 +272,6 @@ }; name = Release; }; - A8E5412E1F9FBD2700A1B8FA /* Production Full */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 34F558591DBF3D2E00A4FC11 /* common-release.xcconfig */; - buildSettings = { - CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; - GCC_WARN_INHIBIT_ALL_WARNINGS = YES; - HEADER_SEARCH_PATHS = ( - "$(inherited)", - "$(OMIM_ROOT)/3party/protobuf/protobuf/src", - "$(OMIM_ROOT)/3party/protobuf/", - ); - }; - name = "Production Full"; - }; - A8E5412F1F9FBD2700A1B8FA /* Production Full */ = { - isa = XCBuildConfiguration; - buildSettings = { - EXECUTABLE_PREFIX = lib; - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = "Production Full"; - }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ @@ -302,7 +280,6 @@ buildConfigurations = ( 670D04D61B0BAC210013A7AC /* Debug */, 670D04D71B0BAC210013A7AC /* Release */, - A8E5412E1F9FBD2700A1B8FA /* Production Full */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -312,7 +289,6 @@ buildConfigurations = ( 670D04D91B0BAC210013A7AC /* Debug */, 670D04DA1B0BAC210013A7AC /* Release */, - A8E5412F1F9FBD2700A1B8FA /* Production Full */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; diff --git a/xcode/pugixml/pugixml.xcodeproj/project.pbxproj b/xcode/pugixml/pugixml.xcodeproj/project.pbxproj index 17bf6b442d..10153534fd 100644 --- a/xcode/pugixml/pugixml.xcodeproj/project.pbxproj +++ b/xcode/pugixml/pugixml.xcodeproj/project.pbxproj @@ -170,23 +170,6 @@ }; name = Release; }; - A8E541301F9FBD3200A1B8FA /* Production Full */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 34EBB4811DBF533D005BE9B8 /* common-release.xcconfig */; - buildSettings = { - CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; - GCC_WARN_INHIBIT_ALL_WARNINGS = YES; - }; - name = "Production Full"; - }; - A8E541311F9FBD3200A1B8FA /* Production Full */ = { - isa = XCBuildConfiguration; - buildSettings = { - EXECUTABLE_PREFIX = lib; - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = "Production Full"; - }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ @@ -195,7 +178,6 @@ buildConfigurations = ( 340DF9DE1C1FF16000B5C7EC /* Debug */, 340DF9DF1C1FF16000B5C7EC /* Release */, - A8E541301F9FBD3200A1B8FA /* Production Full */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -205,7 +187,6 @@ buildConfigurations = ( 340DF9E11C1FF16000B5C7EC /* Debug */, 340DF9E21C1FF16000B5C7EC /* Release */, - A8E541311F9FBD3200A1B8FA /* Production Full */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; diff --git a/xcode/routing/routing.xcodeproj/project.pbxproj b/xcode/routing/routing.xcodeproj/project.pbxproj index 356d37840b..e9fa8e122c 100644 --- a/xcode/routing/routing.xcodeproj/project.pbxproj +++ b/xcode/routing/routing.xcodeproj/project.pbxproj @@ -1655,72 +1655,6 @@ }; name = Release; }; - A8E541091F9FBC3E00A1B8FA /* Production Full */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 34F558361DBF2A2600A4FC11 /* common-release.xcconfig */; - buildSettings = { - CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; - HEADER_SEARCH_PATHS = ( - "$(inherited)", - "$(OMIM_ROOT)/3party/jansson/src", - ); - }; - name = "Production Full"; - }; - A8E5410A1F9FBC3E00A1B8FA /* Production Full */ = { - isa = XCBuildConfiguration; - buildSettings = { - EXECUTABLE_PREFIX = lib; - GCC_PREFIX_HEADER = "$(OMIM_ROOT)/precompiled_headers.hpp"; - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = "Production Full"; - }; - A8E5410B1F9FBC3E00A1B8FA /* Production Full */ = { - isa = XCBuildConfiguration; - buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - CODE_SIGN_IDENTITY = "-"; - INFOPLIST_FILE = ""; - LIBRARY_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)_common/build/Debug", - ); - PRODUCT_BUNDLE_IDENTIFIER = mail.ru.routing_tests; - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = "Production Full"; - }; - A8E5410C1F9FBC3E00A1B8FA /* Production Full */ = { - isa = XCBuildConfiguration; - buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - CODE_SIGN_IDENTITY = "-"; - INFOPLIST_FILE = ""; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/../Frameworks", - ); - LIBRARY_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)_common/build/Debug", - ); - PRODUCT_BUNDLE_IDENTIFIER = mail.ru.routing_integration_tests; - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = "Production Full"; - }; - A8E5410D1F9FBC3E00A1B8FA /* Production Full */ = { - isa = XCBuildConfiguration; - buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - CODE_SIGN_IDENTITY = "-"; - INFOPLIST_FILE = ""; - PRODUCT_BUNDLE_IDENTIFIER = mail.ru.routing_benchmarks; - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = "Production Full"; - }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ @@ -1729,7 +1663,6 @@ buildConfigurations = ( 56F0D75D1D896A5300045886 /* Debug */, 56F0D75E1D896A5300045886 /* Release */, - A8E5410D1F9FBC3E00A1B8FA /* Production Full */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -1739,7 +1672,6 @@ buildConfigurations = ( 6742AD231C68A91B009CB89E /* Debug */, 6742AD241C68A91B009CB89E /* Release */, - A8E5410B1F9FBC3E00A1B8FA /* Production Full */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -1749,7 +1681,6 @@ buildConfigurations = ( 675344011A3F640D00A0A8C3 /* Debug */, 675344021A3F640D00A0A8C3 /* Release */, - A8E541091F9FBC3E00A1B8FA /* Production Full */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -1759,7 +1690,6 @@ buildConfigurations = ( 675344041A3F640D00A0A8C3 /* Debug */, 675344051A3F640D00A0A8C3 /* Release */, - A8E5410A1F9FBC3E00A1B8FA /* Production Full */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -1769,7 +1699,6 @@ buildConfigurations = ( 67BD35AA1C69F03E003AA26F /* Debug */, 67BD35AB1C69F03E003AA26F /* Release */, - A8E5410C1F9FBC3E00A1B8FA /* Production Full */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; diff --git a/xcode/routing_common/routing_common.xcodeproj/project.pbxproj b/xcode/routing_common/routing_common.xcodeproj/project.pbxproj index 2c9dcee4f5..34c5a90565 100644 --- a/xcode/routing_common/routing_common.xcodeproj/project.pbxproj +++ b/xcode/routing_common/routing_common.xcodeproj/project.pbxproj @@ -382,39 +382,6 @@ }; name = Release; }; - A8E541061F9FBC3500A1B8FA /* Production Full */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 671E78911E6A3C9C00B2859B /* common-release.xcconfig */; - buildSettings = { - CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; - HEADER_SEARCH_PATHS = ( - "$(inherited)", - "$(OMIM_ROOT)", - "$(BOOST_ROOT)", - "$(OMIM_ROOT)/3party/jansson/src", - ); - }; - name = "Production Full"; - }; - A8E541071F9FBC3500A1B8FA /* Production Full */ = { - isa = XCBuildConfiguration; - buildSettings = { - EXECUTABLE_PREFIX = lib; - GCC_PREFIX_HEADER = "$(OMIM_ROOT)/precompiled_headers.hpp"; - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = "Production Full"; - }; - A8E541081F9FBC3500A1B8FA /* Production Full */ = { - isa = XCBuildConfiguration; - buildSettings = { - CODE_SIGN_IDENTITY = "-"; - INFOPLIST_FILE = ""; - PRODUCT_BUNDLE_IDENTIFIER = "mail.ru.routing-common-tests"; - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = "Production Full"; - }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ @@ -423,7 +390,6 @@ buildConfigurations = ( 671E787B1E6A3BE200B2859B /* Debug */, 671E787C1E6A3BE200B2859B /* Release */, - A8E541061F9FBC3500A1B8FA /* Production Full */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -433,7 +399,6 @@ buildConfigurations = ( 671E787E1E6A3BE200B2859B /* Debug */, 671E787F1E6A3BE200B2859B /* Release */, - A8E541071F9FBC3500A1B8FA /* Production Full */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -443,7 +408,6 @@ buildConfigurations = ( 671E78AB1E6A3DA800B2859B /* Debug */, 671E78AC1E6A3DA800B2859B /* Release */, - A8E541081F9FBC3500A1B8FA /* Production Full */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; diff --git a/xcode/sdf_image/sdf_image.xcodeproj/project.pbxproj b/xcode/sdf_image/sdf_image.xcodeproj/project.pbxproj index 0f001c06e5..47e0eb8122 100644 --- a/xcode/sdf_image/sdf_image.xcodeproj/project.pbxproj +++ b/xcode/sdf_image/sdf_image.xcodeproj/project.pbxproj @@ -95,7 +95,7 @@ 675D219C1BFB8D3F00717E4F /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0710; + LastUpgradeCheck = 1250; TargetAttributes = { 675D21A31BFB8D3F00717E4F = { CreatedOnToolsVersion = 7.1.1; @@ -104,10 +104,11 @@ }; buildConfigurationList = 675D219F1BFB8D3F00717E4F /* Build configuration list for PBXProject "sdf_image" */; compatibilityVersion = "Xcode 3.2"; - developmentRegion = English; + developmentRegion = en; hasScannedForEncodings = 0; knownRegions = ( en, + Base, ); mainGroup = 675D219B1BFB8D3F00717E4F; productRefGroup = 675D21A51BFB8D3F00717E4F /* Products */; @@ -135,6 +136,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = 34F5586A1DBF48E500A4FC11 /* common-debug.xcconfig */; buildSettings = { + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; GCC_WARN_INHIBIT_ALL_WARNINGS = YES; }; name = Debug; @@ -143,6 +145,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = 34F5586B1DBF48E500A4FC11 /* common-release.xcconfig */; buildSettings = { + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; GCC_WARN_INHIBIT_ALL_WARNINGS = YES; }; name = Release; @@ -163,22 +166,6 @@ }; name = Release; }; - A8E541321F9FBD3900A1B8FA /* Production Full */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 34F5586B1DBF48E500A4FC11 /* common-release.xcconfig */; - buildSettings = { - GCC_WARN_INHIBIT_ALL_WARNINGS = YES; - }; - name = "Production Full"; - }; - A8E541331F9FBD3900A1B8FA /* Production Full */ = { - isa = XCBuildConfiguration; - buildSettings = { - EXECUTABLE_PREFIX = lib; - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = "Production Full"; - }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ @@ -187,7 +174,6 @@ buildConfigurations = ( 675D21A61BFB8D3F00717E4F /* Debug */, 675D21A71BFB8D3F00717E4F /* Release */, - A8E541321F9FBD3900A1B8FA /* Production Full */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -197,7 +183,6 @@ buildConfigurations = ( 675D21A91BFB8D3F00717E4F /* Debug */, 675D21AA1BFB8D3F00717E4F /* Release */, - A8E541331F9FBD3900A1B8FA /* Production Full */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; diff --git a/xcode/search/search.xcodeproj/project.pbxproj b/xcode/search/search.xcodeproj/project.pbxproj index 9413a5ae72..9b7b0cf3a7 100644 --- a/xcode/search/search.xcodeproj/project.pbxproj +++ b/xcode/search/search.xcodeproj/project.pbxproj @@ -1372,19 +1372,6 @@ /* End PBXSourcesBuildPhase section */ /* Begin XCBuildConfiguration section */ - 34E7184D1FBB074300FC98CC /* Production Full */ = { - isa = XCBuildConfiguration; - buildSettings = { - CODE_SIGN_IDENTITY = "-"; - INFOPLIST_FILE = ""; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/../Frameworks", - ); - PRODUCT_NAME = search_tests; - }; - name = "Production Full"; - }; 39AEF87F1FB45E1600943FC9 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { @@ -1483,41 +1470,6 @@ }; name = Release; }; - A8E541601F9FBDC400A1B8FA /* Production Full */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 34F558381DBF2C8B00A4FC11 /* common-release.xcconfig */; - buildSettings = { - CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; - }; - name = "Production Full"; - }; - A8E541611F9FBDC400A1B8FA /* Production Full */ = { - isa = XCBuildConfiguration; - buildSettings = { - EXECUTABLE_PREFIX = lib; - GCC_PREFIX_HEADER = "$(OMIM_ROOT)/precompiled_headers.hpp"; - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = "Production Full"; - }; - A8E541621F9FBDC400A1B8FA /* Production Full */ = { - isa = XCBuildConfiguration; - buildSettings = { - CODE_SIGN_IDENTITY = "-"; - INFOPLIST_FILE = ""; - PRODUCT_BUNDLE_IDENTIFIER = maps.me.search_tests; - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = "Production Full"; - }; - A8E541631F9FBDC400A1B8FA /* Production Full */ = { - isa = XCBuildConfiguration; - buildSettings = { - EXECUTABLE_PREFIX = lib; - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = "Production Full"; - }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ @@ -1526,7 +1478,6 @@ buildConfigurations = ( 39AEF87F1FB45E1600943FC9 /* Debug */, 39AEF8801FB45E1600943FC9 /* Release */, - 34E7184D1FBB074300FC98CC /* Production Full */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -1536,7 +1487,6 @@ buildConfigurations = ( 671C62111AE9225100076BD0 /* Debug */, 671C62121AE9225100076BD0 /* Release */, - A8E541621F9FBDC400A1B8FA /* Production Full */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -1546,7 +1496,6 @@ buildConfigurations = ( 675346B91A4055CF00A0A8C3 /* Debug */, 675346BA1A4055CF00A0A8C3 /* Release */, - A8E541601F9FBDC400A1B8FA /* Production Full */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -1556,7 +1505,6 @@ buildConfigurations = ( 675346BC1A4055CF00A0A8C3 /* Debug */, 675346BD1A4055CF00A0A8C3 /* Release */, - A8E541611F9FBDC400A1B8FA /* Production Full */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -1566,7 +1514,6 @@ buildConfigurations = ( 6796248B1D10133300AE4E3C /* Debug */, 6796248C1D10133300AE4E3C /* Release */, - A8E541631F9FBDC400A1B8FA /* Production Full */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; diff --git a/xcode/shaders/shaders.xcodeproj/project.pbxproj b/xcode/shaders/shaders.xcodeproj/project.pbxproj index 8e430d4590..7f78c89af8 100644 --- a/xcode/shaders/shaders.xcodeproj/project.pbxproj +++ b/xcode/shaders/shaders.xcodeproj/project.pbxproj @@ -769,39 +769,6 @@ }; name = Release; }; - 4566607D20E2552D0085E8C1 /* Production Full */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 4566607C20E254A60085E8C1 /* common-release.xcconfig */; - buildSettings = { - CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; - HEADER_SEARCH_PATHS = ( - "$(inherited)", - "$(OMIM_ROOT)", - "$(BOOST_ROOT)", - "$(OMIM_ROOT)/3party/glm", - "$(OMIM_ROOT)/3party/Vulkan-Headers/include", - "$(OMIM_ROOT)/3party/vulkan_wrapper", - "$(OMIM_ROOT)/3party/jansson/src", - ); - }; - name = "Production Full"; - }; - 4566607E20E2552D0085E8C1 /* Production Full */ = { - isa = XCBuildConfiguration; - buildSettings = { - "EXCLUDED_SOURCE_FILE_NAMES[sdk=iphonesimulator*]" = ( - metal_program_params.mm, - metal_program_pool.mm, - program_manager_metal.mm, - ); - "EXCLUDED_SOURCE_FILE_NAMES[sdk=macosx*]" = ( - metal_program_params.mm, - metal_program_pool.mm, - program_manager_metal.mm, - ); - }; - name = "Production Full"; - }; 456660E920E25A3A0085E8C1 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { @@ -834,22 +801,6 @@ }; name = Release; }; - 456660EB20E25A3A0085E8C1 /* Production Full */ = { - isa = XCBuildConfiguration; - buildSettings = { - CODE_SIGN_IDENTITY = "-"; - FRAMEWORK_SEARCH_PATHS = "$(QT_PATH)/lib"; - HEADER_SEARCH_PATHS = ( - "$(inherited)", - "$(OMIM_ROOT)", - "$(BOOST_ROOT)", - "$(OMIM_ROOT)/3party/glm", - "$(QT_PATH)/include", - ); - INFOPLIST_FILE = ""; - }; - name = "Production Full"; - }; 4598438021394BE000F8CAB2 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { @@ -869,15 +820,6 @@ }; name = Release; }; - 4598438221394BE000F8CAB2 /* Production Full */ = { - isa = XCBuildConfiguration; - buildSettings = { - MTL_FAST_MATH = YES; - MTL_OPTIMIZATION_LEVEL = 3; - SUPPORTED_PLATFORMS = "macosx iphoneos"; - }; - name = "Production Full"; - }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ @@ -886,7 +828,6 @@ buildConfigurations = ( 4566607520E254060085E8C1 /* Debug */, 4566607620E254060085E8C1 /* Release */, - 4566607D20E2552D0085E8C1 /* Production Full */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -896,7 +837,6 @@ buildConfigurations = ( 4566607820E254060085E8C1 /* Debug */, 4566607920E254060085E8C1 /* Release */, - 4566607E20E2552D0085E8C1 /* Production Full */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -906,7 +846,6 @@ buildConfigurations = ( 456660E920E25A3A0085E8C1 /* Debug */, 456660EA20E25A3A0085E8C1 /* Release */, - 456660EB20E25A3A0085E8C1 /* Production Full */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -916,7 +855,6 @@ buildConfigurations = ( 4598438021394BE000F8CAB2 /* Debug */, 4598438121394BE000F8CAB2 /* Release */, - 4598438221394BE000F8CAB2 /* Production Full */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; diff --git a/xcode/software_renderer/software_renderer.xcodeproj/project.pbxproj b/xcode/software_renderer/software_renderer.xcodeproj/project.pbxproj index 9c1f71b847..02260a7e78 100644 --- a/xcode/software_renderer/software_renderer.xcodeproj/project.pbxproj +++ b/xcode/software_renderer/software_renderer.xcodeproj/project.pbxproj @@ -203,11 +203,11 @@ }; buildConfigurationList = 453FEDD01F35E647005C1BB4 /* Build configuration list for PBXProject "software_renderer" */; compatibilityVersion = "Xcode 12.0"; - developmentRegion = English; + developmentRegion = en; hasScannedForEncodings = 0; knownRegions = ( - English, en, + Base, ); mainGroup = 453FEDCC1F35E647005C1BB4; productRefGroup = 453FEDD61F35E647005C1BB4 /* Products */; @@ -281,7 +281,6 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = macosx; }; @@ -321,14 +320,12 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = macosx; }; name = Release; }; 453FEDE11F35E647005C1BB4 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 453FEDE31F35E6E4005C1BB4 /* common-debug.xcconfig */; buildSettings = { EXECUTABLE_PREFIX = lib; GCC_ENABLE_CPP_EXCEPTIONS = YES; @@ -339,7 +336,6 @@ }; 453FEDE21F35E647005C1BB4 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 453FEDE41F35E6E4005C1BB4 /* common-release.xcconfig */; buildSettings = { EXECUTABLE_PREFIX = lib; GCC_ENABLE_CPP_EXCEPTIONS = YES; diff --git a/xcode/stb_image/stb_image.xcodeproj/project.pbxproj b/xcode/stb_image/stb_image.xcodeproj/project.pbxproj index 0fda51f2e9..1287e74305 100644 --- a/xcode/stb_image/stb_image.xcodeproj/project.pbxproj +++ b/xcode/stb_image/stb_image.xcodeproj/project.pbxproj @@ -170,23 +170,6 @@ }; name = Release; }; - A8E541341F9FBD4000A1B8FA /* Production Full */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 34EBB47F1DBF52D3005BE9B8 /* common-release.xcconfig */; - buildSettings = { - CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; - GCC_WARN_INHIBIT_ALL_WARNINGS = YES; - }; - name = "Production Full"; - }; - A8E541351F9FBD4000A1B8FA /* Production Full */ = { - isa = XCBuildConfiguration; - buildSettings = { - EXECUTABLE_PREFIX = lib; - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = "Production Full"; - }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ @@ -195,7 +178,6 @@ buildConfigurations = ( 675D21BC1BFB8DBA00717E4F /* Debug */, 675D21BD1BFB8DBA00717E4F /* Release */, - A8E541341F9FBD4000A1B8FA /* Production Full */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -205,7 +187,6 @@ buildConfigurations = ( 675D21BF1BFB8DBA00717E4F /* Debug */, 675D21C01BFB8DBA00717E4F /* Release */, - A8E541351F9FBD4000A1B8FA /* Production Full */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; diff --git a/xcode/storage/storage.xcodeproj/project.pbxproj b/xcode/storage/storage.xcodeproj/project.pbxproj index 3f31484724..d440e9ab82 100644 --- a/xcode/storage/storage.xcodeproj/project.pbxproj +++ b/xcode/storage/storage.xcodeproj/project.pbxproj @@ -1075,66 +1075,6 @@ }; name = Release; }; - A8E541641F9FBDCA00A1B8FA /* Production Full */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 34F5584B1DBF2FC000A4FC11 /* common-release.xcconfig */; - buildSettings = { - CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; - HEADER_SEARCH_PATHS = ( - "$(inherited)", - "$(OMIM_ROOT)/3party/jansson/src", - "$(OMIM_ROOT)/3party/glm/", - ); - }; - name = "Production Full"; - }; - A8E541651F9FBDCA00A1B8FA /* Production Full */ = { - isa = XCBuildConfiguration; - buildSettings = { - EXECUTABLE_PREFIX = lib; - GCC_PREFIX_HEADER = "$(OMIM_ROOT)/precompiled_headers.hpp"; - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = "Production Full"; - }; - A8E541661F9FBDCA00A1B8FA /* Production Full */ = { - isa = XCBuildConfiguration; - buildSettings = { - ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; - CODE_SIGN_IDENTITY = "-"; - GCC_PREPROCESSOR_DEFINITIONS = ( - "$(inherited)", - "OMIM_UNIT_TEST_WITH_QT_EVENT_LOOP=1", - ); - INFOPLIST_FILE = ""; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/../Frameworks", - ); - PRODUCT_BUNDLE_IDENTIFIER = "storage-tests"; - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = "Production Full"; - }; - A8E541671F9FBDCA00A1B8FA /* Production Full */ = { - isa = XCBuildConfiguration; - buildSettings = { - ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; - CODE_SIGN_IDENTITY = "-"; - GCC_PREPROCESSOR_DEFINITIONS = ( - "$(inherited)", - "OMIM_UNIT_TEST_WITH_QT_EVENT_LOOP=1", - ); - INFOPLIST_FILE = ""; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/../Frameworks", - ); - PRODUCT_BUNDLE_IDENTIFIER = storage_integration_tests; - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = "Production Full"; - }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ @@ -1143,7 +1083,6 @@ buildConfigurations = ( 675342E91A3F59EF00A0A8C3 /* Debug */, 675342EA1A3F59EF00A0A8C3 /* Release */, - A8E541641F9FBDCA00A1B8FA /* Production Full */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -1153,7 +1092,6 @@ buildConfigurations = ( 675342EC1A3F59EF00A0A8C3 /* Debug */, 675342ED1A3F59EF00A0A8C3 /* Release */, - A8E541651F9FBDCA00A1B8FA /* Production Full */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -1163,7 +1101,6 @@ buildConfigurations = ( 67F90B6D1C6A275B00CD458E /* Debug */, 67F90B6E1C6A275B00CD458E /* Release */, - A8E541661F9FBDCA00A1B8FA /* Production Full */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -1173,7 +1110,6 @@ buildConfigurations = ( 67F90BCB1C6A29F700CD458E /* Debug */, 67F90BCC1C6A29F700CD458E /* Release */, - A8E541671F9FBDCA00A1B8FA /* Production Full */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; diff --git a/xcode/succinct/succinct.xcodeproj/project.pbxproj b/xcode/succinct/succinct.xcodeproj/project.pbxproj index 721b984061..ca811a0ee1 100644 --- a/xcode/succinct/succinct.xcodeproj/project.pbxproj +++ b/xcode/succinct/succinct.xcodeproj/project.pbxproj @@ -254,23 +254,6 @@ }; name = Release; }; - A8E541361F9FBD4900A1B8FA /* Production Full */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 34F5585F1DBF42B200A4FC11 /* common-release.xcconfig */; - buildSettings = { - CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; - GCC_WARN_INHIBIT_ALL_WARNINGS = YES; - }; - name = "Production Full"; - }; - A8E541371F9FBD4900A1B8FA /* Production Full */ = { - isa = XCBuildConfiguration; - buildSettings = { - EXECUTABLE_PREFIX = lib; - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = "Production Full"; - }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ @@ -279,7 +262,6 @@ buildConfigurations = ( 67B52B741AD3CA7F00664C17 /* Debug */, 67B52B751AD3CA7F00664C17 /* Release */, - A8E541361F9FBD4900A1B8FA /* Production Full */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -289,7 +271,6 @@ buildConfigurations = ( 67B52B771AD3CA7F00664C17 /* Debug */, 67B52B781AD3CA7F00664C17 /* Release */, - A8E541371F9FBD4900A1B8FA /* Production Full */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; diff --git a/xcode/tess2/tess2.xcodeproj/project.pbxproj b/xcode/tess2/tess2.xcodeproj/project.pbxproj index 1dadb38e2f..1700c14f12 100644 --- a/xcode/tess2/tess2.xcodeproj/project.pbxproj +++ b/xcode/tess2/tess2.xcodeproj/project.pbxproj @@ -226,29 +226,6 @@ }; name = Release; }; - A8E541381F9FBD5100A1B8FA /* Production Full */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 34F5585B1DBF3DC500A4FC11 /* common-release.xcconfig */; - buildSettings = { - CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; - GCC_WARN_INHIBIT_ALL_WARNINGS = YES; - HEADER_SEARCH_PATHS = ( - "$(inherited)", - "$(OMIM_ROOT)", - "$(BOOST_ROOT)", - "$(OMIM_ROOT)/3party/libtess2/Include", - ); - }; - name = "Production Full"; - }; - A8E541391F9FBD5100A1B8FA /* Production Full */ = { - isa = XCBuildConfiguration; - buildSettings = { - EXECUTABLE_PREFIX = lib; - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = "Production Full"; - }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ @@ -257,7 +234,6 @@ buildConfigurations = ( 6719DD3A1B95A8E70018166F /* Debug */, 6719DD3B1B95A8E70018166F /* Release */, - A8E541381F9FBD5100A1B8FA /* Production Full */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -267,7 +243,6 @@ buildConfigurations = ( 6719DD3D1B95A8E70018166F /* Debug */, 6719DD3E1B95A8E70018166F /* Release */, - A8E541391F9FBD5100A1B8FA /* Production Full */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; diff --git a/xcode/tracking/tracking.xcodeproj/project.pbxproj b/xcode/tracking/tracking.xcodeproj/project.pbxproj index 713c71f0c1..389f515cf6 100644 --- a/xcode/tracking/tracking.xcodeproj/project.pbxproj +++ b/xcode/tracking/tracking.xcodeproj/project.pbxproj @@ -371,34 +371,6 @@ }; name = Release; }; - A8E5416B1F9FBDDA00A1B8FA /* Production Full */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 34F558521DBF38A000A4FC11 /* common-release.xcconfig */; - buildSettings = { - CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; - }; - name = "Production Full"; - }; - A8E5416C1F9FBDDA00A1B8FA /* Production Full */ = { - isa = XCBuildConfiguration; - buildSettings = { - EXECUTABLE_PREFIX = lib; - GCC_PREFIX_HEADER = "$(OMIM_ROOT)/precompiled_headers.hpp"; - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = "Production Full"; - }; - A8E5416D1F9FBDDA00A1B8FA /* Production Full */ = { - isa = XCBuildConfiguration; - buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - CODE_SIGN_IDENTITY = "-"; - INFOPLIST_FILE = "$(SRCROOT)/../../iphone/Maps/OMaps.plist"; - PRODUCT_BUNDLE_IDENTIFIER = "tracking-tests"; - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = "Production Full"; - }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ @@ -407,7 +379,6 @@ buildConfigurations = ( 675E88591DB7AC0300F8EBDA /* Debug */, 675E885A1DB7AC0300F8EBDA /* Release */, - A8E5416B1F9FBDDA00A1B8FA /* Production Full */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -417,7 +388,6 @@ buildConfigurations = ( 675E885C1DB7AC0300F8EBDA /* Debug */, 675E885D1DB7AC0300F8EBDA /* Release */, - A8E5416C1F9FBDDA00A1B8FA /* Production Full */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -427,7 +397,6 @@ buildConfigurations = ( 675E88811DB7ACD900F8EBDA /* Debug */, 675E88821DB7ACD900F8EBDA /* Release */, - A8E5416D1F9FBDDA00A1B8FA /* Production Full */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; diff --git a/xcode/traffic/traffic.xcodeproj/project.pbxproj b/xcode/traffic/traffic.xcodeproj/project.pbxproj index 59fb9e252c..a05db23f87 100644 --- a/xcode/traffic/traffic.xcodeproj/project.pbxproj +++ b/xcode/traffic/traffic.xcodeproj/project.pbxproj @@ -353,33 +353,6 @@ }; name = Release; }; - A8E541681F9FBDD200A1B8FA /* Production Full */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 67BECB591DDA440100FC4E99 /* common-release.xcconfig */; - buildSettings = { - CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; - }; - name = "Production Full"; - }; - A8E541691F9FBDD200A1B8FA /* Production Full */ = { - isa = XCBuildConfiguration; - buildSettings = { - EXECUTABLE_PREFIX = lib; - GCC_PREFIX_HEADER = "$(OMIM_ROOT)/precompiled_headers.hpp"; - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = "Production Full"; - }; - A8E5416A1F9FBDD200A1B8FA /* Production Full */ = { - isa = XCBuildConfiguration; - buildSettings = { - CODE_SIGN_IDENTITY = "-"; - INFOPLIST_FILE = ""; - PRODUCT_BUNDLE_IDENTIFIER = "mail.ru.traffic-tests"; - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = "Production Full"; - }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ @@ -388,7 +361,6 @@ buildConfigurations = ( 67BECB531DDA43B000FC4E99 /* Debug */, 67BECB541DDA43B000FC4E99 /* Release */, - A8E541681F9FBDD200A1B8FA /* Production Full */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -398,7 +370,6 @@ buildConfigurations = ( 67BECB561DDA43B000FC4E99 /* Debug */, 67BECB571DDA43B000FC4E99 /* Release */, - A8E541691F9FBDD200A1B8FA /* Production Full */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -408,7 +379,6 @@ buildConfigurations = ( 67BECB7C1DDA466800FC4E99 /* Debug */, 67BECB7D1DDA466800FC4E99 /* Release */, - A8E5416A1F9FBDD200A1B8FA /* Production Full */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; diff --git a/xcode/transit/transit.xcodeproj/project.pbxproj b/xcode/transit/transit.xcodeproj/project.pbxproj index 6150d0405e..b82c42461a 100644 --- a/xcode/transit/transit.xcodeproj/project.pbxproj +++ b/xcode/transit/transit.xcodeproj/project.pbxproj @@ -197,29 +197,6 @@ /* End PBXSourcesBuildPhase section */ /* Begin XCBuildConfiguration section */ - 344F7DDD201B681100CF5DFA /* Production Full */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 56EE14C81FE7F20A0036F20C /* common-release.xcconfig */; - buildSettings = { - CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; - }; - name = "Production Full"; - }; - 344F7DDE201B681100CF5DFA /* Production Full */ = { - isa = XCBuildConfiguration; - buildSettings = { - EXECUTABLE_PREFIX = lib; - GCC_PREFIX_HEADER = "$(OMIM_ROOT)/precompiled_headers.hpp"; - HEADER_SEARCH_PATHS = ( - "$(inherited)", - "$(OMIM_ROOT)", - "$(BOOST_ROOT)", - "$(OMIM_ROOT)/3party/jansson/src", - ); - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = "Production Full"; - }; 56D7F2FD1FE7F0F200D99E62 /* Debug */ = { isa = XCBuildConfiguration; baseConfigurationReference = 56EE14C71FE7F1FF0036F20C /* common-debug.xcconfig */; @@ -274,7 +251,6 @@ buildConfigurations = ( 56D7F2FD1FE7F0F200D99E62 /* Debug */, 56D7F2FE1FE7F0F200D99E62 /* Release */, - 344F7DDD201B681100CF5DFA /* Production Full */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -284,7 +260,6 @@ buildConfigurations = ( 56D7F3001FE7F0F200D99E62 /* Debug */, 56D7F3011FE7F0F200D99E62 /* Release */, - 344F7DDE201B681100CF5DFA /* Production Full */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; diff --git a/xcode/vulkan_wrapper/vulkan_wrapper.xcodeproj/project.pbxproj b/xcode/vulkan_wrapper/vulkan_wrapper.xcodeproj/project.pbxproj index ca41909bc5..f9c16429ca 100644 --- a/xcode/vulkan_wrapper/vulkan_wrapper.xcodeproj/project.pbxproj +++ b/xcode/vulkan_wrapper/vulkan_wrapper.xcodeproj/project.pbxproj @@ -95,7 +95,7 @@ 4577B26521F2044300864FAC /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 1240; + LastUpgradeCheck = 1250; TargetAttributes = { 4577B26C21F2044300864FAC = { CreatedOnToolsVersion = 10.1; @@ -170,25 +170,6 @@ }; name = Release; }; - 4577B27B21F2057700864FAC /* Production Full */ = { - isa = XCBuildConfiguration; - buildSettings = { - }; - name = "Production Full"; - }; - 4577B27C21F2057700864FAC /* Production Full */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 4577B27A21F2053900864FAC /* common-release.xcconfig */; - buildSettings = { - HEADER_SEARCH_PATHS = ( - "$(inherited)", - "$(OMIM_ROOT)", - "$(BOOST_ROOT)", - "$(OMIM_ROOT)/3party/Vulkan-Headers/include", - ); - }; - name = "Production Full"; - }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ @@ -197,7 +178,6 @@ buildConfigurations = ( 4577B27421F2044300864FAC /* Debug */, 4577B27521F2044300864FAC /* Release */, - 4577B27B21F2057700864FAC /* Production Full */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -207,7 +187,6 @@ buildConfigurations = ( 4577B27721F2044300864FAC /* Debug */, 4577B27821F2044300864FAC /* Release */, - 4577B27C21F2057700864FAC /* Production Full */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; diff --git a/xcode/web_api/web_api.xcodeproj/project.pbxproj b/xcode/web_api/web_api.xcodeproj/project.pbxproj index c8c0a907d6..a2798c162c 100644 --- a/xcode/web_api/web_api.xcodeproj/project.pbxproj +++ b/xcode/web_api/web_api.xcodeproj/project.pbxproj @@ -101,7 +101,7 @@ isa = PBXProject; attributes = { DefaultBuildSystemTypeForWorkspace = Latest; - LastUpgradeCheck = 1240; + LastUpgradeCheck = 1250; TargetAttributes = { 450B5C6D2355F3CF00E9019E = { CreatedOnToolsVersion = 11.0; @@ -165,19 +165,6 @@ }; name = Release; }; - 999602DA23AA3964009FFE99 /* Production Full */ = { - isa = XCBuildConfiguration; - buildSettings = { - }; - name = "Production Full"; - }; - 999602DB23AA3964009FFE99 /* Production Full */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 450B5C7B2355F3F600E9019E /* common-release.xcconfig */; - buildSettings = { - }; - name = "Production Full"; - }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ @@ -186,7 +173,6 @@ buildConfigurations = ( 450B5C752355F3CF00E9019E /* Debug */, 450B5C762355F3CF00E9019E /* Release */, - 999602DA23AA3964009FFE99 /* Production Full */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -196,7 +182,6 @@ buildConfigurations = ( 450B5C782355F3CF00E9019E /* Debug */, 450B5C792355F3CF00E9019E /* Release */, - 999602DB23AA3964009FFE99 /* Production Full */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release;