Commit 8870faf4 authored by Luke Redpath's avatar Luke Redpath

A bit more refactoring, brought xcodeproj up to date.

parent f0bc0a3f
Subproject commit fc2a3c0152605451a67e9ee5f69ea244fd624a68
Subproject commit c874b109de3523829ef234a0e53a8c7c0ab1fc33
......@@ -76,25 +76,22 @@ module Pod
xcconfig.merge!('HEADER_SEARCH_PATHS' => sandbox.header_search_paths.join(" "))
# Add all the target related support files to the group, even the copy
# resources script although the project doesn't actually use them.
support_files_group = @project.groups.object_named("Targets Support Files")
support_files_group = support_files_group.create_group(@target_definition.lib_name)
support_files_group = @project.group("Targets Support Files").create_group(@target_definition.lib_name)
support_files_group.add_file_paths(target_support_files)
target_support_files.each do |file_path|
support_files_group.create_file(file_path)
xcconfig_file = support_files_group.file_with_path(xcconfig_filename)
configure_build_configurations(xcconfig_filename)
create_files(pods, sandbox)
end
# Assign the xcconfig as the base config of each config.
def configure_build_configurations(xcconfig_file)
@target.buildConfigurations.each do |config|
xcconfig_file = support_files_group.file_with_path(xcconfig_filename)
config.baseConfiguration = xcconfig_file
config.buildSettings['OTHER_LDFLAGS'] = ''
config.buildSettings['GCC_PREFIX_HEADER'] = prefix_header_filename
config.buildSettings['PODS_ROOT'] = '$(SRCROOT)'
end
create_files(pods, sandbox)
end
def create_files(pods, sandbox)
......
require 'xcodeproj/project'
require 'xcodeproj/project/object/build_phase'
Xcodeproj::Project::PBXCopyFilesBuildPhase.instance_eval do
Xcodeproj::Project::Object::PBXCopyFilesBuildPhase.instance_eval do
def self.new_pod_dir(project, pod_name, path)
new(project, nil, {
"dstPath" => "Pods/#{path}",
......@@ -40,15 +41,15 @@ module Pod
project.main_group << products
project.root_object.products = products
project.root_object.attributes['buildConfigurationList'] = project.objects.add(Xcodeproj::Project::XCConfigurationList, {
project.root_object.attributes['buildConfigurationList'] = project.objects.add(Xcodeproj::Project::Object::XCConfigurationList, {
'defaultConfigurationIsVisible' => '0',
'defaultConfigurationName' => 'Release',
'buildConfigurations' => [
project.objects.add(Xcodeproj::Project::XCBuildConfiguration, {
project.objects.add(Xcodeproj::Project::Object::XCBuildConfiguration, {
'name' => 'Debug',
'buildSettings' => build_settings(platform, :debug)
}),
project.objects.add(Xcodeproj::Project::XCBuildConfiguration, {
project.objects.add(Xcodeproj::Project::Object::XCBuildConfiguration, {
'name' => 'Release',
'buildSettings' => build_settings(platform, :release)
})
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment