Skip to content

Commit

Permalink
JasonLeyba: Addressing several build issues from r16414.
Browse files Browse the repository at this point in the history
* Allow js_binary input to be defined solely through deps.
* Do not set third_party=true if a js_binary explicitly specifies
third_party=false in its flag definitions. This is necessary to compile the
SafariDriver with all error checks enabled.

r16429
  • Loading branch information
jleyba committed Apr 2, 2012
1 parent cf7bb69 commit 9a5c60c
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions rake-tasks/crazy_fun/mappings/javascript.rb
Original file line number Diff line number Diff line change
Expand Up @@ -369,7 +369,7 @@ def handle(fun, dir, args)

js_files = build_deps(output, Rake::Task[output], []).uniq

all_srcs = args[:srcs].collect{|src| Dir[File.join(dir, src)]}
all_srcs = args[:srcs].nil? ? [] : args[:srcs].collect{|src| Dir[File.join(dir, src)]}
all_srcs = all_srcs.flatten.collect{|src| File.expand_path(src)}
all_deps = calc_deps(all_srcs.flatten, js_files)

Expand All @@ -381,7 +381,7 @@ def handle(fun, dir, args)
formatting = !args[:no_format].nil? ? "" : '--formatting=PRETTY_PRINT'
flags.push(formatting)

flags.push('--third_party=true')
flags.push('--third_party=true') unless !flags.index('--third_party=false').nil?
flags.push("--js_output_file=#{output}")

cmd = "" <<
Expand Down

0 comments on commit 9a5c60c

Please sign in to comment.