Skip to content

Shell-escaped the project path that we use for xcodebuild and lipo. #89

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

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Shell-escaped the project path that we use for xcodebuild and lipo. #89

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
303f972
Shell-escaped the project path that we use for xcodebuild.
antonino-u Aug 24, 2019
ace4fb5
Added shell escapes to lipo commands.
antonino-u Aug 24, 2019
021357b
Update Integration.rb
antonino-u Aug 31, 2019
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
6 changes: 3 additions & 3 deletions lib/cocoapods-binary/Integration.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,11 +269,11 @@ class EmbedFrameworksScript
# If the path isn't an absolute path, we add a realtive prefix.
old_read_link=`which readlink`
readlink () {
path=`$old_read_link $1`;
path=`$old_read_link "$1"`;
if [ $(echo "$path" | cut -c 1-1) = '/' ]; then
echo $path;
else
echo "`dirname $1`/$path";
echo "`dirname "$1"`/$path";
fi
}
# ---
Expand All @@ -286,4 +286,4 @@ class EmbedFrameworksScript
end
end
end
end
end
7 changes: 4 additions & 3 deletions lib/cocoapods-binary/rome/build_framework.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
require 'fourflusher'
require 'xcpretty'
require 'shellwords'

CONFIGURATION = "Release"
PLATFORMS = { 'iphonesimulator' => 'iOS',
Expand Down Expand Up @@ -50,7 +51,7 @@ def build_for_iosish_platform(sandbox,
# the device_lib path is the final output file path
# combine the binaries
tmp_lipoed_binary_path = "#{build_dir}/#{target_name}"
lipo_log = `lipo -create -output #{tmp_lipoed_binary_path} #{device_binary} #{simulator_binary}`
lipo_log = `lipo -create -output #{tmp_lipoed_binary_path.shellescape} #{device_binary.shellescape} #{simulator_binary.shellescape}`
puts lipo_log unless File.exist?(tmp_lipoed_binary_path)
FileUtils.mv tmp_lipoed_binary_path, device_binary, :force => true

Expand Down Expand Up @@ -91,7 +92,7 @@ def build_for_iosish_platform(sandbox,
simulator_dsym = "#{simulator_framework_path}.dSYM"
if File.exist? simulator_dsym
tmp_lipoed_binary_path = "#{output_path}/#{module_name}.draft"
lipo_log = `lipo -create -output #{tmp_lipoed_binary_path} #{device_dsym}/Contents/Resources/DWARF/#{module_name} #{simulator_dsym}/Contents/Resources/DWARF/#{module_name}`
lipo_log = `lipo -create -output #{tmp_lipoed_binary_path.shellescape} #{device_dsym.shellescape}/Contents/Resources/DWARF/#{module_name.shellescape} #{simulator_dsym.shellescape}/Contents/Resources/DWARF/#{module_name.shellescape}`
puts lipo_log unless File.exist?(tmp_lipoed_binary_path)
FileUtils.mv tmp_lipoed_binary_path, "#{device_framework_path}.dSYM/Contents/Resources/DWARF/#{module_name}", :force => true
end
Expand All @@ -106,7 +107,7 @@ def build_for_iosish_platform(sandbox,
end

def xcodebuild(sandbox, target, sdk='macosx', deployment_target=nil, other_options=[])
args = %W(-project #{sandbox.project_path.realdirpath} -scheme #{target} -configuration #{CONFIGURATION} -sdk #{sdk} )
args = %W(-project #{sandbox.project_path.realdirpath.shellescape} -scheme #{target} -configuration #{CONFIGURATION} -sdk #{sdk} )
platform = PLATFORMS[sdk]
args += Fourflusher::SimControl.new.destination(:oldest, platform, deployment_target) unless platform.nil?
args += other_options
Expand Down