Skip to content

Rename prebuild and postbuild phases, adjust prebuild position #74

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
polac24 merged 4 commits into from
Feb 9, 2022
Merged

Rename prebuild and postbuild phases, adjust prebuild position #74

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a63488a
Move build configs to xcconfigs
Feb 8, 2022
fd7b68a
Merge branch 'spotify:master' into master
vasvf Feb 8, 2022
b805bf4
revert some changes
Feb 9, 2022
e263cb6
fix comment
Feb 9, 2022
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
10 changes: 6 additions & 4 deletions cocoapods-plugin/lib/cocoapods-xcremotecache/command/hooks.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,8 @@ def self.enable_xcremotecache(target, repo_distance, xc_location, xc_cc_path, mo
phase.name != nil && phase.name.start_with?("[XCRC] Prebuild")
end
end
prebuild_script = existing_prebuild_script || target.new_shell_script_build_phase("[XCRC] Prebuild")

prebuild_script = existing_prebuild_script || target.new_shell_script_build_phase("[XCRC] Prebuild #{target.name}")
prebuild_script.shell_script = "\"$SCRIPT_INPUT_FILE_0\""
prebuild_script.input_paths = ["$SRCROOT/#{srcroot_relative_xc_location}/xcprebuild"]
prebuild_script.output_paths = [
Expand All @@ -144,8 +145,9 @@ def self.enable_xcremotecache(target, repo_distance, xc_location, xc_cc_path, mo
]
prebuild_script.dependency_file = "$(TARGET_TEMP_DIR)/prebuild.d"

# Move prebuild (last element) to the first position (to make it real 'prebuild')
target.build_phases.rotate!(-1) if existing_prebuild_script.nil?
# Move prebuild (last element) to the position before compile sources phase (to make it real 'prebuild')
compile_phase_index = target.build_phases.index(target.source_build_phase)
target.build_phases.insert(compile_phase_index, target.build_phases.delete(prebuild_script))
elsif mode == 'producer' || mode == 'producer-fast'
# Delete existing prebuild build phase (to support switching between modes)
target.build_phases.delete_if do |phase|
Expand All @@ -161,7 +163,7 @@ def self.enable_xcremotecache(target, repo_distance, xc_location, xc_cc_path, mo
phase.name != nil && phase.name.start_with?("[XCRC] Postbuild")
end
end
postbuild_script = existing_postbuild_script || target.new_shell_script_build_phase("[XCRC] Postbuild")
postbuild_script = existing_postbuild_script || target.new_shell_script_build_phase("[XCRC] Postbuild #{target.name}")
postbuild_script.shell_script = "\"$SCRIPT_INPUT_FILE_0\""
postbuild_script.input_paths = ["$SRCROOT/#{srcroot_relative_xc_location}/xcpostbuild"]
postbuild_script.output_paths = [
Expand Down