edit: $/Dev10/feature/vs_langs01/Merlin/Main/Languages/Ruby/Scripts/Dev.bat;C770837
File: Dev.bat
===================================================================
--- $/Dev10/feature/vs_langs01/Merlin/Main/Languages/Ruby/Scripts/Dev.bat;C770837  (server)    3/8/2009 8:44 AM
+++ Shelved Change: $/Dev10/feature/vs_langs01/Merlin/Main/Languages/Ruby/Scripts/Dev.bat;scripts
@@ -3,12 +3,17 @@
 set CURRENT=%CD%
 set RUBY_SCRIPTS=%~dp0
 set MERLIN_ROOT=%RUBY_SCRIPTS:~0,-24%
-set RUBYOPT=
-set RUBY18_BIN=%MERLIN_ROOT%\..\External\Languages\Ruby\ruby-1.8.6\bin
+
 set PROGRAM_FILES_32=%ProgramFiles%
 set PROGRAM_FILES_64=%ProgramFiles%
 set PROGRAM_FILES_x86=%ProgramFiles(x86)%
 
+set IRONRUBY_GIT=1
+REM ruby.exe needs to be on the path
+set RUBY18_EXE=ruby.exe
+set RUBY19_EXE=c:\ruby19\bin\ruby.exe
+set RUBYOPT=
+
 if exist "%PROGRAM_FILES_x86%" set PROGRAM_FILES_32=%PROGRAM_FILES_x86%
 
 if exist "%PROGRAM_FILES_32%\Microsoft Visual Studio 9.0\Common7\Tools\vsvars32.bat" (
===================================================================
merge, branch, edit: $/Dev10/feature/vs_langs01/Merlin/Main/Languages/Ruby/Scripts/irtests.bat
File: irtests.bat
===================================================================
--- irtests.bat  (server)    3/8/2009 8:44 AM
+++ Shelved Change: $/Dev10/feature/vs_langs01/Merlin/Main/Languages/Ruby/Scripts/irtests.bat;scripts
@@ -1,13 +1,17 @@
+@setlocal
+
 start "Smoke Tests" %MERLIN_ROOT%\Languages\Ruby\Tests\Scripts\irtest.bat
 
 start "Legacy Tests" %MERLIN_ROOT%\Languages\Ruby\Tests\run.bat
 
-start "Core RubySpec tests" %MERLIN_ROOT%\Scripts\bat\RunRspec.cmd .
+set RUBY_SPEC_CMD=%MERLIN_ROOT%\Languages\Ruby\Scripts\RunRspec.cmd
 
-start "Language RubySpec tests" %MERLIN_ROOT%\Scripts\bat\RunRspec.cmd ..\language
+start "Core RubySpec tests" %RUBY_SPEC_CMD% .
 
-start "Library RubySpec tests" %MERLIN_ROOT%\Scripts\bat\RunRspec.cmd ..\library
+start "Language RubySpec tests" %RUBY_SPEC_CMD% ..\language
 
+start "Library RubySpec tests" %RUBY_SPEC_CMD% ..\library
+
 @if exist %MERLIN_ROOT%\Scripts\Python\GenerateSystemCoreCsproj.py (
   echo Dev10 build test:
   %MERLIN_ROOT%\Bin\Debug\ipy.exe %MERLIN_ROOT%\Scripts\Python\GenerateSystemCoreCsproj.py
===================================================================
merge, branch, edit: $/Dev10/feature/vs_langs01/Merlin/Main/Languages/Ruby/Scripts/RunRSpec.cmd
File: RunRSpec.cmd
===================================================================
--- RunRSpec.cmd  (server)    3/9/2009 12:05 PM
+++ Shelved Change: $/Dev10/feature/vs_langs01/Merlin/Main/Languages/Ruby/Scripts/RunRSpec.cmd;scripts
@@ -11,25 +11,34 @@
     goto END:
 )
 
-set RUBY_CMD=%MERLIN_ROOT%\test\scripts\ir.cmd
+set RUBY_CMD=%MERLIN_ROOT%\bin\Debug\ir.exe
+set RUBY_CMD_OPTS=-X:Interpret
 set EXCL_TAGS=--excl-tag fails --excl-tag critical
 
 if "%1"=="-ruby" (
-    set RUBY_CMD=%MERLIN_ROOT%\..\External\Languages\Ruby\ruby-1.8.6\bin\ruby.exe
+    set RUBY_CMD=%RUBY18_EXE%
     set EXCL_TAGS=
-REM    set RUBY_EXE=c:/vsl/Merlin/External/Languages/Ruby/ruby-1.8.6/bin/ruby.exe
-REM    set MSPEC_RUNNER=1
+    set RUBY_CMD_OPTS=
+    REM set RUBY_EXE=%RUBY18_EXE%
+    REM set MSPEC_RUNNER=1
     shift
 )
 
 if "%1"=="-ruby19" (
-    set RUBY_CMD=%MERLIN_ROOT%\..\External\Languages\Ruby\ruby-1.9.0-0\bin\ruby.exe
+    set RUBY_CMD=%RUBY19_EXE%
     set EXCL_TAGS=
-    set RUBY_EXE=c:/vsl/Merlin/External/Languages/Ruby/ruby-1.9.0-0/bin/ruby.exe
-REM    set MSPEC_RUNNER=1
+    set RUBY_CMD_OPTS=
+    set RUBY_EXE=%RUBY19_EXE%
+    REM set MSPEC_RUNNER=1
     shift
+   
 )
 
+if not exist %RUBY_CMD% (
+    echo RunRSpec could not find %RUBY_CMD%
+    goto END:
+)
+
 if "%1" == "-e" (
     set EXAMPLE_STR=--example %2
     shift
@@ -39,7 +48,7 @@
 @echo on
 pushd %MERLIN_ROOT%\..\External\Languages\IronRuby\mspec
 
-%RUBY_CMD% mspec\bin\mspec-run -fd --verbose %EXAMPLE_STR% %EXCL_TAGS% --config default.mspec rubyspec/core/%1
+%RUBY_CMD% %RUBY_CMD_OPTS% mspec\bin\mspec-run -fd --verbose %EXAMPLE_STR% %EXCL_TAGS% --config default.mspec rubyspec/core/%1
 
 popd
 
===================================================================
edit: $/Dev10/feature/vs_langs01/Merlin/Main/Languages/Ruby/Tests/common.rb;C533700
File: common.rb
===================================================================
--- $/Dev10/feature/vs_langs01/Merlin/Main/Languages/Ruby/Tests/common.rb;C533700  (server)    3/8/2009 8:44 AM
+++ Shelved Change: $/Dev10/feature/vs_langs01/Merlin/Main/Languages/Ruby/Tests/common.rb;scripts
@@ -30,7 +30,7 @@
         MERLIN_ROOT     = get_environment_variable('MERLIN_ROOT')
         TEST_DIR        = MERLIN_ROOT + "/Languages/Ruby/Tests"
         CORECLR_ROOT    = MERLIN_ROOT + "/Utilities/Silverlight/x86ret"
-        CRUBY_EXE       = MERLIN_ROOT + "/../External/Languages/Ruby/ruby-1.8.6/bin/ruby.exe"
+        CRUBY_EXE       = get_environment_variable('RUBY18_EXE')
         
         ROWAN_BIN       = get_environment_variable('ROWAN_BIN')
 
@@ -39,10 +39,14 @@
             IRUBY_EXE       = MERLIN_ROOT + "/Test/Scripts/ir.cmd"
             IPYTHON_EXE     = ROWAN_BIN + "/ipy.exe"
         else
-            IRUBY_EXE       = MERLIN_ROOT + "/Test/Scripts/ir.cmd"
+            if get_environment_variable('IRONRUBY_GIT') == '1'
+                IRUBY_EXE   = MERLIN_ROOT + "/bin/debug/ir.exe" # ir.cmd does not exist in GIT
+            else
+                IRUBY_EXE   = MERLIN_ROOT + "/Test/Scripts/ir.cmd"
+            end
             IPYTHON_EXE     = MERLIN_ROOT + "/bin/debug/ipy.exe"
-        end 
-        
+        end
+                
         PARSEONLY_EXE   = IPYTHON_EXE + " " + TEST_DIR + "/Tools/parseonly.py " 
     else
         TEST_DIR        = File.expand_path(File.dirname(__FILE__))
===================================================================
edit: $/Dev10/feature/vs_langs01/Merlin/Main/Languages/Ruby/Tests/run.bat;C751889
File: run.bat
===================================================================
--- $/Dev10/feature/vs_langs01/Merlin/Main/Languages/Ruby/Tests/run.bat;C751889  (server)    3/8/2009 8:46 AM
+++ Shelved Change: $/Dev10/feature/vs_langs01/Merlin/Main/Languages/Ruby/Tests/run.bat;scripts
@@ -2,7 +2,7 @@
 setlocal
 
 pushd %MERLIN_ROOT%\Languages\Ruby\Tests
-%MERLIN_ROOT%\..\external\languages\ruby\ruby-1.8.6\bin\ruby.exe %~dp0run.rb -checkin %*
+%RUBY18_EXE% %~dp0run.rb -checkin %*
 set EXITCODE=%ERRORLEVEL%
 
 popd
===================================================================