Skip to content

Commit

Permalink
Manually merged nrk's patch for pwd fix.
Browse files Browse the repository at this point in the history
  • Loading branch information
wayneeseguin committed Dec 21, 2009
1 parent d55b977 commit d471bb9
Showing 1 changed file with 7 additions and 5 deletions.
12 changes: 7 additions & 5 deletions scripts/manage
Expand Up @@ -345,17 +345,19 @@ RubyWrapper
__rvm_fetch_ruby
if [[ $? -gt 0 ]] ; then result=$? ; return $result ; fi

rvm_ruby_make='rake MERLIN_ROOT="$(pwd)/Merlin/Main" compile mono=1 configuration=release --trace'
builtin cd $rvm_ruby_src_path

rvm_ruby_make="rake MERLIN_ROOT=\"$rvm_ruby_src_path/Merlin/Main\" compile mono=1 configuration=release --trace"
__rvm_run "rake" "$rvm_ruby_make" "Building IronRuby..."
if [[ $? -gt 0 ]] ; then result=$? ; return $result ; fi

rm -rf $rvm_ruby_home/*
mkdir -p $rvm_ruby_home/bin $rvm_ruby_home/lib $rvm_ruby_home/lib/ruby $rvm_ruby_home/lib/IronRuby

cp -r $(pwd)/Merlin/Main/Bin/mono_release/* $rvm_ruby_home/bin/
cp -r $(pwd)/Merlin/Main/Languages/Ruby/Scripts/bin/* $rvm_ruby_home/bin/
cp -r $(pwd)/Merlin/External.LCA_RESTRICTED/Languages/Ruby/ruby-1.8.6p*/lib/ruby/* $rvm_ruby_home/lib/ruby
cp -r $(pwd)/Merlin/Main/Languages/Ruby/Libs/* $rvm_ruby_home/lib/IronRuby
cp -r $rvm_ruby_src_path/Merlin/Main/Bin/mono_release/* $rvm_ruby_home/bin/
cp -r $rvm_ruby_src_path/Merlin/Main/Languages/Ruby/Scripts/bin/* $rvm_ruby_home/bin/
cp -r $rvm_ruby_src_path/Merlin/External.LCA_RESTRICTED/Languages/Ruby/ruby-1.8.6p*/lib/ruby/* $rvm_ruby_home/lib/ruby
cp -r $rvm_ruby_src_path/ruby_home/lib/IronRuby
else
$rvm_scripts_path/log "info" "Retrieving IronRuby"
$rvm_scripts_path/fetch "$rvm_url" || (result=$? && return $result)
Expand Down

0 comments on commit d471bb9

Please sign in to comment.