[plactorkit] r27 committed - Update to build and run with Mac OS X 10.8 / iOS 6.

[codesite...@google.com]

Revision: 27
Author: landon.j.fuller
Date: Tue Dec 4 08:14:03 2012
Log: Update to build and run with Mac OS X 10.8 / iOS 6.

http://code.google.com/p/plactorkit/source/detail?r=27

Modified:
/trunk/ActorKit.xcodeproj/project.pbxproj
/trunk/Resources/Tests-Info.plist
/trunk/Source/PLActorKitTests.m
/trunk/Source/PLActorRPCProxyTests.m
/trunk/Source/PLThreadedActorProcess.m

=======================================
--- /trunk/ActorKit.xcodeproj/project.pbxproj Fri May 8 14:33:43 2009
+++ /trunk/ActorKit.xcodeproj/project.pbxproj Tue Dec 4 08:14:03 2012
@@ -662,7 +662,11 @@
isa = PBXProject;
buildConfigurationList = 1DEB91EF08733DB70010E9CD /* Build
configuration list for PBXProject "ActorKit" */;
compatibilityVersion = "Xcode 3.1";
+ developmentRegion = English;
hasScannedForEncodings = 1;
+ knownRegions = (
+ en,
+ );
mainGroup = 08FB7794FE84155DC02AAC07 /* ActorKit */;
projectDirPath = "";
projectRoot = "";
@@ -910,10 +914,11 @@
COPY_PHASE_STRIP = NO;
GCC_DYNAMIC_NO_PIC = NO;
GCC_OPTIMIZATION_LEVEL = 0;
+ IPHONEOS_DEPLOYMENT_TARGET = 4.3;
ONLY_ACTIVE_ARCH = NO;
PREBINDING = NO;
PRODUCT_NAME = "ActorKit$(EFFECTIVE_PLATFORM_NAME)";
- SDKROOT = iphoneos2.0;
+ SDKROOT = iphoneos;
};
name = Debug;
};
@@ -924,9 +929,10 @@
COPY_PHASE_STRIP = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
GCC_ENABLE_FIX_AND_CONTINUE = NO;
+ IPHONEOS_DEPLOYMENT_TARGET = 4.3;
PREBINDING = NO;
PRODUCT_NAME = "ActorKit$(EFFECTIVE_PLATFORM_NAME)";
- SDKROOT = iphoneos2.0;
+ SDKROOT = iphoneos;
ZERO_LINK = NO;
};
name = Release;
@@ -938,10 +944,11 @@
COPY_PHASE_STRIP = NO;
GCC_DYNAMIC_NO_PIC = NO;
GCC_OPTIMIZATION_LEVEL = 0;
+ IPHONEOS_DEPLOYMENT_TARGET = 4.3;
ONLY_ACTIVE_ARCH = NO;
PREBINDING = NO;
PRODUCT_NAME = "ActorKit$(EFFECTIVE_PLATFORM_NAME)";
- SDKROOT = iphonesimulator2.0;
+ SDKROOT = iphonesimulator;
};
name = Debug;
};
@@ -952,10 +959,11 @@
COPY_PHASE_STRIP = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
GCC_ENABLE_FIX_AND_CONTINUE = NO;
+ IPHONEOS_DEPLOYMENT_TARGET = 4.3;
ONLY_ACTIVE_ARCH = NO;
PREBINDING = NO;
PRODUCT_NAME = "ActorKit$(EFFECTIVE_PLATFORM_NAME)";
- SDKROOT = iphonesimulator2.0;
+ SDKROOT = iphonesimulator;
ZERO_LINK = NO;
};
name = Release;
@@ -985,7 +993,7 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
- ARCHS = "$(ARCHS_STANDARD_32_BIT)";
+ ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
COPY_PHASE_STRIP = NO;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
@@ -1008,7 +1016,7 @@
);
PREBINDING = NO;
PRODUCT_NAME = ActorKit;
- SDKROOT = macosx10.4;
+ SDKROOT = macosx;
};
name = Debug;
};
@@ -1016,7 +1024,7 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
- ARCHS = "$(ARCHS_STANDARD_32_BIT)";
+ ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
COPY_PHASE_STRIP = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DYLIB_COMPATIBILITY_VERSION = 1;
@@ -1037,7 +1045,7 @@
);
PREBINDING = NO;
PRODUCT_NAME = ActorKit;
- SDKROOT = macosx10.4;
+ SDKROOT = macosx;
ZERO_LINK = NO;
};
name = Release;
@@ -1046,6 +1054,7 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
+ ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
COPY_PHASE_STRIP = NO;
EFFECTIVE_PLATFORM_NAME = "-MacOSX";
FRAMEWORK_SEARCH_PATHS = "$(DEVELOPER_LIBRARY_DIR)/Frameworks";
@@ -1075,6 +1084,7 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
+ ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
COPY_PHASE_STRIP = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
EFFECTIVE_PLATFORM_NAME = "-MacOSX";
@@ -1116,6 +1126,7 @@
GCC_PREFIX_HEADER
= "$(SYSTEM_LIBRARY_DIR)/Frameworks/UIKit.framework/Headers/UIKit.h";
INFOPLIST_FILE = "Resources/Profiler-iPhoneOS-Info.plist";
INSTALL_PATH = "$(HOME)/Applications";
+ IPHONEOS_DEPLOYMENT_TARGET = 4.3;
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
"\"$(SRCROOT)/build/Debug\"",
@@ -1132,7 +1143,7 @@
);
PREBINDING = NO;
PRODUCT_NAME = "Profiler-iPhoneOS";
- SDKROOT = iphoneos2.0;
+ SDKROOT = iphoneos;
};
name = Debug;
};
@@ -1152,6 +1163,7 @@
GCC_PREFIX_HEADER
= "$(SYSTEM_LIBRARY_DIR)/Frameworks/UIKit.framework/Headers/UIKit.h";
INFOPLIST_FILE = "Resources/Profiler-iPhoneOS-Info.plist";
INSTALL_PATH = "$(HOME)/Applications";
+ IPHONEOS_DEPLOYMENT_TARGET = 4.3;
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
"\"$(SRCROOT)/build/Debug\"",
@@ -1168,7 +1180,7 @@
);
PREBINDING = NO;
PRODUCT_NAME = "Profiler-iPhoneOS";
- SDKROOT = iphoneos2.0;
+ SDKROOT = iphoneos;
ZERO_LINK = NO;
};
name = Release;
@@ -1177,6 +1189,7 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
+ ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
COPY_PHASE_STRIP = NO;
EFFECTIVE_PLATFORM_NAME = "-MacOSX";
FRAMEWORK_SEARCH_PATHS = (
@@ -1211,6 +1224,7 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
+ ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
COPY_PHASE_STRIP = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
EFFECTIVE_PLATFORM_NAME = "-MacOSX";
=======================================
--- /trunk/Resources/Tests-Info.plist Tue Dec 2 23:27:25 2008
+++ /trunk/Resources/Tests-Info.plist Tue Dec 4 08:14:03 2012
@@ -7,7 +7,7 @@
<key>CFBundleExecutable</key>
<string>${EXECUTABLE_NAME}</string>
<key>CFBundleIdentifier</key>
- <string>com.plausiblelabs.${PRODUCT_NAME:identifier}</string>
+ <string>com.plausiblelabs.${PRODUCT_NAME:rfc822identifier}</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundlePackageType</key>
=======================================
--- /trunk/Source/PLActorKitTests.m Sat Dec 27 21:51:25 2008
+++ /trunk/Source/PLActorKitTests.m Tue Dec 4 08:14:03 2012
@@ -38,6 +38,7 @@

/* Simple echo actor */
- (void) threadedEcho {
+ NSLog(@"Hello");
PLActorMessage *msg = [PLActorKit receive];
PLActorMessage *resp = [PLActorMessage messageWithObject: [msg
object]];

=======================================
--- /trunk/Source/PLActorRPCProxyTests.m Tue Dec 2 23:27:25 2008
+++ /trunk/Source/PLActorRPCProxyTests.m Tue Dec 4 08:14:03 2012
@@ -45,7 +45,7 @@

- (void) testLeak {
NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
- PLActorProxyTests *testActor = [[PLActorRPCProxy alloc]
initWithTarget: self];
+ PLActorProxyTests *testActor = (PLActorProxyTests *) [[PLActorRPCProxy
alloc] initWithTarget: self];

NSString *result = [testActor echo: @"test"];
STAssertTrue([@"test" isEqual: result], @"Actor did not echo request,
returned %@", result);
@@ -59,7 +59,7 @@
}

- (void) testSynchronousMessaging {
- PLActorProxyTests *testActor = [[PLActorRPCProxy alloc]
initWithTarget: self];
+ PLActorProxyTests *testActor = (PLActorProxyTests *) [[PLActorRPCProxy
alloc] initWithTarget: self];

NSString *result = [testActor echo: @"test"];
STAssertTrue([@"test" isEqual: result], @"Actor did not echo request,
returned %@", result);
@@ -69,7 +69,7 @@


- (void) testAsynchronousMessaging {
- PLActorProxyTests *testActor = [[PLActorRPCProxy alloc]
initWithTarget: self];
+ PLActorProxyTests *testActor = (PLActorProxyTests *) [[PLActorRPCProxy
alloc] initWithTarget: self];

/* Send the async message */
[testActor onewayEcho: @"test" sender: [PLActorKit process]];
=======================================
--- /trunk/Source/PLThreadedActorProcess.m Sat Jan 3 21:25:33 2009
+++ /trunk/Source/PLThreadedActorProcess.m Tue Dec 4 08:14:03 2012
@@ -25,6 +25,7 @@
* OTHER DEALINGS IN THE SOFTWARE.
*/
#import "ActorKit.h"
+#import <objc/message.h>

/**
* @internal
@@ -73,7 +74,7 @@
[PLActorKit setThreadProcess: proc];

/* Start the user's code */
- objc_msgSend(proc->_target_obj, proc->_target_sel, proc->_target_arg);
+ ((void (*)(id, SEL, id)) &objc_msgSend)(proc->_target_obj,
proc->_target_sel, proc->_target_arg);

/* We retained ourself when spawning this thread.
* Now that the actor has returned, release ourself. */