Permalink
Browse files

4.2 SDK

  • Loading branch information...
1 parent 010851e commit 1512d7add0cdbffe9f37239b9a85d9adfa5bac4a Adam Milligan committed Nov 29, 2010
Showing with 19 additions and 11 deletions.
  1. +9 −9 Cedar.xcodeproj/project.pbxproj
  2. +9 −2 Rakefile
  3. +1 −0 Source/CDRDefaultReporter.m
@@ -693,7 +693,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "xcodebuild -project ${PROJECT_NAME}.xcodeproj -sdk iphonesimulator4.1 -target ${PROJECT_NAME}-StaticLib -configuration ${CONFIGURATION} clean build\nxcodebuild -project ${PROJECT_NAME}.xcodeproj -sdk iphoneos4.1 -target ${PROJECT_NAME}-StaticLib -configuration ${CONFIGURATION} clean build";
+ shellScript = "xcodebuild -project ${PROJECT_NAME}.xcodeproj -sdk iphonesimulator4.2 -target ${PROJECT_NAME}-StaticLib -configuration ${CONFIGURATION} clean build\nxcodebuild -project ${PROJECT_NAME}.xcodeproj -sdk iphoneos4.2 -target ${PROJECT_NAME}-StaticLib -configuration ${CONFIGURATION} clean build";
};
AEEE225A11DC2C0200029872 /* Build universal static lib */ = {
isa = PBXShellScriptBuildPhase;
@@ -817,26 +817,27 @@
AEEE1FA711DC26EA00029872 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
COPY_PHASE_STRIP = NO;
GCC_C_LANGUAGE_STANDARD = c99;
- GCC_VERSION = com.apple.compilers.llvmgcc42;
+ GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
};
name = Debug;
};
AEEE1FA811DC26EA00029872 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
COPY_PHASE_STRIP = YES;
GCC_C_LANGUAGE_STANDARD = c99;
- GCC_VERSION = com.apple.compilers.llvmgcc42;
+ GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
};
name = Release;
};
AEEE1FBA11DC271300029872 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
- ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
COPY_PHASE_STRIP = NO;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
@@ -866,7 +867,6 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
- ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
COPY_PHASE_STRIP = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DYLIB_COMPATIBILITY_VERSION = 1;
@@ -952,7 +952,7 @@
GCC_OPTIMIZATION_LEVEL = 0;
PREBINDING = NO;
PRODUCT_NAME = "Cedar-StaticLib";
- SDKROOT = iphonesimulator4.1;
+ SDKROOT = iphonesimulator4.2;
};
name = Debug;
};
@@ -966,7 +966,7 @@
GCC_ENABLE_FIX_AND_CONTINUE = NO;
PREBINDING = NO;
PRODUCT_NAME = "Cedar-StaticLib";
- SDKROOT = iphonesimulator4.1;
+ SDKROOT = iphonesimulator4.2;
ZERO_LINK = NO;
};
name = Release;
@@ -1024,7 +1024,7 @@
);
PREBINDING = NO;
PRODUCT_NAME = iPhoneSpecs;
- SDKROOT = iphonesimulator4.0;
+ SDKROOT = iphonesimulator4.2;
};
name = Debug;
};
@@ -1060,7 +1060,7 @@
);
PREBINDING = NO;
PRODUCT_NAME = iPhoneSpecs;
- SDKROOT = iphonesimulator4.0;
+ SDKROOT = iphonesimulator4.2;
ZERO_LINK = NO;
};
name = Release;
View
@@ -15,7 +15,14 @@ def system_or_exit(cmd, stdout = nil)
end
def output_file(target)
- output_dir = ENV['IS_CI_BOX'] ? ENV['CC_BUILD_ARTIFACTS'] : File.join(File.dirname(__FILE__), "build")
+ output_dir = if ENV['IS_CI_BOX']
+ ENV['CC_BUILD_ARTIFACTS']
+ else
+ build_dir = File.join(File.dirname(__FILE__), "build")
+ Dir.mkdir(build_dir) unless File.exists?(build_dir)
+ build_dir
+ end
+
output_file = File.join(output_dir, "#{target}.output")
puts "Output: #{output_file}"
output_file
@@ -39,7 +46,7 @@ end
task :build_uispecs do
`osascript -e 'tell application "iPhone Simulator" to quit'`
- system_or_exit(%Q[xcodebuild -project #{PROJECT_NAME}.xcodeproj -target #{UI_SPECS_TARGET_NAME} -configuration #{CONFIGURATION} build], output_file("uispecs"))
+ system_or_exit(%Q[xcodebuild -project #{PROJECT_NAME}.xcodeproj -target #{UI_SPECS_TARGET_NAME} -configuration #{CONFIGURATION} ARCHS=i386 build], output_file("uispecs"))
end
task :build_all do
@@ -118,6 +118,7 @@ - (void)printStats {
if (pendingMessages_.count) {
printf(", %u pending", (unsigned int)pendingMessages_.count);
}
+ printf("\n");
}
#pragma mark KVO

0 comments on commit 1512d7a

Please sign in to comment.