From 368ba2e164b9615548b157f824aeb2b69367bbd6 Mon Sep 17 00:00:00 2001 From: Ilya Grechuhin Date: Thu, 7 Jan 2016 14:30:38 +0300 Subject: [PATCH] [ios] Fixed xc target. --- xcode/editor/editor.xcodeproj/project.pbxproj | 8 + .../oauthcpp.xcodeproj/project.pbxproj | 297 ++++++++++++++++++ .../omim.xcworkspace/contents.xcworkspacedata | 3 + 3 files changed, 308 insertions(+) create mode 100644 xcode/oauthcpp/oauthcpp.xcodeproj/project.pbxproj diff --git a/xcode/editor/editor.xcodeproj/project.pbxproj b/xcode/editor/editor.xcodeproj/project.pbxproj index 91616e1503..8cac624de7 100644 --- a/xcode/editor/editor.xcodeproj/project.pbxproj +++ b/xcode/editor/editor.xcodeproj/project.pbxproj @@ -7,6 +7,8 @@ objects = { /* Begin PBXBuildFile section */ + 340C20DE1C3E4DFD00111D22 /* osm_auth.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 340C20DC1C3E4DFD00111D22 /* osm_auth.cpp */; }; + 340C20DF1C3E4DFD00111D22 /* osm_auth.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 340C20DD1C3E4DFD00111D22 /* osm_auth.hpp */; }; 341138781C15AE42002E3B3E /* opening_hours_ui.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 341138741C15AE42002E3B3E /* opening_hours_ui.cpp */; }; 341138791C15AE42002E3B3E /* opening_hours_ui.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 341138751C15AE42002E3B3E /* opening_hours_ui.hpp */; }; 3411387A1C15AE42002E3B3E /* ui2oh.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 341138761C15AE42002E3B3E /* ui2oh.cpp */; }; @@ -18,6 +20,8 @@ /* End PBXBuildFile section */ /* Begin PBXFileReference section */ + 340C20DC1C3E4DFD00111D22 /* osm_auth.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = osm_auth.cpp; sourceTree = ""; }; + 340C20DD1C3E4DFD00111D22 /* osm_auth.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = osm_auth.hpp; sourceTree = ""; }; 3411386B1C15AD97002E3B3E /* libeditor.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libeditor.a; sourceTree = BUILT_PRODUCTS_DIR; }; 341138721C15ADB7002E3B3E /* defaults.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = defaults.xcconfig; path = ../defaults.xcconfig; sourceTree = ""; }; 341138741C15AE42002E3B3E /* opening_hours_ui.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = opening_hours_ui.cpp; sourceTree = ""; }; @@ -61,6 +65,8 @@ 341138731C15AE02002E3B3E /* Editor */ = { isa = PBXGroup; children = ( + 340C20DC1C3E4DFD00111D22 /* osm_auth.cpp */, + 340C20DD1C3E4DFD00111D22 /* osm_auth.hpp */, 347C71261C295B1100BE9208 /* xml_feature.cpp */, 34FFB34A1C316A7600BFF6C3 /* server_api.cpp */, 34FFB34B1C316A7600BFF6C3 /* server_api.hpp */, @@ -83,6 +89,7 @@ files = ( 34FFB34D1C316A7600BFF6C3 /* server_api.hpp in Headers */, 347C71291C295B1100BE9208 /* xml_feature.hpp in Headers */, + 340C20DF1C3E4DFD00111D22 /* osm_auth.hpp in Headers */, 3411387B1C15AE42002E3B3E /* ui2oh.hpp in Headers */, 341138791C15AE42002E3B3E /* opening_hours_ui.hpp in Headers */, ); @@ -146,6 +153,7 @@ files = ( 347C71281C295B1100BE9208 /* xml_feature.cpp in Sources */, 341138781C15AE42002E3B3E /* opening_hours_ui.cpp in Sources */, + 340C20DE1C3E4DFD00111D22 /* osm_auth.cpp in Sources */, 3411387A1C15AE42002E3B3E /* ui2oh.cpp in Sources */, 34FFB34C1C316A7600BFF6C3 /* server_api.cpp in Sources */, ); diff --git a/xcode/oauthcpp/oauthcpp.xcodeproj/project.pbxproj b/xcode/oauthcpp/oauthcpp.xcodeproj/project.pbxproj new file mode 100644 index 0000000000..94a53f362c --- /dev/null +++ b/xcode/oauthcpp/oauthcpp.xcodeproj/project.pbxproj @@ -0,0 +1,297 @@ +// !$*UTF8*$! +{ + archiveVersion = 1; + classes = { + }; + objectVersion = 46; + objects = { + +/* Begin PBXBuildFile section */ + 340C21011C3E5EED00111D22 /* base64.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 340C20F81C3E5EED00111D22 /* base64.cpp */; }; + 340C21021C3E5EED00111D22 /* base64.h in Headers */ = {isa = PBXBuildFile; fileRef = 340C20F91C3E5EED00111D22 /* base64.h */; }; + 340C21031C3E5EED00111D22 /* HMAC_SHA1.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 340C20FA1C3E5EED00111D22 /* HMAC_SHA1.cpp */; }; + 340C21041C3E5EED00111D22 /* HMAC_SHA1.h in Headers */ = {isa = PBXBuildFile; fileRef = 340C20FB1C3E5EED00111D22 /* HMAC_SHA1.h */; }; + 340C21051C3E5EED00111D22 /* liboauthcpp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 340C20FC1C3E5EED00111D22 /* liboauthcpp.cpp */; }; + 340C21061C3E5EED00111D22 /* SHA1.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 340C20FD1C3E5EED00111D22 /* SHA1.cpp */; }; + 340C21071C3E5EED00111D22 /* SHA1.h in Headers */ = {isa = PBXBuildFile; fileRef = 340C20FE1C3E5EED00111D22 /* SHA1.h */; }; + 340C21081C3E5EED00111D22 /* urlencode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 340C20FF1C3E5EED00111D22 /* urlencode.cpp */; }; + 340C21091C3E5EED00111D22 /* urlencode.h in Headers */ = {isa = PBXBuildFile; fileRef = 340C21001C3E5EED00111D22 /* urlencode.h */; }; + 340C210B1C3E5EF600111D22 /* liboauthcpp.h in Headers */ = {isa = PBXBuildFile; fileRef = 340C210A1C3E5EF600111D22 /* liboauthcpp.h */; }; +/* End PBXBuildFile section */ + +/* Begin PBXFileReference section */ + 340C20EF1C3E5E5000111D22 /* liboauthcpp.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = liboauthcpp.a; sourceTree = BUILT_PRODUCTS_DIR; }; + 340C20F61C3E5E6600111D22 /* defaults.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = defaults.xcconfig; path = ../defaults.xcconfig; sourceTree = ""; }; + 340C20F81C3E5EED00111D22 /* base64.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = base64.cpp; path = src/base64.cpp; sourceTree = ""; }; + 340C20F91C3E5EED00111D22 /* base64.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = base64.h; path = src/base64.h; sourceTree = ""; }; + 340C20FA1C3E5EED00111D22 /* HMAC_SHA1.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = HMAC_SHA1.cpp; path = src/HMAC_SHA1.cpp; sourceTree = ""; }; + 340C20FB1C3E5EED00111D22 /* HMAC_SHA1.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = HMAC_SHA1.h; path = src/HMAC_SHA1.h; sourceTree = ""; }; + 340C20FC1C3E5EED00111D22 /* liboauthcpp.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = liboauthcpp.cpp; path = src/liboauthcpp.cpp; sourceTree = ""; }; + 340C20FD1C3E5EED00111D22 /* SHA1.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SHA1.cpp; path = src/SHA1.cpp; sourceTree = ""; }; + 340C20FE1C3E5EED00111D22 /* SHA1.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SHA1.h; path = src/SHA1.h; sourceTree = ""; }; + 340C20FF1C3E5EED00111D22 /* urlencode.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = urlencode.cpp; path = src/urlencode.cpp; sourceTree = ""; }; + 340C21001C3E5EED00111D22 /* urlencode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = urlencode.h; path = src/urlencode.h; sourceTree = ""; }; + 340C210A1C3E5EF600111D22 /* liboauthcpp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = liboauthcpp.h; path = include/liboauthcpp/liboauthcpp.h; sourceTree = ""; }; +/* End PBXFileReference section */ + +/* Begin PBXFrameworksBuildPhase section */ + 340C20EC1C3E5E5000111D22 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXFrameworksBuildPhase section */ + +/* Begin PBXGroup section */ + 340C20E61C3E5E5000111D22 = { + isa = PBXGroup; + children = ( + 340C20F61C3E5E6600111D22 /* defaults.xcconfig */, + 340C20F71C3E5EA200111D22 /* liboauthcpp */, + 340C20F01C3E5E5000111D22 /* Products */, + ); + sourceTree = ""; + }; + 340C20F01C3E5E5000111D22 /* Products */ = { + isa = PBXGroup; + children = ( + 340C20EF1C3E5E5000111D22 /* liboauthcpp.a */, + ); + name = Products; + sourceTree = ""; + }; + 340C20F71C3E5EA200111D22 /* liboauthcpp */ = { + isa = PBXGroup; + children = ( + 340C210A1C3E5EF600111D22 /* liboauthcpp.h */, + 340C20F81C3E5EED00111D22 /* base64.cpp */, + 340C20F91C3E5EED00111D22 /* base64.h */, + 340C20FA1C3E5EED00111D22 /* HMAC_SHA1.cpp */, + 340C20FB1C3E5EED00111D22 /* HMAC_SHA1.h */, + 340C20FC1C3E5EED00111D22 /* liboauthcpp.cpp */, + 340C20FD1C3E5EED00111D22 /* SHA1.cpp */, + 340C20FE1C3E5EED00111D22 /* SHA1.h */, + 340C20FF1C3E5EED00111D22 /* urlencode.cpp */, + 340C21001C3E5EED00111D22 /* urlencode.h */, + ); + name = liboauthcpp; + path = ../../3party/liboauthcpp; + sourceTree = ""; + }; +/* End PBXGroup section */ + +/* Begin PBXHeadersBuildPhase section */ + 340C20ED1C3E5E5000111D22 /* Headers */ = { + isa = PBXHeadersBuildPhase; + buildActionMask = 2147483647; + files = ( + 340C21041C3E5EED00111D22 /* HMAC_SHA1.h in Headers */, + 340C21021C3E5EED00111D22 /* base64.h in Headers */, + 340C21091C3E5EED00111D22 /* urlencode.h in Headers */, + 340C210B1C3E5EF600111D22 /* liboauthcpp.h in Headers */, + 340C21071C3E5EED00111D22 /* SHA1.h in Headers */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXHeadersBuildPhase section */ + +/* Begin PBXNativeTarget section */ + 340C20EE1C3E5E5000111D22 /* oauthcpp */ = { + isa = PBXNativeTarget; + buildConfigurationList = 340C20F31C3E5E5000111D22 /* Build configuration list for PBXNativeTarget "oauthcpp" */; + buildPhases = ( + 340C20EB1C3E5E5000111D22 /* Sources */, + 340C20EC1C3E5E5000111D22 /* Frameworks */, + 340C20ED1C3E5E5000111D22 /* Headers */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = oauthcpp; + productName = oauthcpp; + productReference = 340C20EF1C3E5E5000111D22 /* liboauthcpp.a */; + productType = "com.apple.product-type.library.static"; + }; +/* End PBXNativeTarget section */ + +/* Begin PBXProject section */ + 340C20E71C3E5E5000111D22 /* Project object */ = { + isa = PBXProject; + attributes = { + LastUpgradeCheck = 0720; + ORGANIZATIONNAME = My.com; + TargetAttributes = { + 340C20EE1C3E5E5000111D22 = { + CreatedOnToolsVersion = 7.2; + }; + }; + }; + buildConfigurationList = 340C20EA1C3E5E5000111D22 /* Build configuration list for PBXProject "oauthcpp" */; + compatibilityVersion = "Xcode 3.2"; + developmentRegion = English; + hasScannedForEncodings = 0; + knownRegions = ( + en, + ); + mainGroup = 340C20E61C3E5E5000111D22; + productRefGroup = 340C20F01C3E5E5000111D22 /* Products */; + projectDirPath = ""; + projectRoot = ""; + targets = ( + 340C20EE1C3E5E5000111D22 /* oauthcpp */, + ); + }; +/* End PBXProject section */ + +/* Begin PBXSourcesBuildPhase section */ + 340C20EB1C3E5E5000111D22 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 340C21081C3E5EED00111D22 /* urlencode.cpp in Sources */, + 340C21011C3E5EED00111D22 /* base64.cpp in Sources */, + 340C21031C3E5EED00111D22 /* HMAC_SHA1.cpp in Sources */, + 340C21061C3E5EED00111D22 /* SHA1.cpp in Sources */, + 340C21051C3E5EED00111D22 /* liboauthcpp.cpp in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXSourcesBuildPhase section */ + +/* Begin XCBuildConfiguration section */ + 340C20F11C3E5E5000111D22 /* Debug */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 340C20F61C3E5E6600111D22 /* defaults.xcconfig */; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + CODE_SIGN_IDENTITY = "-"; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = dwarf; + ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_TESTABILITY = YES; + GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_DYNAMIC_NO_PIC = NO; + GCC_NO_COMMON_BLOCKS = YES; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PREPROCESSOR_DEFINITIONS = ( + "DEBUG=1", + "$(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; + HEADER_SEARCH_PATHS = ( + "$(OMIM_ROOT)", + "$(BOOST_ROOT)", + "$(OMIM_ROOT)/3party/liboauthcpp/include", + ); + MACOSX_DEPLOYMENT_TARGET = 10.11; + MTL_ENABLE_DEBUG_INFO = YES; + ONLY_ACTIVE_ARCH = YES; + SDKROOT = macosx; + SUPPORTED_PLATFORMS = "iphonesimulator iphoneos macosx"; + }; + name = Debug; + }; + 340C20F21C3E5E5000111D22 /* Release */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 340C20F61C3E5E6600111D22 /* defaults.xcconfig */; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + CODE_SIGN_IDENTITY = "-"; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + ENABLE_NS_ASSERTIONS = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; + GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_NO_COMMON_BLOCKS = YES; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + HEADER_SEARCH_PATHS = ( + "$(OMIM_ROOT)", + "$(BOOST_ROOT)", + "$(OMIM_ROOT)/3party/liboauthcpp/include", + ); + MACOSX_DEPLOYMENT_TARGET = 10.11; + MTL_ENABLE_DEBUG_INFO = NO; + SDKROOT = macosx; + SUPPORTED_PLATFORMS = "iphonesimulator iphoneos macosx"; + }; + name = Release; + }; + 340C20F41C3E5E5000111D22 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + EXECUTABLE_PREFIX = lib; + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = Debug; + }; + 340C20F51C3E5E5000111D22 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + EXECUTABLE_PREFIX = lib; + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = Release; + }; +/* End XCBuildConfiguration section */ + +/* Begin XCConfigurationList section */ + 340C20EA1C3E5E5000111D22 /* Build configuration list for PBXProject "oauthcpp" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 340C20F11C3E5E5000111D22 /* Debug */, + 340C20F21C3E5E5000111D22 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 340C20F31C3E5E5000111D22 /* Build configuration list for PBXNativeTarget "oauthcpp" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 340C20F41C3E5E5000111D22 /* Debug */, + 340C20F51C3E5E5000111D22 /* Release */, + ); + defaultConfigurationIsVisible = 0; + }; +/* End XCConfigurationList section */ + }; + rootObject = 340C20E71C3E5E5000111D22 /* Project object */; +} diff --git a/xcode/omim.xcworkspace/contents.xcworkspacedata b/xcode/omim.xcworkspace/contents.xcworkspacedata index db696d77b5..9b16c04836 100644 --- a/xcode/omim.xcworkspace/contents.xcworkspacedata +++ b/xcode/omim.xcworkspace/contents.xcworkspacedata @@ -61,6 +61,9 @@ + +