Merged files to 0.6.0.

balinghousheng · Aug 18, 2014 · e813fe7 · e813fe7
1 parent 5e02392
commit e813fe7
Show file tree

Hide file tree

Showing 238 changed files with 11,952 additions and 4,909 deletions.
diff --git a/framework/Bee.h b/framework/Bee.h
@@ -45,7 +45,7 @@ extern BeePackage *	bee;
 
 #pragma mark -
 
-AS_PACKAGE_INSTANCE( BeePackage, BeePackage_External, ext );
+AS_PACKAGE_( BeePackage, BeePackage_External, ext );
 
 #undef	AS_EXTERNAL
 #define	AS_EXTERNAL( __class, __name ) \
@@ -57,7 +57,7 @@ AS_PACKAGE_INSTANCE( BeePackage, BeePackage_External, ext );
 
 #pragma mark -
 
-AS_PACKAGE_INSTANCE( BeePackage, BeePackage_Library, lib );
+AS_PACKAGE_( BeePackage, BeePackage_Library, lib );
 
 #undef	AS_LIBRARY
 #define	AS_LIBRARY( __class, __name ) \

diff --git a/framework/Bee.mm b/framework/Bee.mm
@@ -33,5 +33,5 @@
 
 #pragma mark -
 
-DEF_PACKAGE_INSTANCE( BeePackage, BeePackage_External, ext );
-DEF_PACKAGE_INSTANCE( BeePackage, BeePackage_Library, lib );
+DEF_PACKAGE_( BeePackage, BeePackage_External, ext );
+DEF_PACKAGE_( BeePackage, BeePackage_Library, lib );
diff --git a/framework/Bee_Package.h b/framework/Bee_Package.h
@@ -33,6 +33,31 @@
 
 #pragma mark -
 
+#undef	AS_NAMESPACE
+#define AS_NAMESPACE( __name ) \
+		@class BeePackage; \
+		extern BeePackage *	__name; \
+		@interface __Namespace_##__name : BeePackage \
+		AS_SINGLETON( __Namespace_##__name ) \
+		@end
+
+#undef	DEF_NAMESPACE
+#define DEF_NAMESPACE( __name ) \
+		BeePackage * __name = nil; \
+		@implementation __Namespace_##__name \
+		DEF_SINGLETON( __Namespace_##__name ) \
+		+ (void)load \
+		{ \
+			__name = [__Namespace_##__name sharedInstance]; \
+		} \
+		@end
+
+#undef	NAMESPACE
+#define	NAMESPACE( __name ) \
+		__Namespace_##__name
+
+#pragma mark -
+
 #undef	AS_PACKAGE
 #define AS_PACKAGE( __parentClass, __class, __propertyName ) \
 		@class __class; \
@@ -50,8 +75,8 @@
 		} \
 		@end
 
-#undef	AS_PACKAGE_INSTANCE
-#define AS_PACKAGE_INSTANCE( __parentClass, __class, __propertyName ) \
+#undef	AS_PACKAGE_
+#define AS_PACKAGE_( __parentClass, __class, __propertyName ) \
 		@class __class; \
 		@interface __parentClass (AutoLoad_##__propertyName) \
 		@property (nonatomic, readonly) __class * __propertyName; \
@@ -60,8 +85,8 @@
 		AS_SINGLETON( __class ); \
 		@end
 
-#undef	DEF_PACKAGE_INSTANCE
-#define DEF_PACKAGE_INSTANCE( __parentClass, __class, __propertyName ) \
+#undef	DEF_PACKAGE_
+#define DEF_PACKAGE_( __parentClass, __class, __propertyName ) \
 		@implementation __parentClass (AutoLoad_##__propertyName) \
 		@dynamic __propertyName; \
 		- (__class *)__propertyName \
@@ -120,7 +145,6 @@
  @endcode
  *
  */
-
 @interface BeePackage : NSObject
 @property (nonatomic, readonly) NSArray * loadedPackages;
 @end
diff --git a/framework/Bee_Package.mm b/framework/Bee_Package.mm
@@ -103,6 +103,7 @@ - (void)loadClasses
 {
 	const char * autoLoadClasses[] = {
 		"BeeLogger",
+		"BeeMsc",
 
 	#if (TARGET_OS_MAC)
 		"BeeCLI",

diff --git a/framework/Bee_Precompile.h b/framework/Bee_Precompile.h
@@ -75,13 +75,15 @@
 
 #ifdef __OBJC__
 
+#import <Foundation/Foundation.h>
+
 #if (TARGET_OS_IPHONE || TARGET_IPHONE_SIMULATOR)
 
 #import <UIKit/UIKit.h>
-#import <Foundation/Foundation.h>
 #import <QuartzCore/QuartzCore.h>
 #import <AudioToolbox/AudioToolbox.h>
 #import <TargetConditionals.h>
+#import <AssetsLibrary/AssetsLibrary.h>
 
 #import <AVFoundation/AVFoundation.h>
 #import <CoreGraphics/CoreGraphics.h>
@@ -92,7 +94,6 @@
 
 #else	// #if (TARGET_OS_IPHONE || TARGET_IPHONE_SIMULATOR)
 
-#import <Foundation/Foundation.h>
 #import <Cocoa/Cocoa.h>
 #import <AppKit/AppKit.h>
 #import <WebKit/WebKit.h>
@@ -127,9 +128,11 @@
 // Global compile option
 // ----------------------------------
 
-#define __BEE_DEVELOPMENT__				(__AUTO__)
-#define __BEE_LOG__						(__AUTO__)
-#define __BEE_UNITTEST__				(__OFF__)
+#define __BEE_DEVELOPMENT__				(__ON__)
+#define	__BEE_PERFORMANCE__				(__OFF__)
+#define __BEE_LOG__						(__OFF__)
+#define __BEE_UNITTEST__                (__OFF__)
+#define __BEE_LIVELOAD__				    (__ON__)
 
 #pragma mark -
 
@@ -263,6 +266,8 @@
 
 #pragma mark -
 
+typedef void ( *ImpFuncType )( id a, SEL b, void * c );
+
 // ----------------------------------
 // Preload headers
 // ----------------------------------

diff --git a/framework/cli/Bee_CLI.mm b/framework/cli/Bee_CLI.mm
@@ -105,6 +105,7 @@ - (id)init
 			self.workingDirectory = [NSString stringWithUTF8String:buff];
 		}
 
+		self.arguments = [NSMutableArray array];
 		self.autoChangeBack = YES;
 	}
 	return self;

diff --git a/framework/mvc/controller/Bee_Message.h b/framework/mvc/controller/Bee_Message.h
@@ -223,6 +223,7 @@ AS_INT( STATE_CANCELLED )		// 消息被取消了
 - (void)internalStartTimer;
 - (void)internalStopTimer;
 - (void)internalNotifySending;
+- (void)internalNotifyWaiting;
 - (void)internalNotifySucceed;
 - (void)internalNotifyFailed;
 - (void)internalNotifyCancelled;