Skip to content

Commit

Permalink
PTID: 106751868, add bundler support into RMS
Browse files Browse the repository at this point in the history
  • Loading branch information
thanizebra committed Oct 28, 2015
1 parent e2c7725 commit d548e84
Showing 1 changed file with 24 additions and 4 deletions.
28 changes: 24 additions & 4 deletions Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -3912,7 +3912,14 @@ namespace "build" do
cp compileERB, $srcdir
puts "Running bb.rb"

puts `#{$rubypath} -I"#{rhodeslib}" "#{$srcdir}/bb.rb"`
cmd_str = "#{$rubypath} -I#{rhodeslib} #{$srcdir}/bb.rb"
if defined?(Bundler)
Bundler.with_clean_env do
puts `#{cmd_str}`
end
else
puts `#{cmd_str}`
end
unless $? == 0
puts "Error interpreting erb code"
exit 1
Expand Down Expand Up @@ -4042,8 +4049,14 @@ namespace "build" do
create_manifest
cp compileERB, $srcdir
puts "Running default.rb"

puts `#{$rubypath} -I"#{rhodeslib}" "#{$srcdir}/default.rb"`
cmd_str = "#{$rubypath} -I#{rhodeslib} #{$srcdir}/default.rb"
if defined?(Bundler)
Bundler.with_clean_env do
puts `#{cmd_str}`
end
else
puts `#{cmd_str}`
end
unless $? == 0
puts "Error interpreting erb code"
exit 1
Expand All @@ -4053,7 +4066,14 @@ namespace "build" do

cp compileRB, $srcdir
puts "Running compileRB"
puts `#{$rubypath} -I"#{rhodeslib}" "#{$srcdir}/compileRB.rb"`
cmd_str = "#{$rubypath} -I#{rhodeslib} #{$srcdir}/compileRB.rb"
if defined?(Bundler)
Bundler.with_clean_env do
puts `#{cmd_str}`
end
else
puts `#{cmd_str}`
end
unless $? == 0
puts "Error interpreting ruby code"
exit 1
Expand Down

0 comments on commit d548e84

Please sign in to comment.