Skip to content

Commit

Permalink
Merge branch 'master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
@SoXeon
SoXeon authored Feb 9, 2017
2 parents 6c1343f + cd86035 commit fcf09ac
Show file tree
Hide file tree
Showing 24 changed files with 257 additions and 139 deletions.
2 changes: 1 addition & 1 deletion BeeHive.podspec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
Pod::Spec.new do |s|

s.name = "BeeHive"
s.version = "1.1.0"
s.version = "1.1.2"
s.summary = "BeeHive is a kind of modular programming method"

s.description = <<-DESC
Expand Down
120 changes: 65 additions & 55 deletions BeeHive.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,10 @@
D85037D31B9C6D8400864DF0 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D85037D21B9C6D8400864DF0 /* Foundation.framework */; };
D85037D81B9C6D8400864DF0 /* BeeHive-Prefix.pch in Headers */ = {isa = PBXBuildFile; fileRef = D85037D71B9C6D8400864DF0 /* BeeHive-Prefix.pch */; };
D85037DA1B9C6D8400864DF0 /* BeeHive-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = D85037D91B9C6D8400864DF0 /* BeeHive-Info.plist */; };
D85037EB1B9C6F8A00864DF0 /* Dummy.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = D85037EA1B9C6F8A00864DF0 /* Dummy.h */; };
D85037ED1B9C6F8A00864DF0 /* Dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = D85037EC1B9C6F8A00864DF0 /* Dummy.m */; };
D85038001B9C70BE00864DF0 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D85037FF1B9C70BE00864DF0 /* UIKit.framework */; };
D8B050571B9ED5EF004F67D6 /* BeeHive.h in Headers */ = {isa = PBXBuildFile; fileRef = D8B050551B9ED5EF004F67D6 /* BeeHive.h */; settings = {ATTRIBUTES = (Public, ); }; };
D8B050581B9ED5EF004F67D6 /* BeeHive.m in Sources */ = {isa = PBXBuildFile; fileRef = D8B050561B9ED5EF004F67D6 /* BeeHive.m */; };
E20133881E489237000B37DC /* BeeHiveTests.m in Sources */ = {isa = PBXBuildFile; fileRef = E20133871E489237000B37DC /* BeeHiveTests.m */; };
E22E60161BEB923700C195E4 /* BHAppDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = E22E600A1BEB923700C195E4 /* BHAppDelegate.h */; settings = {ATTRIBUTES = (Public, ); }; };
E22E60171BEB923700C195E4 /* BHAppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = E22E600B1BEB923700C195E4 /* BHAppDelegate.m */; };
E22E60181BEB923700C195E4 /* BHConfig.h in Headers */ = {isa = PBXBuildFile; fileRef = E22E600C1BEB923700C195E4 /* BHConfig.h */; settings = {ATTRIBUTES = (Public, ); }; };
Expand All @@ -29,6 +28,7 @@
E232FEAA1CF311F800CBFA52 /* BHWatchDog.h in Headers */ = {isa = PBXBuildFile; fileRef = E232FEA81CF311F800CBFA52 /* BHWatchDog.h */; settings = {ATTRIBUTES = (Public, ); }; };
E232FEAB1CF311F800CBFA52 /* BHWatchDog.m in Sources */ = {isa = PBXBuildFile; fileRef = E232FEA91CF311F800CBFA52 /* BHWatchDog.m */; };
E2429AC61BF089D6003336D1 /* BeeHive.bundle in Resources */ = {isa = PBXBuildFile; fileRef = E2429AC51BF089D6003336D1 /* BeeHive.bundle */; };
E278B1151E4B150300ED30FF /* BeeHive.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D85037CF1B9C6D8400864DF0 /* BeeHive.framework */; };
E286CAA91CB4B271004E6640 /* BHModuleManager.h in Headers */ = {isa = PBXBuildFile; fileRef = E286CAA71CB4B271004E6640 /* BHModuleManager.h */; settings = {ATTRIBUTES = (Public, ); }; };
E286CAAA1CB4B271004E6640 /* BHModuleManager.m in Sources */ = {isa = PBXBuildFile; fileRef = E286CAA81CB4B271004E6640 /* BHModuleManager.m */; };
E286CAAD1CB4B27A004E6640 /* BHServiceManager.h in Headers */ = {isa = PBXBuildFile; fileRef = E286CAAB1CB4B27A004E6640 /* BHServiceManager.h */; settings = {ATTRIBUTES = (Public, ); }; };
Expand All @@ -37,31 +37,19 @@
F857731B1DCDC275005C8AF5 /* BHAnnotation.m in Sources */ = {isa = PBXBuildFile; fileRef = F85773191DCDC275005C8AF5 /* BHAnnotation.m */; };
/* End PBXBuildFile section */

