Permalink
Browse files

use Optimized Architecture to successfully deploy on the iPad and iPh…

…one OS4 Beta
  • Loading branch information...
1 parent 8d166de commit 894f7651def9046999adc647126e414c1f28e551 @Caged committed Apr 10, 2010
Showing with 20 additions and 17 deletions.
  1. +12 −9 HTTPRiot.xcodeproj/project.pbxproj
  2. +3 −3 Rakefile
  3. +5 −5 Source/HTTPRiot/HROperationQueue.m
@@ -901,9 +901,9 @@
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
COPY_PHASE_STRIP = NO;
- CURRENT_PROJECT_VERSION = 0.6.9;
+ CURRENT_PROJECT_VERSION = 0.6.10;
DYLIB_COMPATIBILITY_VERSION = 1;
- DYLIB_CURRENT_VERSION = 0.6.9;
+ DYLIB_CURRENT_VERSION = 0.6.10;
FRAMEWORK_VERSION = A;
GCC_DYNAMIC_NO_PIC = NO;
GCC_ENABLE_FIX_AND_CONTINUE = YES;
@@ -921,6 +921,7 @@
"-framework",
Foundation,
"-lxml2",
+ "-fobjc-exceptions",
);
PRODUCT_NAME = HTTPRiot;
VERSIONING_SYSTEM = "apple-generic";
@@ -933,10 +934,11 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
- CURRENT_PROJECT_VERSION = 0.6.9;
+ ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
+ CURRENT_PROJECT_VERSION = 0.6.10;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DYLIB_COMPATIBILITY_VERSION = 0.1.0;
- DYLIB_CURRENT_VERSION = 0.6.9;
+ DYLIB_CURRENT_VERSION = 0.6.10;
FOO_BAR = 1;
FRAMEWORK_VERSION = A;
GCC_MODEL_TUNING = G5;
@@ -952,6 +954,7 @@
"-framework",
Foundation,
"-lxml2",
+ "-fobjc-exceptions",
);
PRODUCT_NAME = HTTPRiot;
VERSIONING_SYSTEM = "apple-generic";
@@ -990,11 +993,11 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
- ARCHS = "$(ARCHS_STANDARD_32_BIT)";
+ ARCHS = "$(ARCHS_UNIVERSAL_IPHONE_OS)";
CONFIGURATION_BUILD_DIR = "$(BUILD_DIR)/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)$(IPHONEOS_DEPLOYMENT_TARGET)";
CONFIGURATION_TEMP_DIR = "$(PROJECT_TEMP_DIR)/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)$(IPHONEOS_DEPLOYMENT_TARGET)";
COPY_PHASE_STRIP = NO;
- CURRENT_PROJECT_VERSION = 0.6.9;
+ CURRENT_PROJECT_VERSION = 0.6.10;
GCC_DYNAMIC_NO_PIC = NO;
GCC_ENABLE_FIX_AND_CONTINUE = YES;
GCC_ENABLE_OBJC_GC = unsupported;
@@ -1019,14 +1022,14 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
- ARCHS = "$(ARCHS_STANDARD_32_BIT)";
+ ARCHS = "$(ARCHS_UNIVERSAL_IPHONE_OS)";
CONFIGURATION_BUILD_DIR = "$(BUILD_DIR)/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)$(IPHONEOS_DEPLOYMENT_TARGET)";
CONFIGURATION_TEMP_DIR = "$(PROJECT_TEMP_DIR)/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)$(IPHONEOS_DEPLOYMENT_TARGET)";
COPY_PHASE_STRIP = YES;
- CURRENT_PROJECT_VERSION = 0.6.9;
+ CURRENT_PROJECT_VERSION = 0.6.10;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DYLIB_COMPATIBILITY_VERSION = 0.1.0;
- DYLIB_CURRENT_VERSION = 0.6.9;
+ DYLIB_CURRENT_VERSION = 0.6.10;
GCC_ENABLE_FIX_AND_CONTINUE = NO;
GCC_ENABLE_OBJC_GC = unsupported;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
View
@@ -29,7 +29,7 @@ namespace :sdk do
end
OSX_BUILD_TARGETS.each do |version|
- system("ARCHS='i386' xcodebuild -target libhttpriot -configuration #{CONFIGURATION} -sdk macosx#{version}")
+ #system("ARCHS='i386' xcodebuild -target libhttpriot -configuration #{CONFIGURATION} -sdk macosx#{version}")
system("ARCHS='i386' xcodebuild -target HTTPRiot -configuration #{CONFIGURATION} -sdk macosx#{version}")
end
end
@@ -243,7 +243,7 @@ class SDKPackage < Rake::PackageTask
@project_dir = Project.project_dir
@package_dir = File.join(@project_dir, 'pkg')
@build_dir = Project.build_dir
- @sdks = %w(iphoneos iphonesimulator macosx)
+ @sdks = %w(iphoneos iphonesimulator)
@configuration = 'Release'
@targets = Project.targets
end
@@ -277,7 +277,7 @@ class SDKPackage < Rake::PackageTask
end
# Copy the header files over
- if sdk == 'macosx' && File.exists?(File.join(@build_dir, @configuration, "usr"))
+ if sdk == 'macosx' && File.exists?(File.join(@build_dir, @configuration))
built_sdk_dir = File.join(@build_dir, @configuration)
else
built_sdk_dir = File.join(@build_dir, "#{@configuration}-#{sdk}#{target}")
@@ -9,18 +9,18 @@
#import "HROperationQueue.h"
#import "HRGlobal.h"
-static HROperationQueue *sharedHROperationQueue = nil;
+static HROperationQueue *sharedOperationQueue = nil;
@implementation HROperationQueue
+ (HROperationQueue *)sharedOperationQueue {
@synchronized(self) {
- if (sharedHROperationQueue == nil) {
- sharedHROperationQueue = [[HROperationQueue alloc] init];
- sharedHROperationQueue.maxConcurrentOperationCount = 3;
+ if (sharedOperationQueue == nil) {
+ sharedOperationQueue = [[HROperationQueue alloc] init];
+ sharedOperationQueue.maxConcurrentOperationCount = 3;
}
}
- return sharedHROperationQueue;
+ return sharedOperationQueue;
}
@end

0 comments on commit 894f765

Please sign in to comment.