You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by sh...@apache.org on 2013/03/25 23:23:54 UTC
[1/2] mac commit: [CB-2804] Project does not compile under OS X Lion
(10.7)
Updated Branches:
refs/heads/master 13d33b07b -> 28454d03e
[CB-2804] Project does not compile under OS X Lion (10.7)
Project: http://git-wip-us.apache.org/repos/asf/cordova-osx/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-osx/commit/9f29a16a
Tree: http://git-wip-us.apache.org/repos/asf/cordova-osx/tree/9f29a16a
Diff: http://git-wip-us.apache.org/repos/asf/cordova-osx/diff/9f29a16a
Branch: refs/heads/master
Commit: 9f29a16a14914e03c18c4f06a5196bdae4052934
Parents: 13d33b0
Author: Shazron Abdullah <sh...@apache.org>
Authored: Mon Mar 25 15:21:01 2013 -0700
Committer: Shazron Abdullah <sh...@apache.org>
Committed: Mon Mar 25 15:21:01 2013 -0700
----------------------------------------------------------------------
.../CordovaFramework.xcodeproj/project.pbxproj | 12 ++++++++----
.../project/__TESTING__.xcodeproj/project.pbxproj | 8 +++++---
2 files changed, 13 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-osx/blob/9f29a16a/CordovaFramework/CordovaFramework.xcodeproj/project.pbxproj
----------------------------------------------------------------------
diff --git a/CordovaFramework/CordovaFramework.xcodeproj/project.pbxproj b/CordovaFramework/CordovaFramework.xcodeproj/project.pbxproj
index b67a7a5..1a93e74 100644
--- a/CordovaFramework/CordovaFramework.xcodeproj/project.pbxproj
+++ b/CordovaFramework/CordovaFramework.xcodeproj/project.pbxproj
@@ -529,9 +529,9 @@
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
- MACOSX_DEPLOYMENT_TARGET = 10.8;
+ MACOSX_DEPLOYMENT_TARGET = 10.7;
ONLY_ACTIVE_ARCH = YES;
- SDKROOT = macosx;
+ SDKROOT = "";
};
name = Debug;
};
@@ -556,8 +556,8 @@
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
- MACOSX_DEPLOYMENT_TARGET = 10.8;
- SDKROOT = macosx;
+ MACOSX_DEPLOYMENT_TARGET = 10.7;
+ SDKROOT = "";
};
name = Release;
};
@@ -573,7 +573,9 @@
INFOPLIST_FILE = "CordovaFramework/CordovaFramework-Info.plist";
INSTALL_PATH = "@rpath";
LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks";
+ MACOSX_DEPLOYMENT_TARGET = 10.7;
PRODUCT_NAME = "$(TARGET_NAME)";
+ SDKROOT = "";
WRAPPER_EXTENSION = framework;
};
name = Debug;
@@ -590,7 +592,9 @@
INFOPLIST_FILE = "CordovaFramework/CordovaFramework-Info.plist";
INSTALL_PATH = "@rpath";
LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks";
+ MACOSX_DEPLOYMENT_TARGET = 10.7;
PRODUCT_NAME = "$(TARGET_NAME)";
+ SDKROOT = "";
WRAPPER_EXTENSION = framework;
};
name = Release;
http://git-wip-us.apache.org/repos/asf/cordova-osx/blob/9f29a16a/bin/templates/project/__TESTING__.xcodeproj/project.pbxproj
----------------------------------------------------------------------
diff --git a/bin/templates/project/__TESTING__.xcodeproj/project.pbxproj b/bin/templates/project/__TESTING__.xcodeproj/project.pbxproj
index 1a2c4f5..70d3cd6 100644
--- a/bin/templates/project/__TESTING__.xcodeproj/project.pbxproj
+++ b/bin/templates/project/__TESTING__.xcodeproj/project.pbxproj
@@ -15,7 +15,7 @@
7E4C0B0D16EAA6A700542982 /* Cordova.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 7E4C0B0416EAA3CF00542982 /* Cordova.framework */; };
7E608F2B16E7D9B00018F512 /* config.xml in Resources */ = {isa = PBXBuildFile; fileRef = 7E608F2A16E7D9B00018F512 /* config.xml */; };
7E608F3C16E7EE8D0018F512 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 7E608F3416E7EE8D0018F512 /* AppDelegate.m */; };
- 7E608F4816E7EE970018F512 /* Cordova.icns in Resources */ = {isa = PBXBuildFile; fileRef = 7E608F4116E7EE970018F512 /* Cordova.icns */; };
+ 7E608F4816E7EE970018F512 /* __TESTING__.icns in Resources */ = {isa = PBXBuildFile; fileRef = 7E608F4116E7EE970018F512 /* __TESTING__.icns */; };
7E608F4916E7EE970018F512 /* Credits.rtf in Resources */ = {isa = PBXBuildFile; fileRef = 7E608F4216E7EE970018F512 /* Credits.rtf */; };
7E608F4A16E7EE970018F512 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 7E608F4416E7EE970018F512 /* InfoPlist.strings */; };
7E608F4B16E7EE970018F512 /* MainViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 7E608F4616E7EE970018F512 /* MainViewController.xib */; };
@@ -343,7 +343,7 @@
LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks";
MACOSX_DEPLOYMENT_TARGET = 10.7;
ONLY_ACTIVE_ARCH = YES;
- SDKROOT = macosx;
+ SDKROOT = "";
};
name = Debug;
};
@@ -368,7 +368,7 @@
INSTALL_PATH = "";
LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks";
MACOSX_DEPLOYMENT_TARGET = 10.7;
- SDKROOT = macosx;
+ SDKROOT = "";
};
name = Release;
};
@@ -383,6 +383,7 @@
INSTALL_PATH = "";
LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks";
PRODUCT_NAME = "$(TARGET_NAME)";
+ SDKROOT = "";
WRAPPER_EXTENSION = app;
};
name = Debug;
@@ -398,6 +399,7 @@
INSTALL_PATH = "";
LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks";
PRODUCT_NAME = "$(TARGET_NAME)";
+ SDKROOT = "";
WRAPPER_EXTENSION = app;
};
name = Release;
[2/2] mac commit: [CB-2805] ARC weak reference issues in 10.7
Posted by sh...@apache.org.
[CB-2805] ARC weak reference issues in 10.7
Project: http://git-wip-us.apache.org/repos/asf/cordova-osx/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-osx/commit/28454d03
Tree: http://git-wip-us.apache.org/repos/asf/cordova-osx/tree/28454d03
Diff: http://git-wip-us.apache.org/repos/asf/cordova-osx/diff/28454d03
Branch: refs/heads/master
Commit: 28454d03e8eedb3cac3b3068a1ac011c77fd53eb
Parents: 9f29a16
Author: Shazron Abdullah <sh...@apache.org>
Authored: Mon Mar 25 15:21:34 2013 -0700
Committer: Shazron Abdullah <sh...@apache.org>
Committed: Mon Mar 25 15:21:34 2013 -0700
----------------------------------------------------------------------
.../CordovaFramework/Classes/CDVBridge.h | 9 +++++-
.../CordovaFramework/Classes/CDVWebViewDelegate.h | 8 +++++-
.../Classes/Commands/CDVCommandDelegateImpl.h | 5 +++-
.../Classes/Commands/CDVCommandQueue.m | 5 +++-
.../Classes/Commands/CDVConfigParser.m | 21 +++++++++++++++
5 files changed, 44 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-osx/blob/28454d03/CordovaFramework/CordovaFramework/Classes/CDVBridge.h
----------------------------------------------------------------------
diff --git a/CordovaFramework/CordovaFramework/Classes/CDVBridge.h b/CordovaFramework/CordovaFramework/Classes/CDVBridge.h
index aa9e087..5d15064 100644
--- a/CordovaFramework/CordovaFramework/Classes/CDVBridge.h
+++ b/CordovaFramework/CordovaFramework/Classes/CDVBridge.h
@@ -26,7 +26,14 @@
}
@property (nonatomic, weak) WebView* webView;
-@property (nonatomic, weak) CDVViewController* viewController;
+@property (nonatomic,
+#ifdef __MAC_10_8
+ weak
+#else
+ assign
+#endif
+ ) CDVViewController* viewController;
+
- (id) initWithWebView:(WebView*)webView andViewController:(CDVViewController*)viewController;
- (void) exec:(NSString*)callbackId withService:(NSString*)service andAction:(NSString*)action andArguments:(NSArray*)arguments;
http://git-wip-us.apache.org/repos/asf/cordova-osx/blob/28454d03/CordovaFramework/CordovaFramework/Classes/CDVWebViewDelegate.h
----------------------------------------------------------------------
diff --git a/CordovaFramework/CordovaFramework/Classes/CDVWebViewDelegate.h b/CordovaFramework/CordovaFramework/Classes/CDVWebViewDelegate.h
index c2a33f4..37616c3 100644
--- a/CordovaFramework/CordovaFramework/Classes/CDVWebViewDelegate.h
+++ b/CordovaFramework/CordovaFramework/Classes/CDVWebViewDelegate.h
@@ -29,6 +29,12 @@
@property (nonatomic, strong) CDVConsole* console;
@property (nonatomic, strong) CDVBridge* bridge;
-@property (nonatomic, weak) CDVViewController* viewController;
+@property (nonatomic,
+#ifdef __MAC_10_8
+ weak
+#else
+ strong
+#endif
+ ) CDVViewController* viewController;
@end
http://git-wip-us.apache.org/repos/asf/cordova-osx/blob/28454d03/CordovaFramework/CordovaFramework/Classes/Commands/CDVCommandDelegateImpl.h
----------------------------------------------------------------------
diff --git a/CordovaFramework/CordovaFramework/Classes/Commands/CDVCommandDelegateImpl.h b/CordovaFramework/CordovaFramework/Classes/Commands/CDVCommandDelegateImpl.h
index db0bd09..acbb236 100644
--- a/CordovaFramework/CordovaFramework/Classes/Commands/CDVCommandDelegateImpl.h
+++ b/CordovaFramework/CordovaFramework/Classes/Commands/CDVCommandDelegateImpl.h
@@ -24,7 +24,10 @@
@interface CDVCommandDelegateImpl : NSObject <CDVCommandDelegate>{
// @private
- __weak CDVViewController* _viewController;
+#ifdef __MAC_10_8
+ __weak
+#endif
+ CDVViewController* _viewController;
@protected
__weak CDVCommandQueue* _commandQueue;
}
http://git-wip-us.apache.org/repos/asf/cordova-osx/blob/28454d03/CordovaFramework/CordovaFramework/Classes/Commands/CDVCommandQueue.m
----------------------------------------------------------------------
diff --git a/CordovaFramework/CordovaFramework/Classes/Commands/CDVCommandQueue.m b/CordovaFramework/CordovaFramework/Classes/Commands/CDVCommandQueue.m
index d80115e..2ff947b 100644
--- a/CordovaFramework/CordovaFramework/Classes/Commands/CDVCommandQueue.m
+++ b/CordovaFramework/CordovaFramework/Classes/Commands/CDVCommandQueue.m
@@ -24,7 +24,10 @@
@interface CDVCommandQueue () {
NSInteger _lastCommandQueueFlushRequestId;
- __weak NSViewController* _viewController;
+#ifdef __MAC_10_8
+ __weak
+#endif
+ NSViewController* _viewController;
NSMutableArray* _queue;
BOOL _currentlyExecuting;
}
http://git-wip-us.apache.org/repos/asf/cordova-osx/blob/28454d03/CordovaFramework/CordovaFramework/Classes/Commands/CDVConfigParser.m
----------------------------------------------------------------------
diff --git a/CordovaFramework/CordovaFramework/Classes/Commands/CDVConfigParser.m b/CordovaFramework/CordovaFramework/Classes/Commands/CDVConfigParser.m
index 876d17a..0f160ff 100644
--- a/CordovaFramework/CordovaFramework/Classes/Commands/CDVConfigParser.m
+++ b/CordovaFramework/CordovaFramework/Classes/Commands/CDVConfigParser.m
@@ -19,6 +19,27 @@
#import "CDVConfigParser.h"
+// The block below is to support NSArray/NSDictionary subscripting in 10.7
+#ifdef __MAC_10_7
+
+@interface NSArray(Subscripting)
+- (id)objectAtIndexedSubscript:(NSUInteger)index;
+@end
+
+@interface NSMutableArray(Subscripting)
+- (void)setObject:(id)obj atIndexedSubscript:(NSUInteger)index;
+@end
+
+@interface NSDictionary(Subscripting)
+- (id)objectForKeyedSubscript:(id)key;
+@end
+
+@interface NSMutableDictionary(Subscripting)
+- (void)setObject:(id)obj forKeyedSubscript:(id <NSCopying>)key;
+@end
+
+#endif
+
@interface CDVConfigParser ()
@property (nonatomic, readwrite, strong) NSMutableDictionary* pluginsDict;