/* Begin PBXCopyFilesBuildPhase section */
D85037E61B9C6F8A00864DF0 /* CopyFiles */ = {
isa = PBXCopyFilesBuildPhase;
buildActionMask = 2147483647;
dstPath = "include/$(PRODUCT_NAME)";
dstSubfolderSpec = 16;
files = (
D85037EB1B9C6F8A00864DF0 /* Dummy.h in CopyFiles */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXCopyFilesBuildPhase section */

/* Begin PBXFileReference section */
0E496C5F1E4B277D0012851F /* BHCommon.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = BHCommon.h; sourceTree = "<group>"; };
D85037CF1B9C6D8400864DF0 /* BeeHive.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework.static; includeInIndex = 0; path = BeeHive.framework; sourceTree = BUILT_PRODUCTS_DIR; };
D85037D21B9C6D8400864DF0 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; sourceTree = "<absolute>"; };
D85037D61B9C6D8400864DF0 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
D85037D71B9C6D8400864DF0 /* BeeHive-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "BeeHive-Prefix.pch"; sourceTree = "<group>"; };
D85037D91B9C6D8400864DF0 /* BeeHive-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "BeeHive-Info.plist"; sourceTree = "<group>"; };
D85037E81B9C6F8A00864DF0 /* libDummy.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libDummy.a; sourceTree = BUILT_PRODUCTS_DIR; };
D85037EA1B9C6F8A00864DF0 /* Dummy.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Dummy.h; sourceTree = "<group>"; };
D85037EC1B9C6F8A00864DF0 /* Dummy.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = Dummy.m; sourceTree = "<group>"; };
D85037FF1B9C70BE00864DF0 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS8.4.sdk/System/Library/Frameworks/UIKit.framework; sourceTree = DEVELOPER_DIR; };
D8B050551B9ED5EF004F67D6 /* BeeHive.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BeeHive.h; sourceTree = "<group>"; };
D8B050561B9ED5EF004F67D6 /* BeeHive.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BeeHive.m; sourceTree = "<group>"; };
E20133851E489237000B37DC /* BeeHiveTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = BeeHiveTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
E20133871E489237000B37DC /* BeeHiveTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = BeeHiveTests.m; sourceTree = "<group>"; };
E20133891E489237000B37DC /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
E22E600A1BEB923700C195E4 /* BHAppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BHAppDelegate.h; sourceTree = "<group>"; };
E22E600B1BEB923700C195E4 /* BHAppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BHAppDelegate.m; sourceTree = "<group>"; };
E22E600C1BEB923700C195E4 /* BHConfig.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BHConfig.h; sourceTree = "<group>"; };
Expand Down Expand Up @@ -94,10 +82,11 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
D85037E51B9C6F8A00864DF0 /* Frameworks */ = {
E20133821E489237000B37DC /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
E278B1151E4B150300ED30FF /* BeeHive.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand All @@ -108,7 +97,7 @@
isa = PBXGroup;
children = (
D85037D41B9C6D8400864DF0 /* BeeHive */,
D85037E91B9C6F8A00864DF0 /* Dummy */,
E20133861E489237000B37DC /* BeeHiveTests */,
D85037D11B9C6D8400864DF0 /* Frameworks */,
D85037D01B9C6D8400864DF0 /* Products */,
);
Expand All @@ -118,7 +107,7 @@
isa = PBXGroup;
children = (
D85037CF1B9C6D8400864DF0 /* BeeHive.framework */,
D85037E81B9C6F8A00864DF0 /* libDummy.a */,
E20133851E489237000B37DC /* BeeHiveTests.xctest */,
);
name = Products;
sourceTree = "<group>";
Expand Down Expand Up @@ -156,6 +145,7 @@
E232FEA91CF311F800CBFA52 /* BHWatchDog.m */,
E22E60111BEB923700C195E4 /* BHModuleProtocol.h */,
E22E60221BEB924200C195E4 /* BHServiceProtocol.h */,
0E496C5F1E4B277D0012851F /* BHCommon.h */,
D85037D51B9C6D8400864DF0 /* Supporting Files */,
);
path = BeeHive;
Expand All @@ -172,13 +162,13 @@
name = "Supporting Files";
sourceTree = "<group>";
};
D85037E91B9C6F8A00864DF0 /* Dummy */ = {
E20133861E489237000B37DC /* BeeHiveTests */ = {
isa = PBXGroup;
children = (
D85037EA1B9C6F8A00864DF0 /* Dummy.h */,
D85037EC1B9C6F8A00864DF0 /* Dummy.m */,
E20133871E489237000B37DC /* BeeHiveTests.m */,
E20133891E489237000B37DC /* Info.plist */,
);
path = Dummy;
path = BeeHiveTests;
sourceTree = "<group>";
};
E22E60051BEB91CF00C195E4 /* Resource */ = {
Expand Down Expand Up @@ -235,22 +225,22 @@
productReference = D85037CF1B9C6D8400864DF0 /* BeeHive.framework */;
productType = "com.apple.product-type.framework.static";
};
D85037E71B9C6F8A00864DF0 /* Dummy */ = {
E20133841E489237000B37DC /* BeeHiveTests */ = {
isa = PBXNativeTarget;
buildConfigurationList = D85037FD1B9C6F8A00864DF0 /* Build configuration list for PBXNativeTarget "Dummy" */;
buildConfigurationList = E201338F1E489237000B37DC /* Build configuration list for PBXNativeTarget "BeeHiveTests" */;
buildPhases = (
D85037E41B9C6F8A00864DF0 /* Sources */,
D85037E51B9C6F8A00864DF0 /* Frameworks */,
D85037E61B9C6F8A00864DF0 /* CopyFiles */,
E20133811E489237000B37DC /* Sources */,
E20133821E489237000B37DC /* Frameworks */,
E20133831E489237000B37DC /* Resources */,
);
buildRules = (
);
dependencies = (
);
name = Dummy;
productName = Dummy;
productReference = D85037E81B9C6F8A00864DF0 /* libDummy.a */;
productType = "com.apple.product-type.library.static";
name = BeeHiveTests;
productName = BeeHiveTests;
productReference = E20133851E489237000B37DC /* BeeHiveTests.xctest */;
productType = "com.apple.product-type.bundle.unit-test";
};
/* End PBXNativeTarget section */

Expand All @@ -264,8 +254,10 @@
D85037CE1B9C6D8400864DF0 = {
CreatedOnToolsVersion = 6.4;
};
D85037E71B9C6F8A00864DF0 = {
CreatedOnToolsVersion = 6.4;
E20133841E489237000B37DC = {
CreatedOnToolsVersion = 8.2.1;
DevelopmentTeam = EAA28CVMQM;
ProvisioningStyle = Automatic;
};
};
};
Expand All @@ -282,7 +274,7 @@
projectRoot = "";
targets = (
D85037CE1B9C6D8400864DF0 /* BeeHive */,
D85037E71B9C6F8A00864DF0 /* Dummy */,
E20133841E489237000B37DC /* BeeHiveTests */,
);
};
/* End PBXProject section */
Expand All @@ -297,6 +289,13 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
E20133831E489237000B37DC /* Resources */ = {
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXResourcesBuildPhase section */

/* Begin PBXShellScriptBuildPhase section */
Expand Down Expand Up @@ -347,11 +346,11 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
D85037E41B9C6F8A00864DF0 /* Sources */ = {
E20133811E489237000B37DC /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
D85037ED1B9C6F8A00864DF0 /* Dummy.m in Sources */,
E20133881E489237000B37DC /* BeeHiveTests.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -475,31 +474,42 @@
};
name = Release;
};
D85037F91B9C6F8A00864DF0 /* Debug */ = {
E201338D1E489237000B37DC /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
GCC_PREPROCESSOR_DEFINITIONS = (
"DEBUG=1",
"$(inherited)",
);
IPHONEOS_DEPLOYMENT_TARGET = 8.4;
OTHER_LDFLAGS = "-ObjC";
CLANG_ANALYZER_NONNULL = YES;
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
DEBUG_INFORMATION_FORMAT = dwarf;
DEVELOPMENT_TEAM = EAA28CVMQM;
ENABLE_TESTABILITY = YES;
INFOPLIST_FILE = BeeHiveTests/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 10.2;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.dpsoxeon.BeeHiveTests;
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = iphoneos;
SKIP_INSTALL = YES;
};
name = Debug;
};
D85037FA1B9C6F8A00864DF0 /* Release */ = {
E201338E1E489237000B37DC /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
CLANG_ANALYZER_NONNULL = YES;
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
IPHONEOS_DEPLOYMENT_TARGET = 8.4;
OTHER_LDFLAGS = "-ObjC";
DEVELOPMENT_TEAM = EAA28CVMQM;
INFOPLIST_FILE = BeeHiveTests/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 10.2;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.dpsoxeon.BeeHiveTests;
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = iphoneos;
SKIP_INSTALL = YES;
VALIDATE_PRODUCT = YES;
};
name = Release;
Expand All @@ -525,11 +535,11 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
D85037FD1B9C6F8A00864DF0 /* Build configuration list for PBXNativeTarget "Dummy" */ = {
E201338F1E489237000B37DC /* Build configuration list for PBXNativeTarget "BeeHiveTests" */ = {
isa = XCConfigurationList;
buildConfigurations = (
D85037F91B9C6F8A00864DF0 /* Debug */,
D85037FA1B9C6F8A00864DF0 /* Release */,
E201338D1E489237000B37DC /* Debug */,
E201338E1E489237000B37DC /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
Expand Down
19 changes: 19 additions & 0 deletions BeeHive.xcodeproj/xcshareddata/xcschemes/BeeHive.xcscheme
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,26 @@
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
<TestableReference
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "E20133841E489237000B37DC"
BuildableName = "BeeHiveTests.xctest"
BlueprintName = "BeeHiveTests"
ReferencedContainer = "container:BeeHive.xcodeproj">
</BuildableReference>
</TestableReference>
</Testables>
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "D85037CE1B9C6D8400864DF0"
BuildableName = "BeeHive.framework"
BlueprintName = "BeeHive"
ReferencedContainer = "container:BeeHive.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</TestAction>
Expand Down
3 changes: 2 additions & 1 deletion BeeHive/BHAnnotation.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
//

#import "BHAnnotation.h"
#import "BHCommon.h"
#include <mach-o/getsect.h>
#include <mach-o/loader.h>
#include <mach-o/dyld.h>
Expand Down Expand Up @@ -37,7 +38,7 @@
NSString *str = [NSString stringWithUTF8String:string];
if(!str)continue;

NSLog(@"config = %@", str);
BHLog(@"config = %@", str);
if(str) [configs addObject:str];
}

Expand Down
Loading

0 comments on commit fcf09ac

Please sign in to comment.