From 50df0a9c8a822e99ff05d3e78a629c7950491ae1 Mon Sep 17 00:00:00 2001 From: Ryan Riley Date: Mon, 3 Aug 2009 22:54:51 -0500 Subject: [PATCH 1/1] Changed the :LibraryPaths in context.rb to point to ..\External.LCA_RESTRICTED\Languages\Ruby\redist_libs\.. from ..\External.LCA_RESTRICTED\Languages\Ruby\Ruby-1.8.6p287\.. --- Merlin/Main/Languages/Ruby/context.rb | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Merlin/Main/Languages/Ruby/context.rb b/Merlin/Main/Languages/Ruby/context.rb index effeddf..24f7a10 100644 --- a/Merlin/Main/Languages/Ruby/context.rb +++ b/Merlin/Main/Languages/Ruby/context.rb @@ -368,7 +368,7 @@ class CSProjCompiler def transform_config_file(configuration, source_path, target_build_path) # signing is on for IronRuby in Merlin, off for SVN and Binary - layout = {'Merlin' => { :LibraryPaths => '..\..\Languages\Ruby\libs;..\..\..\External.LCA_RESTRICTED\Languages\Ruby\Ruby-1.8.6p287\lib\ruby\site_ruby\1.8;..\..\..\External.LCA_RESTRICTED\Languages\Ruby\Ruby-1.8.6p287\lib\ruby\site_ruby;..\..\..\External.LCA_RESTRICTED\Languages\Ruby\Ruby-1.8.6p287\lib\ruby\1.8' }, + layout = {'Merlin' => { :LibraryPaths => '..\..\Languages\Ruby\libs;..\..\..\External.LCA_RESTRICTED\Languages\Ruby\redist-libs\ruby\site_ruby\1.8;..\..\..\External.LCA_RESTRICTED\Languages\Ruby\redist-libs\ruby\site_ruby;..\..\..\External.LCA_RESTRICTED\Languages\Ruby\redist-libs\ruby\1.8' }, 'Binary' => { :LibraryPaths => '..\lib\IronRuby;..\lib\ruby\site_ruby\1.8;..\lib\ruby\site_ruby;..\lib\ruby\1.8' } } transform_config source_path, target_build_path, layout[configuration][:LibraryPaths] -- 1.6.3.2.1299.gee46c