8000 Extract project creation and preparation into new object by sebastianv1 · Pull Request #8243 · CocoaPods/CocoaPods · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Extract project creation and preparation into new object #8243

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 7, 2018
Merged

Extract project creation and preparation into new object #8243

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
64 changes: 10 additions & 54 deletions lib/cocoapods/installer/xcode/pods_project_generator.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ class PodsProjectGenerator
require 'cocoapods/installer/xcode/pods_project_generator/pod_target_installer'
require 'cocoapods/installer/xcode/pods_project_generator/file_references_installer'
require 'cocoapods/installer/xcode/pods_project_generator/aggregate_target_installer'
require 'cocoapods/installer/xcode/pods_project_generator/project_generator'
require 'cocoapods/installer/xcode/pods_project_generator_result'

# @return [Sandbox] The sandbox where the Pods should be installed.
Expand Down Expand Up @@ -59,7 +60,15 @@ def initialize(sandbox, aggregate_targets, pod_targets, analysis_result, install
end

def generate!
project = prepare
project_path = sandbox.project_path
build_configurations = analysis_result.all_user_build_configurations
platforms = aggregate_targets.map(&:platform)
object_version = aggregate_targets.map(&:user_project).compact.map { |p| p.object_version.to_i }.min
project_generator = ProjectGenerator.new(sandbox, project_path, pod_targets, build_configurations,
platforms, object_version, config.podfile_path)
project = project_generator.generate!
sandbox.project = project

install_file_references(project)
target_installation_results = install_targets(project)
integrate_targets(target_installation_results.pod_target_installation_results)
Expand Down Expand Up @@ -136,59 +145,6 @@ def share_development_pod_schemes(project)

private

def create_project
if object_version = aggregate_targets.map(&:user_project).compact.map { |p| p.object_version.to_i }.min
Pod::Project.new(sandbox.project_path, false, object_version)
else
Pod::Project.new(sandbox.project_path)
end
end

# Creates the Pods project from scratch if it doesn't exists.
#
# @return [Project]
#
# @todo Clean and modify the project if it exists.
#
def prepare
UI.message '- Creating Pods project' do
project = create_project
analysis_result.all_user_build_configurations.each do |name, type|
project.add_build_configuration(name, type)
end
# Reset symroot just in case the user has added a new build configuration other than 'Debug' or 'Release'.
project.symroot = Pod::Project::LEGACY_BUILD_ROOT

pod_names = pod_targets.map(&:pod_name).uniq
pod_names.each do |pod_name|
local = sandbox.local?(pod_name)
path = sandbox.pod_dir(pod_name)
was_absolute = sandbox.local_path_was_absolute?(pod_name)
project.add_pod_group(pod_name, path, local, was_absolute)
end

if config.podfile_path
project.add_podfile(config.podfile_path)
end

sandbox.project = project
platforms = aggregate_targets.map(&:platform)
osx_deployment_target = platforms.select { |p| p.name == :osx }.map(&:deployment_target).min
ios_deployment_target = platforms.select { |p| p.name == :ios }.map(&:deployment_target).min
watchos_deployment_target = platforms.select { |p| p.name == :watchos }.map(&:deployment_target).min
tvos_deployment_target = platforms.select { |p| p.name == :tvos }.map(&:deployment_target).min
project.build_configurations.each do |build_configuration|
build_configuration.build_settings['MACOSX_DEPLOYMENT_TARGET'] = osx_deployment_target.to_s if osx_deployment_target
build_configuration.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = ios_deployment_target.to_s if ios_deployment_target
build_configuration.build_settings['WATCHOS_DEPLOYMENT_TARGET'] = watchos_deployment_target.to_s if watchos_deployment_target
build_configuration.build_settings['TVOS_DEPLOYMENT_TARGET'] = tvos_deployment_target.to_s if tvos_deployment_target
build_configuration.build_settings['STRIP_INSTALLED_PRODUCT'] = 'NO'
build_configuration.build_settings['CLANG_ENABLE_OBJC_ARC'] = 'YES'
end
project
end
end

def install_file_references(project)
installer = FileReferencesInstaller.new(sandbox, pod_targets, project, installation_options.preserve_pod_file_structure)
installer.install!
Expand Down
113 changes: 113 additions & 0 deletions lib/cocoapods/installer/xcode/pods_project_generator/project_generator.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,113 @@
module Pod
class Installer
class Xcode
# Responsible for creating and preparing a Pod::Project instance
#
class ProjectGenerator
# @return [Sandbox] sandbox
# The Pods sandbox instance.
#
attr_reader :sandbox

# @return [String] path
# Path of the project.
#
attr_reader :path

# @return [Array<PodTarget>] pod_targets
# Array of pod targets this project includes.
#
attr_reader :pod_targets

# @return [Hash{String=>Symbol}] A hash representing all the user build
# configurations across all integration targets. Each key
# corresponds to the name of a configuration and its value to
# its type (`:debug` or `:release`).
#
attr_reader :build_configurations

# @return [Array<Platform>] The list of all platforms this project supports.
#
attr_reader :platforms

# @return [String] Object version for the Xcode project.
#
attr_reader :object_version

# @return [String] Path to the Podfile included in the project.
#
attr_reader :podfile_path

# Initialize a new instance
#
# @param [Sandbox] sandbox @see #sandbox
# @param [String] path @see #path
# @param [Array<PodTarget>] pod_targets @see #pod_targets
# @param [Hash{String=>Symbol}] build_configurations @see #build_configurations
# @param [Array<Platform>] platforms @see #platforms
# @param [String] object_version @see #object_version
# @param [String] podfile_path @see #podfile_path
#
def initialize(sandbox, path, pod_targets, build_configurations, platforms,
object_version = nil, podfile_path = nil)
@sandbox = sandbox
@path = path
@pod_targets = pod_targets
@build_configurations = build_configurations
@platforms = platforms
@object_version = object_version
@podfile_path = podfile_path
end

public

# @return [Project] Generated and prepared project.
#
def generate!
project = create_project(path, object_version)
prepare(sandbox, project, pod_targets, build_configurations, platforms, podfile_path)
project
end

private

def create_project(path, object_version)
object_version ||= Xcodeproj::Constants::DEFAULT_OBJECT_VERSION
Pod::Project.new(path, false, object_version)
end

def prepare(sandbox, project, pod_targets, build_configurations, platforms, podfile_path)
UI.message '- Creating Pods project' do
build_configurations.each do |name, type|
project.add_build_configuration(name, type)
end
# Reset symroot just in case the user has added a new build configuration other than 'Debug' or 'Release'.
project.symroot = Pod::Project::LEGACY_BUILD_ROOT
pod_names = pod_targets.map(&:pod_name).uniq
pod_names.each do |pod_name|
local = sandbox.local?(pod_name)
path = sandbox.pod_dir(pod_name)
was_absolute = sandbox.local_path_was_absolute?(pod_name)
project.add_pod_group(pod_name, path, local, was_absolute)
end
if podfile_path
project.add_podfile(podfile_path)
end
osx_deployment_target = platforms.select { |p| p.name == :osx }.map(&:deployment_target).min
ios_deployment_target = platforms.select { |p| p.name == :ios }.map(&:deployment_target).min
watchos_deployment_target = platforms.select { |p| p.name == :watchos }.map(&:deployment_target).min
tvos_deployment_target = platforms.select { |p| p.name == :tvos }.map(&:deployment_target).min
project.build_configurations.each do |build_configuration|
build_configuration.build_settings['MACOSX_DEPLOYMENT_TARGET'] = osx_deployment_target.to_s if osx_deployment_target
build_configuration.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = ios_deployment_target.to_s if ios_deployment_target
build_configuration.build_settings['WATCHOS_DEPLOYMENT_TARGET'] = watchos_deployment_target.to_s if watchos_deployment_target
build_configuration.build_settings['TVOS_DEPLOYMENT_TARGET'] = tvos_deployment_target.to_s if tvos_deployment_target
build_configuration.build_settings['STRIP_INSTALLED_PRODUCT'] = 'NO'
build_configuration.build_settings['CLANG_ENABLE_OBJC_ARC'] = 'YES'
end
end
end
end
end
end
end
0