diff --git a/xcode/tracking/tracking.xcodeproj/project.pbxproj b/xcode/tracking/tracking.xcodeproj/project.pbxproj index 9a1c80a119..254679e3cd 100644 --- a/xcode/tracking/tracking.xcodeproj/project.pbxproj +++ b/xcode/tracking/tracking.xcodeproj/project.pbxproj @@ -7,17 +7,18 @@ objects = { /* Begin PBXBuildFile section */ + 346B76CE1DC1ECC900C7C87E /* libtomcrypt.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 346B76CD1DC1ECC900C7C87E /* libtomcrypt.a */; }; + 3496ABB21DC2026E00C5DDBA /* libalohalitics.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3496ABB11DC2026E00C5DDBA /* libalohalitics.a */; }; + 3496ABB41DC2028F00C5DDBA /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 3496ABB31DC2028F00C5DDBA /* libz.tbd */; }; + 349756271DC1EBEE0058742A /* libcoding.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 349756261DC1EBEE0058742A /* libcoding.a */; }; + 349756291DC1EC060058742A /* libgeometry.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 349756281DC1EC060058742A /* libgeometry.a */; }; + 3497562B1DC1EC220058742A /* libplatform.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3497562A1DC1EC220058742A /* libplatform.a */; }; + 3497562D1DC1EC3F0058742A /* libbase.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3497562C1DC1EC3F0058742A /* libbase.a */; }; 675E88641DB7AC9000F8EBDA /* connection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 675E88601DB7AC9000F8EBDA /* connection.cpp */; }; 675E88651DB7AC9000F8EBDA /* connection.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 675E88611DB7AC9000F8EBDA /* connection.hpp */; }; 675E88661DB7AC9000F8EBDA /* reporter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 675E88621DB7AC9000F8EBDA /* reporter.cpp */; }; 675E88671DB7AC9000F8EBDA /* reporter.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 675E88631DB7AC9000F8EBDA /* reporter.hpp */; }; 675E88891DB7AD3100F8EBDA /* reporter_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 675E88841DB7AD1000F8EBDA /* reporter_test.cpp */; }; - 675E88921DB7B03400F8EBDA /* libbase.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 675E888E1DB7B03400F8EBDA /* libbase.a */; }; - 675E88931DB7B03400F8EBDA /* libcoding.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 675E888F1DB7B03400F8EBDA /* libcoding.a */; }; - 675E88941DB7B03400F8EBDA /* libgeometry.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 675E88901DB7B03400F8EBDA /* libgeometry.a */; }; - 675E88951DB7B03400F8EBDA /* libplatform.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 675E88911DB7B03400F8EBDA /* libplatform.a */; }; - 675E88981DB7B08500F8EBDA /* libplatform_tests_support.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 675E88961DB7B08500F8EBDA /* libplatform_tests_support.a */; }; - 675E88991DB7B08500F8EBDA /* libtomcrypt.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 675E88971DB7B08500F8EBDA /* libtomcrypt.a */; }; 675E88A21DB7B10300F8EBDA /* libtracking.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 675E88501DB7AC0300F8EBDA /* libtracking.a */; }; 6772590D1DB90F8F00BF54EE /* testingmain.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 67B6E7B71DB8BBA900745F8A /* testingmain.cpp */; }; 6772592D1DBA26FD00BF54EE /* protocol.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6772592B1DBA26FD00BF54EE /* protocol.cpp */; }; @@ -26,20 +27,22 @@ /* End PBXBuildFile section */ /* Begin PBXFileReference section */ + 346B76CD1DC1ECC900C7C87E /* libtomcrypt.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libtomcrypt.a; path = "../../../omim-build/xcode/Debug/libtomcrypt.a"; sourceTree = ""; }; + 3496ABB11DC2026E00C5DDBA /* libalohalitics.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libalohalitics.a; path = "../../../omim-build/xcode/Debug-iphonesimulator/libalohalitics.a"; sourceTree = ""; }; + 3496ABB31DC2028F00C5DDBA /* libz.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = usr/lib/libz.tbd; sourceTree = SDKROOT; }; + 349756261DC1EBEE0058742A /* libcoding.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libcoding.a; path = "../../../omim-build/xcode/Debug/libcoding.a"; sourceTree = ""; }; + 349756281DC1EC060058742A /* libgeometry.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libgeometry.a; path = "../../../omim-build/xcode/Debug/libgeometry.a"; sourceTree = ""; }; + 3497562A1DC1EC220058742A /* libplatform.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libplatform.a; path = "../../../omim-build/xcode/Debug/libplatform.a"; sourceTree = ""; }; + 3497562C1DC1EC3F0058742A /* libbase.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libbase.a; path = "../../../omim-build/xcode/Debug/libbase.a"; sourceTree = ""; }; + 34F558511DBF38A000A4FC11 /* common-debug.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = "common-debug.xcconfig"; path = "../common-debug.xcconfig"; sourceTree = ""; }; + 34F558521DBF38A000A4FC11 /* common-release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = "common-release.xcconfig"; path = "../common-release.xcconfig"; sourceTree = ""; }; 675E88501DB7AC0300F8EBDA /* libtracking.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libtracking.a; sourceTree = BUILT_PRODUCTS_DIR; }; - 675E885E1DB7AC3A00F8EBDA /* defaults.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = defaults.xcconfig; path = ../defaults.xcconfig; sourceTree = ""; }; 675E88601DB7AC9000F8EBDA /* connection.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = connection.cpp; sourceTree = ""; }; 675E88611DB7AC9000F8EBDA /* connection.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = connection.hpp; sourceTree = ""; }; 675E88621DB7AC9000F8EBDA /* reporter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = reporter.cpp; sourceTree = ""; }; 675E88631DB7AC9000F8EBDA /* reporter.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = reporter.hpp; sourceTree = ""; }; 675E886C1DB7ACD900F8EBDA /* tracking_tests.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = tracking_tests.app; sourceTree = BUILT_PRODUCTS_DIR; }; 675E88841DB7AD1000F8EBDA /* reporter_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = reporter_test.cpp; sourceTree = ""; }; - 675E888E1DB7B03400F8EBDA /* libbase.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libbase.a; path = "/Users/darkserj/mapsme/omim/xcode/base/../../../omim-xcode-build/Debug/libbase.a"; sourceTree = ""; }; - 675E888F1DB7B03400F8EBDA /* libcoding.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libcoding.a; path = "/Users/darkserj/mapsme/omim/xcode/coding/../../../omim-xcode-build/Debug/libcoding.a"; sourceTree = ""; }; - 675E88901DB7B03400F8EBDA /* libgeometry.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libgeometry.a; path = "/Users/darkserj/mapsme/omim/xcode/geometry/../../../omim-xcode-build/Debug/libgeometry.a"; sourceTree = ""; }; - 675E88911DB7B03400F8EBDA /* libplatform.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libplatform.a; path = "/Users/darkserj/mapsme/omim/xcode/platform/../../../omim-xcode-build/Debug/libplatform.a"; sourceTree = ""; }; - 675E88961DB7B08500F8EBDA /* libplatform_tests_support.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libplatform_tests_support.a; path = "/Users/darkserj/mapsme/omim/xcode/platform/../../../omim-xcode-build/Debug/libplatform_tests_support.a"; sourceTree = ""; }; - 675E88971DB7B08500F8EBDA /* libtomcrypt.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libtomcrypt.a; path = "/Users/darkserj/mapsme/omim/xcode/tomcrypt/../../../omim-xcode-build/Debug/libtomcrypt.a"; sourceTree = ""; }; 6772592B1DBA26FD00BF54EE /* protocol.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = protocol.cpp; sourceTree = ""; }; 6772592C1DBA26FD00BF54EE /* protocol.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = protocol.hpp; sourceTree = ""; }; 67B6E7B71DB8BBA900745F8A /* testingmain.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = testingmain.cpp; path = ../../testing/testingmain.cpp; sourceTree = ""; }; @@ -58,13 +61,14 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 3496ABB41DC2028F00C5DDBA /* libz.tbd in Frameworks */, + 3496ABB21DC2026E00C5DDBA /* libalohalitics.a in Frameworks */, + 346B76CE1DC1ECC900C7C87E /* libtomcrypt.a in Frameworks */, + 3497562D1DC1EC3F0058742A /* libbase.a in Frameworks */, + 3497562B1DC1EC220058742A /* libplatform.a in Frameworks */, + 349756291DC1EC060058742A /* libgeometry.a in Frameworks */, + 349756271DC1EBEE0058742A /* libcoding.a in Frameworks */, 675E88A21DB7B10300F8EBDA /* libtracking.a in Frameworks */, - 675E88981DB7B08500F8EBDA /* libplatform_tests_support.a in Frameworks */, - 675E88991DB7B08500F8EBDA /* libtomcrypt.a in Frameworks */, - 675E88921DB7B03400F8EBDA /* libbase.a in Frameworks */, - 675E88931DB7B03400F8EBDA /* libcoding.a in Frameworks */, - 675E88941DB7B03400F8EBDA /* libgeometry.a in Frameworks */, - 675E88951DB7B03400F8EBDA /* libplatform.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -74,7 +78,8 @@ 675E88471DB7AC0300F8EBDA = { isa = PBXGroup; children = ( - 675E885E1DB7AC3A00F8EBDA /* defaults.xcconfig */, + 34F558511DBF38A000A4FC11 /* common-debug.xcconfig */, + 34F558521DBF38A000A4FC11 /* common-release.xcconfig */, 675E885F1DB7AC4A00F8EBDA /* tracking */, 675E88831DB7ACEA00F8EBDA /* tracking_tests */, 675E88511DB7AC0300F8EBDA /* Products */, @@ -119,12 +124,13 @@ 675E888D1DB7B03400F8EBDA /* Frameworks */ = { isa = PBXGroup; children = ( - 675E88961DB7B08500F8EBDA /* libplatform_tests_support.a */, - 675E88971DB7B08500F8EBDA /* libtomcrypt.a */, - 675E888E1DB7B03400F8EBDA /* libbase.a */, - 675E888F1DB7B03400F8EBDA /* libcoding.a */, - 675E88901DB7B03400F8EBDA /* libgeometry.a */, - 675E88911DB7B03400F8EBDA /* libplatform.a */, + 3496ABB31DC2028F00C5DDBA /* libz.tbd */, + 3496ABB11DC2026E00C5DDBA /* libalohalitics.a */, + 346B76CD1DC1ECC900C7C87E /* libtomcrypt.a */, + 3497562C1DC1EC3F0058742A /* libbase.a */, + 3497562A1DC1EC220058742A /* libplatform.a */, + 349756281DC1EC060058742A /* libgeometry.a */, + 349756261DC1EBEE0058742A /* libcoding.a */, ); name = Frameworks; sourceTree = ""; @@ -253,88 +259,15 @@ /* Begin XCBuildConfiguration section */ 675E88591DB7AC0300F8EBDA /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 675E885E1DB7AC3A00F8EBDA /* defaults.xcconfig */; + baseConfigurationReference = 34F558511DBF38A000A4FC11 /* common-debug.xcconfig */; buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_ANALYZER_NONNULL = YES; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INFINITE_RECURSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_SUSPICIOUS_MOVES = YES; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - CODE_SIGN_IDENTITY = "-"; - COPY_PHASE_STRIP = NO; - DEBUG_INFORMATION_FORMAT = dwarf; - ENABLE_STRICT_OBJC_MSGSEND = YES; - ENABLE_TESTABILITY = YES; - GCC_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; - MACOSX_DEPLOYMENT_TARGET = 10.12; - MTL_ENABLE_DEBUG_INFO = YES; - ONLY_ACTIVE_ARCH = YES; - SDKROOT = macosx; - SUPPORTED_PLATFORMS = "iphonesimulator iphoneos macosx"; }; name = Debug; }; 675E885A1DB7AC0300F8EBDA /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 675E885E1DB7AC3A00F8EBDA /* defaults.xcconfig */; + baseConfigurationReference = 34F558521DBF38A000A4FC11 /* common-release.xcconfig */; buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_ANALYZER_NONNULL = YES; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INFINITE_RECURSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_SUSPICIOUS_MOVES = YES; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - CODE_SIGN_IDENTITY = "-"; - COPY_PHASE_STRIP = NO; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - ENABLE_NS_ASSERTIONS = NO; - ENABLE_STRICT_OBJC_MSGSEND = YES; - GCC_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; - MACOSX_DEPLOYMENT_TARGET = 10.12; - MTL_ENABLE_DEBUG_INFO = NO; - SDKROOT = macosx; - SUPPORTED_PLATFORMS = "iphonesimulator iphoneos macosx"; }; name = Release; }; @@ -342,8 +275,6 @@ isa = XCBuildConfiguration; buildSettings = { EXECUTABLE_PREFIX = lib; - GCC_ENABLE_CPP_EXCEPTIONS = YES; - GCC_ENABLE_CPP_RTTI = YES; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Debug; @@ -352,8 +283,6 @@ isa = XCBuildConfiguration; buildSettings = { EXECUTABLE_PREFIX = lib; - GCC_ENABLE_CPP_EXCEPTIONS = YES; - GCC_ENABLE_CPP_RTTI = YES; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Release; @@ -362,20 +291,9 @@ isa = XCBuildConfiguration; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - GCC_INLINES_ARE_PRIVATE_EXTERN = NO; - GCC_PREPROCESSOR_DEFINITIONS = ( - "$(inherited)", - "OMIM_UNIT_TEST_WITH_QT_EVENT_LOOP=1", - ); - GCC_SYMBOLS_PRIVATE_EXTERN = NO; INFOPLIST_FILE = "$(SRCROOT)/../../iphone/Maps/MAPSME.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = "mail.ru.tracking-tests"; + PRODUCT_BUNDLE_IDENTIFIER = tracking_tests; PRODUCT_NAME = "$(TARGET_NAME)"; - SDKROOT = iphoneos; - TARGETED_DEVICE_FAMILY = "1,2"; }; name = Debug; }; @@ -383,18 +301,9 @@ isa = XCBuildConfiguration; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - GCC_INLINES_ARE_PRIVATE_EXTERN = NO; - GCC_PREPROCESSOR_DEFINITIONS = "OMIM_UNIT_TEST_WITH_QT_EVENT_LOOP=1"; - GCC_SYMBOLS_PRIVATE_EXTERN = NO; INFOPLIST_FILE = "$(SRCROOT)/../../iphone/Maps/MAPSME.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = "mail.ru.tracking-tests"; + PRODUCT_BUNDLE_IDENTIFIER = tracking_tests; PRODUCT_NAME = "$(TARGET_NAME)"; - SDKROOT = iphoneos; - TARGETED_DEVICE_FAMILY = "1,2"; - VALIDATE_PRODUCT = YES; }; name = Release; };