incubator-callback-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From shaz...@apache.org
Subject ios commit: Fixes CB-754 - Use of -weak_library in 'other library flags' of generated template XCode app causes crashes in Simulator when Obj-C Blocks are used
Date Fri, 11 May 2012 23:14:30 GMT
Updated Branches:
  refs/heads/master 134d14eaf -> 85dfb9d0e


Fixes CB-754 - Use of -weak_library in 'other library flags' of generated template XCode app
causes crashes in Simulator when Obj-C Blocks are used


Project: http://git-wip-us.apache.org/repos/asf/incubator-cordova-ios/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cordova-ios/commit/85dfb9d0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cordova-ios/tree/85dfb9d0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cordova-ios/diff/85dfb9d0

Branch: refs/heads/master
Commit: 85dfb9d0e470cb3384bfe51866dada78ca864bdf
Parents: 134d14e
Author: Shazron Abdullah <shazron@apache.org>
Authored: Fri May 11 16:14:23 2012 -0700
Committer: Shazron Abdullah <shazron@apache.org>
Committed: Fri May 11 16:14:23 2012 -0700

----------------------------------------------------------------------
 .../TemplateInfo.plist                             |    2 +-
 .../___PROJECTNAME___.xcodeproj/project.pbxproj    |    6 ++----
 README.md                                          |    2 +-
 3 files changed, 4 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cordova-ios/blob/85dfb9d0/Cordova-based Application.xctemplate/TemplateInfo.plist
----------------------------------------------------------------------
diff --git a/Cordova-based Application.xctemplate/TemplateInfo.plist b/Cordova-based Application.xctemplate/TemplateInfo.plist
index 44ca333..c53328c 100644
--- a/Cordova-based Application.xctemplate/TemplateInfo.plist	
+++ b/Cordova-based Application.xctemplate/TemplateInfo.plist	
@@ -428,7 +428,7 @@
 				<key>PRODUCT_NAME</key>
 				<string>$(TARGET_NAME)</string>
 				<key>OTHER_LDFLAGS</key>
-				<string>-weak_framework UIKit -weak_framework AVFoundation -weak_framework CoreMedia
-weak_library /usr/lib/libSystem.B.dylib</string>
+				<string>-weak_framework UIKit -weak_framework AVFoundation -weak_framework CoreMedia
-weak-lSystem</string>
 				<key>TARGETED_DEVICE_FAMILY</key>
 				<string>1,2</string>
 			</dict>

http://git-wip-us.apache.org/repos/asf/incubator-cordova-ios/blob/85dfb9d0/Cordova-based Application/___PROJECTNAME___.xcodeproj/project.pbxproj
----------------------------------------------------------------------
diff --git a/Cordova-based Application/___PROJECTNAME___.xcodeproj/project.pbxproj b/Cordova-based
Application/___PROJECTNAME___.xcodeproj/project.pbxproj
index f485243..0c58ed2 100755
--- a/Cordova-based Application/___PROJECTNAME___.xcodeproj/project.pbxproj	
+++ b/Cordova-based Application/___PROJECTNAME___.xcodeproj/project.pbxproj	
@@ -578,8 +578,7 @@
 					AVFoundation,
 					"-weak_framework",
 					CoreMedia,
-					"-weak_library",
-					/usr/lib/libSystem.B.dylib,
+					"-weak-lSystem",
 					"-all_load",
 					"-Obj-C",
 				);
@@ -607,8 +606,7 @@
 					AVFoundation,
 					"-weak_framework",
 					CoreMedia,
-					"-weak_library",
-					/usr/lib/libSystem.B.dylib,
+					"-weak-lSystem",
 					"-all_load",
 					"-Obj-C",
 				);

http://git-wip-us.apache.org/repos/asf/incubator-cordova-ios/blob/85dfb9d0/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index c5205a1..ff53373 100644
--- a/README.md
+++ b/README.md
@@ -161,7 +161,7 @@ With version 0.9.6, we implemented the W3C Media Capture API, which requires
use
 
 If you get a "Symbol not found: _NSConcreteGlobalBlock_", you will have to weak link libSystem
through a command-line option. 
 
-This is because the LLVM compiler strong links NSConcreteGlobalBlock, but gcc weak links
(correctly). Add a linker flag in "Other Linker Flags" in your project target: _"-weak_library
/usr/lib/libSystem.B.dylib"_
+This is because the LLVM compiler strong links NSConcreteGlobalBlock, but gcc weak links
(correctly). Add a linker flag in "Other Linker Flags" in your project target: _"-weak-lSystem"_
 
 Starting with version 1.1, when creating a new project, the weak-linking is added through
a linker flag so you will not need to do this manually.
 


Mime
View raw message