merge 92391851 commit for Framework

This commit is contained in:
Watson
2014-11-28 21:31:15 +09:00
parent 9cf66f50b2
commit f40cf8b529

View File

@@ -39,10 +39,27 @@ module Motion; module Project
@opts = opts
end
# This takes care of changing into the target's work directory, setting the
# required environment variables, and passing on whether to be verbose.
#
# @param [String] task
# The rake task to invoke in the target's context.
#
# @return [Boolean] Whether or not invoking the rake task succeeded.
#
def rake(task)
command = "cd #{@full_path} && #{environment_variables} rake #{task}"
if App::VERBOSE
command << " --trace"
puts command
end
system(command)
end
def build(platform)
@platform = platform
command = if platform == 'iPhoneSimulator'
task = if platform == 'iPhoneSimulator'
"build:simulator"
else
if @config.distribution_mode
@@ -52,11 +69,7 @@ module Motion; module Project
end
end
args = ''
args << " --trace" if App::VERBOSE
success = system("cd #{@full_path} && #{environment_variables} rake #{command} #{args}")
unless success
unless rake(task)
App.fail "Target '#{@path}' failed to build"
end
end
@@ -120,9 +133,7 @@ PLIST
end
def clean
args = ''
args << " --trace" if App::VERBOSE
system("cd #{@full_path} && #{environment_variables} rake clean #{args}")
rake 'clean'
end
def build_dir(config, platform)