Permalink
Browse files

Removed copy frameworks build phase from Specs target; explicitly set…

… build products directory in Rakefile via SYMROOT environment variable. Now all targets should build using default settings both from the command line and in the IDE.
  • Loading branch information...
1 parent acf772a commit 367161087167f90e2762659105b4a85d994fc5ab Adam Milligan committed Apr 20, 2011
Showing with 9 additions and 23 deletions.
  1. +0 −15 Cedar.xcodeproj/project.pbxproj
  2. +9 −8 Rakefile
View
15 Cedar.xcodeproj/project.pbxproj
@@ -27,8 +27,6 @@
66E33E53123CA82A00D326CC /* CppSpecSpec.mm in Sources */ = {isa = PBXBuildFile; fileRef = AEEE1FEA11DC27B800029872 /* CppSpecSpec.mm */; };
AE135D4011DEA6F400A922D4 /* OCMock.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AE135D3111DEA6A900A922D4 /* OCMock.framework */; };
AE135D4111DEA6F400A922D4 /* OCHamcrest.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AE135D2111DEA69A00A922D4 /* OCHamcrest.framework */; };
- AE135D7711DEA81C00A922D4 /* OCMock.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = AE135D3111DEA6A900A922D4 /* OCMock.framework */; };
- AE135D7811DEA81C00A922D4 /* OCHamcrest.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = AE135D2111DEA69A00A922D4 /* OCHamcrest.framework */; };
AE135E7011DEB46F00A922D4 /* libOCMock-StaticLib.a in Frameworks */ = {isa = PBXBuildFile; fileRef = AE135D3511DEA6A900A922D4 /* libOCMock-StaticLib.a */; };
AE135E7111DEB46F00A922D4 /* libOCHamcrest-StaticLib.a in Frameworks */ = {isa = PBXBuildFile; fileRef = AE135D2311DEA69A00A922D4 /* libOCHamcrest-StaticLib.a */; };
AE91CA6C11DE64A3002BA6B9 /* CDRSharedExampleGroupPool.h in Headers */ = {isa = PBXBuildFile; fileRef = AEFD17B311DD1E8200F4448A /* CDRSharedExampleGroupPool.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -186,18 +184,6 @@
/* End PBXContainerItemProxy section */
/* Begin PBXCopyFilesBuildPhase section */
- AEEE221F11DC29CF00029872 /* Copy Frameworks */ = {
- isa = PBXCopyFilesBuildPhase;
- buildActionMask = 2147483647;
- dstPath = "";
- dstSubfolderSpec = 10;
- files = (
- AE135D7711DEA81C00A922D4 /* OCMock.framework in Copy Frameworks */,
- AE135D7811DEA81C00A922D4 /* OCHamcrest.framework in Copy Frameworks */,
- );
- name = "Copy Frameworks";
- runOnlyForDeploymentPostprocessing = 0;
- };
AEEE225E11DC2C5E00029872 /* Copy headers to framework */ = {
isa = PBXCopyFilesBuildPhase;
buildActionMask = 2147483647;
@@ -536,7 +522,6 @@
isa = PBXNativeTarget;
buildConfigurationList = AEEE21CA11DC292600029872 /* Build configuration list for PBXNativeTarget "Specs" */;
buildPhases = (
- AEEE221F11DC29CF00029872 /* Copy Frameworks */,
AEEE218311DC28E200029872 /* Sources */,
AEEE218411DC28E200029872 /* Frameworks */,
);
View
17 Rakefile
@@ -2,10 +2,11 @@ PROJECT_NAME = "Cedar"
CONFIGURATION = "Release"
SPECS_TARGET_NAME = "Specs"
UI_SPECS_TARGET_NAME = "iPhoneSpecs"
-SDK_DIR = "/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator4.2.sdk"
+SDK_DIR = "/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator4.3.sdk"
+BUILD_DIR = File.join(File.dirname(__FILE__), "build")
def build_dir(effective_platform_name)
- File.join(File.dirname(__FILE__), "build", CONFIGURATION + effective_platform_name)
+ File.join(BUILD_DIR, CONFIGURATION + effective_platform_name)
end
def system_or_exit(cmd, stdout = nil)
@@ -18,9 +19,8 @@ def output_file(target)
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
+ Dir.mkdir(BUILD_DIR) unless File.exists?(BUILD_DIR)
+ BUILD_DIR
end
output_file = File.join(output_dir, "#{target}.output")
@@ -37,11 +37,12 @@ task :cruise do
end
task :clean do
- system_or_exit(%Q[xcodebuild -project #{PROJECT_NAME}.xcodeproj -alltargets -configuration #{CONFIGURATION} clean], output_file("clean"))
+ system_or_exit(%Q[xcodebuild -project #{PROJECT_NAME}.xcodeproj -alltargets -configuration #{CONFIGURATION} clean SYMROOT=#{BUILD_DIR}], output_file("clean"))
end
task :build_specs do
- system_or_exit(%Q[xcodebuild -project #{PROJECT_NAME}.xcodeproj -target #{SPECS_TARGET_NAME} -configuration #{CONFIGURATION} build], output_file("specs"))
+puts "SYMROOT: #{ENV['SYMROOT']}"
+ system_or_exit(%Q[xcodebuild -project #{PROJECT_NAME}.xcodeproj -target #{SPECS_TARGET_NAME} -configuration #{CONFIGURATION} build SYMROOT=#{BUILD_DIR}], output_file("specs"))
end
task :build_uispecs do
@@ -50,7 +51,7 @@ task :build_uispecs do
end
task :build_all do
- system_or_exit(%Q[xcodebuild -project #{PROJECT_NAME}.xcodeproj -alltargets -configuration #{CONFIGURATION} build], output_file("build_all"))
+ system_or_exit(%Q[xcodebuild -project #{PROJECT_NAME}.xcodeproj -alltargets -configuration #{CONFIGURATION} build SYMROOT=#{BUILD_DIR}], output_file("build_all"))
end
task :specs => :build_specs do

0 comments on commit 3671610

Please sign in to comment.