From 8868b8809f972b1a3282d69f036d4072493dd3ba Mon Sep 17 00:00:00 2001 From: Quanlong He Date: Tue, 9 Jun 2015 11:05:47 +0800 Subject: [PATCH 1/9] Build as framework --- .gitignore | 3 + Cartfile | 1 + Cartfile.resolved | 1 + Classes/Info.plist | 26 ++ Classes/Objective-LevelDB.h | 19 + Objective-LevelDB.xcodeproj/project.pbxproj | 331 ++++++++++++++++++ .../contents.xcworkspacedata | 7 + .../xcschemes/Objective-LevelDB.xcscheme | 100 ++++++ 8 files changed, 488 insertions(+) create mode 100644 Cartfile create mode 100644 Cartfile.resolved create mode 100644 Classes/Info.plist create mode 100644 Classes/Objective-LevelDB.h create mode 100644 Objective-LevelDB.xcodeproj/project.pbxproj create mode 100644 Objective-LevelDB.xcodeproj/project.xcworkspace/contents.xcworkspacedata create mode 100644 Objective-LevelDB.xcodeproj/xcshareddata/xcschemes/Objective-LevelDB.xcscheme diff --git a/.gitignore b/.gitignore index 648a386..6b94e0a 100644 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,6 @@ DerivedData #CocoaPods Pods + +# Carthage +Carthage/Checkouts diff --git a/Cartfile b/Cartfile new file mode 100644 index 0000000..821b057 --- /dev/null +++ b/Cartfile @@ -0,0 +1 @@ +github "cybertk/leveldb-darwin" "carthage" diff --git a/Cartfile.resolved b/Cartfile.resolved new file mode 100644 index 0000000..bd5d689 --- /dev/null +++ b/Cartfile.resolved @@ -0,0 +1 @@ +github "cybertk/leveldb-darwin" "a1f7ce0fe28221ac3abac38bc44550c87ef81fb9" diff --git a/Classes/Info.plist b/Classes/Info.plist new file mode 100644 index 0000000..906706b --- /dev/null +++ b/Classes/Info.plist @@ -0,0 +1,26 @@ + + + + + CFBundleDevelopmentRegion + en + CFBundleExecutable + $(EXECUTABLE_NAME) + CFBundleIdentifier + org.$(PRODUCT_NAME:rfc1034identifier) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + $(PRODUCT_NAME) + CFBundlePackageType + FMWK + CFBundleShortVersionString + 2.1.4 + CFBundleSignature + ???? + CFBundleVersion + $(CURRENT_PROJECT_VERSION) + NSPrincipalClass + + + diff --git a/Classes/Objective-LevelDB.h b/Classes/Objective-LevelDB.h new file mode 100644 index 0000000..e9fed93 --- /dev/null +++ b/Classes/Objective-LevelDB.h @@ -0,0 +1,19 @@ +// +// Objective-LevelDB.h +// Objective-LevelDB +// +// Created by Quanlong He on 6/9/15. +// Copyright (c) 2015 org. All rights reserved. +// + +#import + +//! Project version number for Objective-LevelDB. +FOUNDATION_EXPORT double Objective_LevelDBVersionNumber; + +//! Project version string for Objective-LevelDB. +FOUNDATION_EXPORT const unsigned char Objective_LevelDBVersionString[]; + +#import "LevelDB.h" +#import "LDBSnapshot.h" +#import "LDBWriteBatch.h diff --git a/Objective-LevelDB.xcodeproj/project.pbxproj b/Objective-LevelDB.xcodeproj/project.pbxproj new file mode 100644 index 0000000..b4e854c --- /dev/null +++ b/Objective-LevelDB.xcodeproj/project.pbxproj @@ -0,0 +1,331 @@ +// !$*UTF8*$! +{ + archiveVersion = 1; + classes = { + }; + objectVersion = 46; + objects = { + +/* Begin PBXBuildFile section */ + 921683BA1B268BD100561211 /* Common.h in Headers */ = {isa = PBXBuildFile; fileRef = 921683B11B268BD100561211 /* Common.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 921683BC1B268BD100561211 /* LDBSnapshot.h in Headers */ = {isa = PBXBuildFile; fileRef = 921683B31B268BD100561211 /* LDBSnapshot.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 921683BD1B268BD100561211 /* LDBSnapshot.mm in Sources */ = {isa = PBXBuildFile; fileRef = 921683B41B268BD100561211 /* LDBSnapshot.mm */; }; + 921683BE1B268BD100561211 /* LDBWriteBatch.h in Headers */ = {isa = PBXBuildFile; fileRef = 921683B51B268BD100561211 /* LDBWriteBatch.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 921683BF1B268BD100561211 /* LDBWriteBatch.mm in Sources */ = {isa = PBXBuildFile; fileRef = 921683B61B268BD100561211 /* LDBWriteBatch.mm */; }; + 921683C01B268BD100561211 /* LevelDB.h in Headers */ = {isa = PBXBuildFile; fileRef = 921683B71B268BD100561211 /* LevelDB.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 921683C11B268BD100561211 /* LevelDB.mm in Sources */ = {isa = PBXBuildFile; fileRef = 921683B81B268BD100561211 /* LevelDB.mm */; }; + 921683C21B268BD100561211 /* Objective-LevelDB.h in Headers */ = {isa = PBXBuildFile; fileRef = 921683B91B268BD100561211 /* Objective-LevelDB.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 921683C41B268E9F00561211 /* leveldb.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 921683C31B268E9F00561211 /* leveldb.framework */; }; +/* End PBXBuildFile section */ + +/* Begin PBXFileReference section */ + 921683951B268B8400561211 /* ObjectiveLevelDB.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = ObjectiveLevelDB.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 921683B11B268BD100561211 /* Common.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Common.h; path = Classes/Common.h; sourceTree = SOURCE_ROOT; }; + 921683B21B268BD100561211 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = Classes/Info.plist; sourceTree = SOURCE_ROOT; }; + 921683B31B268BD100561211 /* LDBSnapshot.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = LDBSnapshot.h; path = Classes/LDBSnapshot.h; sourceTree = SOURCE_ROOT; }; + 921683B41B268BD100561211 /* LDBSnapshot.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = LDBSnapshot.mm; path = Classes/LDBSnapshot.mm; sourceTree = SOURCE_ROOT; }; + 921683B51B268BD100561211 /* LDBWriteBatch.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = LDBWriteBatch.h; path = Classes/LDBWriteBatch.h; sourceTree = SOURCE_ROOT; }; + 921683B61B268BD100561211 /* LDBWriteBatch.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = LDBWriteBatch.mm; path = Classes/LDBWriteBatch.mm; sourceTree = SOURCE_ROOT; }; + 921683B71B268BD100561211 /* LevelDB.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = LevelDB.h; path = Classes/LevelDB.h; sourceTree = SOURCE_ROOT; }; + 921683B81B268BD100561211 /* LevelDB.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = LevelDB.mm; path = Classes/LevelDB.mm; sourceTree = SOURCE_ROOT; }; + 921683B91B268BD100561211 /* Objective-LevelDB.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "Objective-LevelDB.h"; path = "Classes/Objective-LevelDB.h"; sourceTree = SOURCE_ROOT; }; + 921683C31B268E9F00561211 /* leveldb.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = leveldb.framework; path = Carthage/Build/iOS/leveldb.framework; sourceTree = ""; }; +/* End PBXFileReference section */ + +/* Begin PBXFrameworksBuildPhase section */ + 921683911B268B8400561211 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + 921683C41B268E9F00561211 /* leveldb.framework in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXFrameworksBuildPhase section */ + +/* Begin PBXGroup section */ + 9216838B1B268B8400561211 = { + isa = PBXGroup; + children = ( + 921683C31B268E9F00561211 /* leveldb.framework */, + 921683971B268B8400561211 /* Objective-LevelDB */, + 921683961B268B8400561211 /* Products */, + ); + sourceTree = ""; + }; + 921683961B268B8400561211 /* Products */ = { + isa = PBXGroup; + children = ( + 921683951B268B8400561211 /* ObjectiveLevelDB.framework */, + ); + name = Products; + sourceTree = ""; + }; + 921683971B268B8400561211 /* Objective-LevelDB */ = { + isa = PBXGroup; + children = ( + 921683B11B268BD100561211 /* Common.h */, + 921683B31B268BD100561211 /* LDBSnapshot.h */, + 921683B41B268BD100561211 /* LDBSnapshot.mm */, + 921683B51B268BD100561211 /* LDBWriteBatch.h */, + 921683B61B268BD100561211 /* LDBWriteBatch.mm */, + 921683B71B268BD100561211 /* LevelDB.h */, + 921683B81B268BD100561211 /* LevelDB.mm */, + 921683B91B268BD100561211 /* Objective-LevelDB.h */, + 921683981B268B8400561211 /* Supporting Files */, + ); + path = "Objective-LevelDB"; + sourceTree = ""; + }; + 921683981B268B8400561211 /* Supporting Files */ = { + isa = PBXGroup; + children = ( + 921683B21B268BD100561211 /* Info.plist */, + ); + name = "Supporting Files"; + sourceTree = ""; + }; +/* End PBXGroup section */ + +/* Begin PBXHeadersBuildPhase section */ + 921683921B268B8400561211 /* Headers */ = { + isa = PBXHeadersBuildPhase; + buildActionMask = 2147483647; + files = ( + 921683BE1B268BD100561211 /* LDBWriteBatch.h in Headers */, + 921683C01B268BD100561211 /* LevelDB.h in Headers */, + 921683BA1B268BD100561211 /* Common.h in Headers */, + 921683BC1B268BD100561211 /* LDBSnapshot.h in Headers */, + 921683C21B268BD100561211 /* Objective-LevelDB.h in Headers */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXHeadersBuildPhase section */ + +/* Begin PBXNativeTarget section */ + 921683941B268B8400561211 /* ObjectiveLevelDB */ = { + isa = PBXNativeTarget; + buildConfigurationList = 921683AB1B268B8400561211 /* Build configuration list for PBXNativeTarget "ObjectiveLevelDB" */; + buildPhases = ( + 921683901B268B8400561211 /* Sources */, + 921683911B268B8400561211 /* Frameworks */, + 921683921B268B8400561211 /* Headers */, + 921683931B268B8400561211 /* Resources */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = ObjectiveLevelDB; + productName = "Objective-LevelDB"; + productReference = 921683951B268B8400561211 /* ObjectiveLevelDB.framework */; + productType = "com.apple.product-type.framework"; + }; +/* End PBXNativeTarget section */ + +/* Begin PBXProject section */ + 9216838C1B268B8400561211 /* Project object */ = { + isa = PBXProject; + attributes = { + LastUpgradeCheck = 0630; + ORGANIZATIONNAME = org; + TargetAttributes = { + 921683941B268B8400561211 = { + CreatedOnToolsVersion = 6.3.1; + }; + }; + }; + buildConfigurationList = 9216838F1B268B8400561211 /* Build configuration list for PBXProject "Objective-LevelDB" */; + compatibilityVersion = "Xcode 3.2"; + developmentRegion = English; + hasScannedForEncodings = 0; + knownRegions = ( + en, + ); + mainGroup = 9216838B1B268B8400561211; + productRefGroup = 921683961B268B8400561211 /* Products */; + projectDirPath = ""; + projectRoot = ""; + targets = ( + 921683941B268B8400561211 /* ObjectiveLevelDB */, + ); + }; +/* End PBXProject section */ + +/* Begin PBXResourcesBuildPhase section */ + 921683931B268B8400561211 /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXResourcesBuildPhase section */ + +/* Begin PBXSourcesBuildPhase section */ + 921683901B268B8400561211 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 921683BD1B268BD100561211 /* LDBSnapshot.mm in Sources */, + 921683BF1B268BD100561211 /* LDBWriteBatch.mm in Sources */, + 921683C11B268BD100561211 /* LevelDB.mm in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXSourcesBuildPhase section */ + +/* Begin XCBuildConfiguration section */ + 921683A91B268B8400561211 /* Debug */ = { + isa = XCBuildConfiguration; + 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[sdk=iphoneos*]" = "iPhone Developer"; + COPY_PHASE_STRIP = NO; + CURRENT_PROJECT_VERSION = 1; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + ENABLE_STRICT_OBJC_MSGSEND = 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_SYMBOLS_PRIVATE_EXTERN = NO; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 8.3; + MTL_ENABLE_DEBUG_INFO = YES; + ONLY_ACTIVE_ARCH = YES; + SDKROOT = iphoneos; + TARGETED_DEVICE_FAMILY = "1,2"; + VERSIONING_SYSTEM = "apple-generic"; + VERSION_INFO_PREFIX = ""; + }; + name = Debug; + }; + 921683AA1B268B8400561211 /* Release */ = { + isa = XCBuildConfiguration; + 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[sdk=iphoneos*]" = "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_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; + IPHONEOS_DEPLOYMENT_TARGET = 8.3; + MTL_ENABLE_DEBUG_INFO = NO; + SDKROOT = iphoneos; + TARGETED_DEVICE_FAMILY = "1,2"; + VALIDATE_PRODUCT = YES; + VERSIONING_SYSTEM = "apple-generic"; + VERSION_INFO_PREFIX = ""; + }; + name = Release; + }; + 921683AC1B268B8400561211 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + CLANG_ENABLE_OBJC_ARC = NO; + DEFINES_MODULE = YES; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + DYLIB_INSTALL_NAME_BASE = "@rpath"; + FRAMEWORK_SEARCH_PATHS = ( + "$(inherited)", + "$(PROJECT_DIR)/Carthage/Build/iOS", + ); + INFOPLIST_FILE = "$(SRCROOT)/Classes/Info.plist"; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + PRODUCT_NAME = "$(TARGET_NAME)"; + SKIP_INSTALL = YES; + }; + name = Debug; + }; + 921683AD1B268B8400561211 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + CLANG_ENABLE_OBJC_ARC = NO; + DEFINES_MODULE = YES; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + DYLIB_INSTALL_NAME_BASE = "@rpath"; + FRAMEWORK_SEARCH_PATHS = ( + "$(inherited)", + "$(PROJECT_DIR)/Carthage/Build/iOS", + ); + INFOPLIST_FILE = "$(SRCROOT)/Classes/Info.plist"; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + PRODUCT_NAME = "$(TARGET_NAME)"; + SKIP_INSTALL = YES; + }; + name = Release; + }; +/* End XCBuildConfiguration section */ + +/* Begin XCConfigurationList section */ + 9216838F1B268B8400561211 /* Build configuration list for PBXProject "Objective-LevelDB" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 921683A91B268B8400561211 /* Debug */, + 921683AA1B268B8400561211 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 921683AB1B268B8400561211 /* Build configuration list for PBXNativeTarget "ObjectiveLevelDB" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 921683AC1B268B8400561211 /* Debug */, + 921683AD1B268B8400561211 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; +/* End XCConfigurationList section */ + }; + rootObject = 9216838C1B268B8400561211 /* Project object */; +} diff --git a/Objective-LevelDB.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/Objective-LevelDB.xcodeproj/project.xcworkspace/contents.xcworkspacedata new file mode 100644 index 0000000..635f889 --- /dev/null +++ b/Objective-LevelDB.xcodeproj/project.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,7 @@ + + + + + diff --git a/Objective-LevelDB.xcodeproj/xcshareddata/xcschemes/Objective-LevelDB.xcscheme b/Objective-LevelDB.xcodeproj/xcshareddata/xcschemes/Objective-LevelDB.xcscheme new file mode 100644 index 0000000..8946f81 --- /dev/null +++ b/Objective-LevelDB.xcodeproj/xcshareddata/xcschemes/Objective-LevelDB.xcscheme @@ -0,0 +1,100 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From ee40ca27bf95db50db53058030958bf5d3ed428a Mon Sep 17 00:00:00 2001 From: Quanlong He Date: Wed, 17 Jun 2015 23:49:40 +0800 Subject: [PATCH 2/9] Add `Objective-LevelDB.xcodeproj` into xcworkspace --- Objective-LevelDB.xcworkspace/contents.xcworkspacedata | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Objective-LevelDB.xcworkspace/contents.xcworkspacedata b/Objective-LevelDB.xcworkspace/contents.xcworkspacedata index 08f039e..9b11ce4 100644 --- a/Objective-LevelDB.xcworkspace/contents.xcworkspacedata +++ b/Objective-LevelDB.xcworkspace/contents.xcworkspacedata @@ -35,4 +35,7 @@ + + From 6fd796e81b62376dc9e30b5a130271e737dfc21d Mon Sep 17 00:00:00 2001 From: Quanlong He Date: Thu, 18 Jun 2015 01:00:23 +0800 Subject: [PATCH 3/9] Bump leveldb-darwin --- Cartfile | 2 +- Cartfile.resolved | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Cartfile b/Cartfile index 821b057..c779660 100644 --- a/Cartfile +++ b/Cartfile @@ -1 +1 @@ -github "cybertk/leveldb-darwin" "carthage" +github "cybertk/leveldb-darwin" diff --git a/Cartfile.resolved b/Cartfile.resolved index bd5d689..1bb38e6 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -1 +1 @@ -github "cybertk/leveldb-darwin" "a1f7ce0fe28221ac3abac38bc44550c87ef81fb9" +github "cybertk/leveldb-darwin" "v0.1.0" From e0e7a69aa74778d436fc5c2ebd4f0d9c84b6f2df Mon Sep 17 00:00:00 2001 From: Quanlong He Date: Wed, 24 Jun 2015 17:43:52 +0800 Subject: [PATCH 4/9] Fix: unresoloved module --- Classes/{Objective-LevelDB.h => ObjectiveLevelDB.h} | 2 +- Objective-LevelDB.xcodeproj/project.pbxproj | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) rename Classes/{Objective-LevelDB.h => ObjectiveLevelDB.h} (94%) diff --git a/Classes/Objective-LevelDB.h b/Classes/ObjectiveLevelDB.h similarity index 94% rename from Classes/Objective-LevelDB.h rename to Classes/ObjectiveLevelDB.h index e9fed93..f0b1e6e 100644 --- a/Classes/Objective-LevelDB.h +++ b/Classes/ObjectiveLevelDB.h @@ -16,4 +16,4 @@ FOUNDATION_EXPORT const unsigned char Objective_LevelDBVersionString[]; #import "LevelDB.h" #import "LDBSnapshot.h" -#import "LDBWriteBatch.h +#import "LDBWriteBatch.h" diff --git a/Objective-LevelDB.xcodeproj/project.pbxproj b/Objective-LevelDB.xcodeproj/project.pbxproj index b4e854c..9b9d857 100644 --- a/Objective-LevelDB.xcodeproj/project.pbxproj +++ b/Objective-LevelDB.xcodeproj/project.pbxproj @@ -7,14 +7,14 @@ objects = { /* Begin PBXBuildFile section */ - 921683BA1B268BD100561211 /* Common.h in Headers */ = {isa = PBXBuildFile; fileRef = 921683B11B268BD100561211 /* Common.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 921683BA1B268BD100561211 /* Common.h in Headers */ = {isa = PBXBuildFile; fileRef = 921683B11B268BD100561211 /* Common.h */; settings = {ATTRIBUTES = (Private, ); }; }; 921683BC1B268BD100561211 /* LDBSnapshot.h in Headers */ = {isa = PBXBuildFile; fileRef = 921683B31B268BD100561211 /* LDBSnapshot.h */; settings = {ATTRIBUTES = (Public, ); }; }; 921683BD1B268BD100561211 /* LDBSnapshot.mm in Sources */ = {isa = PBXBuildFile; fileRef = 921683B41B268BD100561211 /* LDBSnapshot.mm */; }; 921683BE1B268BD100561211 /* LDBWriteBatch.h in Headers */ = {isa = PBXBuildFile; fileRef = 921683B51B268BD100561211 /* LDBWriteBatch.h */; settings = {ATTRIBUTES = (Public, ); }; }; 921683BF1B268BD100561211 /* LDBWriteBatch.mm in Sources */ = {isa = PBXBuildFile; fileRef = 921683B61B268BD100561211 /* LDBWriteBatch.mm */; }; 921683C01B268BD100561211 /* LevelDB.h in Headers */ = {isa = PBXBuildFile; fileRef = 921683B71B268BD100561211 /* LevelDB.h */; settings = {ATTRIBUTES = (Public, ); }; }; 921683C11B268BD100561211 /* LevelDB.mm in Sources */ = {isa = PBXBuildFile; fileRef = 921683B81B268BD100561211 /* LevelDB.mm */; }; - 921683C21B268BD100561211 /* Objective-LevelDB.h in Headers */ = {isa = PBXBuildFile; fileRef = 921683B91B268BD100561211 /* Objective-LevelDB.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 921683C21B268BD100561211 /* ObjectiveLevelDB.h in Headers */ = {isa = PBXBuildFile; fileRef = 921683B91B268BD100561211 /* ObjectiveLevelDB.h */; settings = {ATTRIBUTES = (Public, ); }; }; 921683C41B268E9F00561211 /* leveldb.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 921683C31B268E9F00561211 /* leveldb.framework */; }; /* End PBXBuildFile section */ @@ -28,7 +28,7 @@ 921683B61B268BD100561211 /* LDBWriteBatch.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = LDBWriteBatch.mm; path = Classes/LDBWriteBatch.mm; sourceTree = SOURCE_ROOT; }; 921683B71B268BD100561211 /* LevelDB.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = LevelDB.h; path = Classes/LevelDB.h; sourceTree = SOURCE_ROOT; }; 921683B81B268BD100561211 /* LevelDB.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = LevelDB.mm; path = Classes/LevelDB.mm; sourceTree = SOURCE_ROOT; }; - 921683B91B268BD100561211 /* Objective-LevelDB.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "Objective-LevelDB.h"; path = "Classes/Objective-LevelDB.h"; sourceTree = SOURCE_ROOT; }; + 921683B91B268BD100561211 /* ObjectiveLevelDB.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ObjectiveLevelDB.h; path = Classes/ObjectiveLevelDB.h; sourceTree = SOURCE_ROOT; }; 921683C31B268E9F00561211 /* leveldb.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = leveldb.framework; path = Carthage/Build/iOS/leveldb.framework; sourceTree = ""; }; /* End PBXFileReference section */ @@ -71,7 +71,7 @@ 921683B61B268BD100561211 /* LDBWriteBatch.mm */, 921683B71B268BD100561211 /* LevelDB.h */, 921683B81B268BD100561211 /* LevelDB.mm */, - 921683B91B268BD100561211 /* Objective-LevelDB.h */, + 921683B91B268BD100561211 /* ObjectiveLevelDB.h */, 921683981B268B8400561211 /* Supporting Files */, ); path = "Objective-LevelDB"; @@ -94,9 +94,9 @@ files = ( 921683BE1B268BD100561211 /* LDBWriteBatch.h in Headers */, 921683C01B268BD100561211 /* LevelDB.h in Headers */, - 921683BA1B268BD100561211 /* Common.h in Headers */, 921683BC1B268BD100561211 /* LDBSnapshot.h in Headers */, - 921683C21B268BD100561211 /* Objective-LevelDB.h in Headers */, + 921683C21B268BD100561211 /* ObjectiveLevelDB.h in Headers */, + 921683BA1B268BD100561211 /* Common.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; From 50025071c2fb7e7f0eb5c08fa82390244b9048f8 Mon Sep 17 00:00:00 2001 From: Quanlong He Date: Wed, 24 Jun 2015 18:27:00 +0800 Subject: [PATCH 5/9] Bump leveldb-darwin --- Cartfile.resolved | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cartfile.resolved b/Cartfile.resolved index 1bb38e6..ff36137 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -1 +1 @@ -github "cybertk/leveldb-darwin" "v0.1.0" +github "cybertk/leveldb-darwin" "v0.1.1" From d883f54802b01f1a0e29d587088faba3777bcc95 Mon Sep 17 00:00:00 2001 From: Quanlong He Date: Wed, 24 Jun 2015 22:39:23 +0800 Subject: [PATCH 6/9] carthage: Track as submodules --- .gitignore | 2 +- .gitmodules | 3 +++ Carthage/Checkouts/leveldb-darwin | 1 + 3 files changed, 5 insertions(+), 1 deletion(-) create mode 160000 Carthage/Checkouts/leveldb-darwin diff --git a/.gitignore b/.gitignore index 6b94e0a..531884d 100644 --- a/.gitignore +++ b/.gitignore @@ -26,4 +26,4 @@ DerivedData Pods # Carthage -Carthage/Checkouts +Carthage/Build diff --git a/.gitmodules b/.gitmodules index e69de29..febaa55 100644 --- a/.gitmodules +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "Carthage/Checkouts/leveldb-darwin"] + path = Carthage/Checkouts/leveldb-darwin + url = https://github.com/cybertk/leveldb-darwin.git diff --git a/Carthage/Checkouts/leveldb-darwin b/Carthage/Checkouts/leveldb-darwin new file mode 160000 index 0000000..9e5c32a --- /dev/null +++ b/Carthage/Checkouts/leveldb-darwin @@ -0,0 +1 @@ +Subproject commit 9e5c32a7bb2b56c25dab1bb8b95ecb9f119e8b1b From ef01a2a016e9db84176d7d23cd324d409336e52f Mon Sep 17 00:00:00 2001 From: Quanlong He Date: Wed, 24 Jun 2015 22:44:31 +0800 Subject: [PATCH 7/9] Fix warnings: Umbrella header does not include xx --- Objective-LevelDB.xcodeproj/project.pbxproj | 2 -- ...lDB.xcscheme => ObjectiveLevelDB.xcscheme} | 23 ------------------- 2 files changed, 25 deletions(-) rename Objective-LevelDB.xcodeproj/xcshareddata/xcschemes/{Objective-LevelDB.xcscheme => ObjectiveLevelDB.xcscheme} (73%) diff --git a/Objective-LevelDB.xcodeproj/project.pbxproj b/Objective-LevelDB.xcodeproj/project.pbxproj index 9b9d857..7b20dfa 100644 --- a/Objective-LevelDB.xcodeproj/project.pbxproj +++ b/Objective-LevelDB.xcodeproj/project.pbxproj @@ -7,7 +7,6 @@ objects = { /* Begin PBXBuildFile section */ - 921683BA1B268BD100561211 /* Common.h in Headers */ = {isa = PBXBuildFile; fileRef = 921683B11B268BD100561211 /* Common.h */; settings = {ATTRIBUTES = (Private, ); }; }; 921683BC1B268BD100561211 /* LDBSnapshot.h in Headers */ = {isa = PBXBuildFile; fileRef = 921683B31B268BD100561211 /* LDBSnapshot.h */; settings = {ATTRIBUTES = (Public, ); }; }; 921683BD1B268BD100561211 /* LDBSnapshot.mm in Sources */ = {isa = PBXBuildFile; fileRef = 921683B41B268BD100561211 /* LDBSnapshot.mm */; }; 921683BE1B268BD100561211 /* LDBWriteBatch.h in Headers */ = {isa = PBXBuildFile; fileRef = 921683B51B268BD100561211 /* LDBWriteBatch.h */; settings = {ATTRIBUTES = (Public, ); }; }; @@ -96,7 +95,6 @@ 921683C01B268BD100561211 /* LevelDB.h in Headers */, 921683BC1B268BD100561211 /* LDBSnapshot.h in Headers */, 921683C21B268BD100561211 /* ObjectiveLevelDB.h in Headers */, - 921683BA1B268BD100561211 /* Common.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/Objective-LevelDB.xcodeproj/xcshareddata/xcschemes/Objective-LevelDB.xcscheme b/Objective-LevelDB.xcodeproj/xcshareddata/xcschemes/ObjectiveLevelDB.xcscheme similarity index 73% rename from Objective-LevelDB.xcodeproj/xcshareddata/xcschemes/Objective-LevelDB.xcscheme rename to Objective-LevelDB.xcodeproj/xcshareddata/xcschemes/ObjectiveLevelDB.xcscheme index 8946f81..e533909 100644 --- a/Objective-LevelDB.xcodeproj/xcshareddata/xcschemes/Objective-LevelDB.xcscheme +++ b/Objective-LevelDB.xcodeproj/xcshareddata/xcschemes/ObjectiveLevelDB.xcscheme @@ -20,20 +20,6 @@ ReferencedContainer = "container:Objective-LevelDB.xcodeproj"> - - - - - - - - Date: Wed, 24 Jun 2015 23:04:38 +0800 Subject: [PATCH 8/9] Bump leveldb-darwin to 0.1.2 --- Cartfile.resolved | 2 +- Carthage/Checkouts/leveldb-darwin | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Cartfile.resolved b/Cartfile.resolved index ff36137..b2b73af 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -1 +1 @@ -github "cybertk/leveldb-darwin" "v0.1.1" +github "cybertk/leveldb-darwin" "v0.1.2" diff --git a/Carthage/Checkouts/leveldb-darwin b/Carthage/Checkouts/leveldb-darwin index 9e5c32a..a048492 160000 --- a/Carthage/Checkouts/leveldb-darwin +++ b/Carthage/Checkouts/leveldb-darwin @@ -1 +1 @@ -Subproject commit 9e5c32a7bb2b56c25dab1bb8b95ecb9f119e8b1b +Subproject commit a048492322d1302fc286984241bd290270c77fc1 From 5ffeb949ae026701d5eeb804c0cb8968f20a3765 Mon Sep 17 00:00:00 2001 From: Quanlong He Date: Wed, 1 Jul 2015 09:00:50 +0800 Subject: [PATCH 9/9] Fix warning: linking against dylib not safe for use in application extensions --- Objective-LevelDB.xcodeproj/project.pbxproj | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Objective-LevelDB.xcodeproj/project.pbxproj b/Objective-LevelDB.xcodeproj/project.pbxproj index 7b20dfa..7545d9d 100644 --- a/Objective-LevelDB.xcodeproj/project.pbxproj +++ b/Objective-LevelDB.xcodeproj/project.pbxproj @@ -265,6 +265,7 @@ 921683AC1B268B8400561211 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + APPLICATION_EXTENSION_API_ONLY = YES; CLANG_ENABLE_OBJC_ARC = NO; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; @@ -285,6 +286,7 @@ 921683AD1B268B8400561211 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + APPLICATION_EXTENSION_API_ONLY = YES; CLANG_ENABLE_OBJC_ARC = NO; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1;