add: $/Dev10/feature/vs_langs01_s/Merlin/Main/Languages/Ruby/Scripts/bin/gem
File: gem
===================================================================
--- [no source file]
+++ Shelved Change: $/Dev10/feature/vs_langs01_s/Merlin/Main/Languages/Ruby/Scripts/bin/gem;i-scripts
@@ -1,0 +1,28 @@
+#!/usr/bin/env ir
+
+#--
+# Copyright 2006 by Chad Fowler, Rich Kilmer, Jim Weirich and others.
+# All rights reserved.
+# See LICENSE.txt for permissions.
+#++
+
+require 'rubygems'
+require 'rubygems/gem_runner'
+require 'rubygems/exceptions'
+
+required_version = Gem::Requirement.new "> 1.8.3"
+
+unless required_version.satisfied_by? Gem.ruby_version then
+  abort "Expected Ruby Version #{required_version}, was #{Gem.ruby_version}"
+end
+
+# We need to preserve the original ARGV to use for passing gem options
+# to source gems.  If there is a -- in the line, strip all options after
+# it...its for the source building process.
+args = !ARGV.include?("--") ? ARGV.clone : ARGV[0...ARGV.index("--")]
+
+begin
+  Gem::GemRunner.new.run args
+rescue Gem::SystemExitException => e
+  exit e.exit_code
+end
\ No newline at end of file
===================================================================
delete: $/Dev10/feature/vs_langs01_s/Merlin/Main/Languages/Ruby/Scripts/bin/igem;C1237359
File: igem
===================================================================
--- $/Dev10/feature/vs_langs01_s/Merlin/Main/Languages/Ruby/Scripts/bin/igem;C1237359  (server)    3/28/2010 11:51 PM
+++ [no target file]
@@ -1,28 +1,0 @@
-#!/usr/bin/env ir
-
-#--
-# Copyright 2006 by Chad Fowler, Rich Kilmer, Jim Weirich and others.
-# All rights reserved.
-# See LICENSE.txt for permissions.
-#++
-
-require 'rubygems'
-require 'rubygems/gem_runner'
-require 'rubygems/exceptions'
-
-required_version = Gem::Requirement.new "> 1.8.3"
-
-unless required_version.satisfied_by? Gem.ruby_version then
-  abort "Expected Ruby Version #{required_version}, was #{Gem.ruby_version}"
-end
-
-# We need to preserve the original ARGV to use for passing gem options
-# to source gems.  If there is a -- in the line, strip all options after
-# it...its for the source building process.
-args = !ARGV.include?("--") ? ARGV.clone : ARGV[0...ARGV.index("--")]
-
-begin
-  Gem::GemRunner.new.run args
-rescue Gem::SystemExitException => e
-  exit e.exit_code
-end
\ No newline at end of file
===================================================================
edit: $/Dev10/feature/vs_langs01_s/Merlin/Main/Languages/Ruby/Scripts/bin/igem.bat;C815336
File: igem.bat
===================================================================
--- $/Dev10/feature/vs_langs01_s/Merlin/Main/Languages/Ruby/Scripts/bin/igem.bat;C815336  (server)    3/28/2010 11:51 PM
+++ Shelved Change: $/Dev10/feature/vs_langs01_s/Merlin/Main/Languages/Ruby/Scripts/bin/igem.bat;i-scripts
@@ -7,4 +7,4 @@
   set IR_CMD="%MERLIN_ROOT%\bin\Debug\ir.exe"
 )
 
-%IR_CMD% "%~dpn0" %*
+%IR_CMD% "%~dp0gem" %*
===================================================================
delete: $/Dev10/feature/vs_langs01_s/Merlin/Main/Languages/Ruby/Scripts/bin/iirb;C1237359
File: iirb
===================================================================
--- $/Dev10/feature/vs_langs01_s/Merlin/Main/Languages/Ruby/Scripts/bin/iirb;C1237359  (server)    3/28/2010 11:51 PM
+++ [no target file]
@@ -1,21 +1,0 @@
-#!/usr/bin/env ir
-#
-#   irb.rb - intaractive ruby
-#   	$Release Version: 0.9.5 $
-#   	$Revision: 11708 $
-#   	$Date: 2007-02-13 08:01:19 +0900 (Tue, 13 Feb 2007) $
-#   	by Keiju ISHITSUKA(keiju@ruby-lang.org)
-#
-
-require "irb"
-
-if __FILE__ == $0
-  IRB.start(__FILE__)
-else
-  # check -e option
-  if /^-e$/ =~ $0
-    IRB.start(__FILE__)
-  else
-    IRB.setup(__FILE__)
-  end
-end
===================================================================
edit: $/Dev10/feature/vs_langs01_s/Merlin/Main/Languages/Ruby/Scripts/bin/iirb.bat;C815336
File: iirb.bat
===================================================================
--- $/Dev10/feature/vs_langs01_s/Merlin/Main/Languages/Ruby/Scripts/bin/iirb.bat;C815336  (server)    3/28/2010 11:51 PM
+++ Shelved Change: $/Dev10/feature/vs_langs01_s/Merlin/Main/Languages/Ruby/Scripts/bin/iirb.bat;i-scripts
@@ -7,4 +7,4 @@
   set IR_CMD="%MERLIN_ROOT%\bin\Debug\ir.exe"
 )
 
-%IR_CMD% "%~dpn0" %*
+%IR_CMD% "%~dp0irb" %*
===================================================================
delete: $/Dev10/feature/vs_langs01_s/Merlin/Main/Languages/Ruby/Scripts/bin/irackup;C966724
File: irackup
===================================================================
--- $/Dev10/feature/vs_langs01_s/Merlin/Main/Languages/Ruby/Scripts/bin/irackup;C966724  (server)    3/28/2010 11:51 PM
+++ [no target file]
@@ -1,19 +1,0 @@
-#!c:/ruby/bin/ruby.exe
-#
-# This file was generated by RubyGems.
-#
-# The application 'rack' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require 'rubygems'
-
-version = ">= 0"
-
-if ARGV.first =~ /^_(.*)_$/ and Gem::Version.correct? $1 then
-  version = $1
-  ARGV.shift
-end
-
-gem 'rack', version
-load 'rackup'
===================================================================
delete: $/Dev10/feature/vs_langs01_s/Merlin/Main/Languages/Ruby/Scripts/bin/irackup.bat;C966724
File: irackup.bat
===================================================================
--- $/Dev10/feature/vs_langs01_s/Merlin/Main/Languages/Ruby/Scripts/bin/irackup.bat;C966724  (server)    3/28/2010 11:51 PM
+++ [no target file]
@@ -1,10 +1,0 @@
-@echo off
-setlocal
-
-set IR_CMD="%~dp0ir.exe"
-if defined MERLIN_ROOT (
-  REM - This is a dev environment. See http://wiki.github.com/ironruby/ironruby
-  set IR_CMD="%MERLIN_ROOT%\bin\Debug\ir.exe"
-)
-
-%IR_CMD% "%~dpn0" %*
===================================================================
delete: $/Dev10/feature/vs_langs01_s/Merlin/Main/Languages/Ruby/Scripts/bin/irails;C1237359
File: irails
===================================================================
--- $/Dev10/feature/vs_langs01_s/Merlin/Main/Languages/Ruby/Scripts/bin/irails;C1237359  (server)    3/28/2010 11:51 PM
+++ [no target file]
@@ -1,19 +1,0 @@
-#!/usr/bin/env ir
-#
-# This file was generated by RubyGems.
-#
-# The application 'rails' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require 'rubygems'
-
-version = ">= 0"
-
-if ARGV.first =~ /^_(.*)_$/ and Gem::Version.correct? $1 then
-  version = $1
-  ARGV.shift
-end
-
-gem 'rails', version
-load 'rails'
===================================================================
delete: $/Dev10/feature/vs_langs01_s/Merlin/Main/Languages/Ruby/Scripts/bin/irails.bat;C815336
File: irails.bat
===================================================================
--- $/Dev10/feature/vs_langs01_s/Merlin/Main/Languages/Ruby/Scripts/bin/irails.bat;C815336  (server)    3/28/2010 11:51 PM
+++ [no target file]
@@ -1,10 +1,0 @@
-@echo off
-setlocal
-
-set IR_CMD="%~dp0ir.exe"
-if defined MERLIN_ROOT (
-  REM - This is a dev environment. See http://wiki.github.com/ironruby/ironruby
-  set IR_CMD="%MERLIN_ROOT%\bin\Debug\ir.exe"
-)
-
-%IR_CMD% "%~dpn0" %*
===================================================================
delete: $/Dev10/feature/vs_langs01_s/Merlin/Main/Languages/Ruby/Scripts/bin/irake;C1532917
File: irake
===================================================================
--- $/Dev10/feature/vs_langs01_s/Merlin/Main/Languages/Ruby/Scripts/bin/irake;C1532917  (server)    3/28/2010 11:51 PM
+++ [no target file]
@@ -1,19 +1,0 @@
-#!/usr/bin/env ir
-#
-# This file was generated by RubyGems.
-#
-# The application 'rake' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require 'rubygems'
-
-version = ">= 0"
-
-if ARGV.first =~ /^_(.*)_$/ and Gem::Version.correct? $1 then
-  version = $1
-  ARGV.shift
-end
-
-gem 'rake', version
-load 'rake'
===================================================================
delete: $/Dev10/feature/vs_langs01_s/Merlin/Main/Languages/Ruby/Scripts/bin/irake.bat;C815336
File: irake.bat
===================================================================
--- $/Dev10/feature/vs_langs01_s/Merlin/Main/Languages/Ruby/Scripts/bin/irake.bat;C815336  (server)    3/28/2010 11:51 PM
+++ [no target file]
@@ -1,10 +1,0 @@
-@echo off
-setlocal
-
-set IR_CMD="%~dp0ir.exe"
-if defined MERLIN_ROOT (
-  REM - This is a dev environment. See http://wiki.github.com/ironruby/ironruby
-  set IR_CMD="%MERLIN_ROOT%\bin\Debug\ir.exe"
-)
-
-%IR_CMD% "%~dpn0" %*
===================================================================
delete: $/Dev10/feature/vs_langs01_s/Merlin/Main/Languages/Ruby/Scripts/bin/irake.cmd;C791094
File: irake.cmd
===================================================================
--- $/Dev10/feature/vs_langs01_s/Merlin/Main/Languages/Ruby/Scripts/bin/irake.cmd;C791094  (server)    3/28/2010 11:51 PM
+++ [no target file]
@@ -1,1 +1,0 @@
-@ir "%~dp0/rake" %*
===================================================================
add: $/Dev10/feature/vs_langs01_s/Merlin/Main/Languages/Ruby/Scripts/bin/irb
File: irb
===================================================================
--- [no source file]
+++ Shelved Change: $/Dev10/feature/vs_langs01_s/Merlin/Main/Languages/Ruby/Scripts/bin/irb;i-scripts
@@ -1,0 +1,21 @@
+#!/usr/bin/env ir
+#
+#   irb.rb - intaractive ruby
+#   	$Release Version: 0.9.5 $
+#   	$Revision: 11708 $
+#   	$Date: 2007-02-13 08:01:19 +0900 (Tue, 13 Feb 2007) $
+#   	by Keiju ISHITSUKA(keiju@ruby-lang.org)
+#
+
+require "irb"
+
+if __FILE__ == $0
+  IRB.start(__FILE__)
+else
+  # check -e option
+  if /^-e$/ =~ $0
+    IRB.start(__FILE__)
+  else
+    IRB.setup(__FILE__)
+  end
+end
===================================================================
delete: $/Dev10/feature/vs_langs01_s/Merlin/Main/Languages/Ruby/Scripts/bin/irdoc;C1237359
File: irdoc
===================================================================
--- $/Dev10/feature/vs_langs01_s/Merlin/Main/Languages/Ruby/Scripts/bin/irdoc;C1237359  (server)    3/28/2010 11:51 PM
+++ [no target file]
@@ -1,66 +1,0 @@
-#!/usr/bin/env ir
-#  RDoc: Documentation tool for source code
-#        (see lib/rdoc/rdoc.rb for more information)
-#
-#  Copyright (c) 2003 Dave Thomas
-#  Released under the same terms as Ruby
-#
-#  $Revision: 11708 $
-
-## Transitional Hack ####
-#
-#  RDoc was initially distributed independently, and installed
-#  itself into <prefix>/lib/ruby/site_ruby/<ver>/rdoc...
-#
-#  Now that RDoc is part of the distribution, it's installed into
-#  <prefix>/lib/ruby/<ver>, which unfortunately appears later in the
-#  search path. This means that if you have previously installed RDoc,
-#  and then install from ruby-lang, you'll pick up the old one by
-#  default. This hack checks for the condition, and readjusts the
-#  search path if necessary.
-
-def adjust_for_existing_rdoc(path)
-  
-  $stderr.puts %{
-  It seems as if you have a previously-installed RDoc in
-  the directory #{path}.
-
-  Because this is now out-of-date, you might want to consider
-  removing the directories:
-
-    #{File.join(path, "rdoc")}
-
-  and
-
-    #{File.join(path, "markup")}
-
-  }
-
-  # Move all the site_ruby directories to the end
-  p $:
-  $:.replace($:.partition {|path| /site_ruby/ !~ path}.flatten)
-  p $:
-end
-
-$:.each do |path|
-  if /site_ruby/ =~ path 
-    rdoc_path = File.join(path, 'rdoc', 'rdoc.rb')
-    if File.exists?(rdoc_path)
-      adjust_for_existing_rdoc(path)
-      break
-    end
-  end
-end
-
-## End of Transitional Hack ##
-
-
-require 'rdoc/rdoc'
-
-begin
-  r = RDoc::RDoc.new
-  r.document(ARGV)
-rescue RDoc::RDocError => e
-  $stderr.puts e.message
-  exit(1)
-end
===================================================================
edit: $/Dev10/feature/vs_langs01_s/Merlin/Main/Languages/Ruby/Scripts/bin/irdoc.bat;C815336
File: irdoc.bat
===================================================================
--- $/Dev10/feature/vs_langs01_s/Merlin/Main/Languages/Ruby/Scripts/bin/irdoc.bat;C815336  (server)    3/28/2010 11:51 PM
+++ Shelved Change: $/Dev10/feature/vs_langs01_s/Merlin/Main/Languages/Ruby/Scripts/bin/irdoc.bat;i-scripts
@@ -7,4 +7,4 @@
   set IR_CMD="%MERLIN_ROOT%\bin\Debug\ir.exe"
 )
 
-%IR_CMD% "%~dpn0" %*
+%IR_CMD% "%~dp0rdoc" %*
===================================================================
delete: $/Dev10/feature/vs_langs01_s/Merlin/Main/Languages/Ruby/Scripts/bin/iri;C1237359
File: iri
===================================================================
--- $/Dev10/feature/vs_langs01_s/Merlin/Main/Languages/Ruby/Scripts/bin/iri;C1237359  (server)    3/28/2010 11:51 PM
+++ [no target file]
@@ -1,48 +1,0 @@
-#!/usr/bin/env ir
-# usage:
-#
-#   ri  name...
-#
-# where name can be 
-#
-#   Class | Class::method | Class#method | Class.method | method
-#
-# All names may be abbreviated to their minimum unbiguous form. If a name
-# _is_ ambiguous, all valid options will be listed.
-#
-# The form '.' method matches either class or instance methods, while 
-# #method matches only instance and ::method matches only class methods.
-#
-#
-# == Installing Documentation
-#
-# 'ri' uses a database of documentation built by the RDoc utility.
-# 
-# So, how do you install this documentation on your system?
-# It depends on how you installed Ruby.
-#
-# <em>If you installed Ruby from source files</em> (that is, if it some point
-# you typed 'make' during the process :), you can install the RDoc
-# documentation yourself. Just go back to the place where you have 
-# your Ruby source and type
-#
-#    make install-doc
-#
-# You'll probably need to do this as a superuser, as the documentation
-# is installed in the Ruby target tree (normally somewhere under 
-# <tt>/usr/local</tt>.
-#
-# <em>If you installed Ruby from a binary distribution</em> (perhaps
-# using a one-click installer, or using some other packaging system),
-# then the team that produced the package probably forgot to package
-# the documentation as well. Contact them, and see if they can add
-# it to the next release.
-#
-
-
-require 'rdoc/ri/ri_driver'
-
-######################################################################
-
-ri = RiDriver.new
-ri.process_args
===================================================================
edit: $/Dev10/feature/vs_langs01_s/Merlin/Main/Languages/Ruby/Scripts/bin/iri.bat;C815336
File: iri.bat
===================================================================
--- $/Dev10/feature/vs_langs01_s/Merlin/Main/Languages/Ruby/Scripts/bin/iri.bat;C815336  (server)    3/28/2010 11:51 PM
+++ Shelved Change: $/Dev10/feature/vs_langs01_s/Merlin/Main/Languages/Ruby/Scripts/bin/iri.bat;i-scripts
@@ -7,4 +7,4 @@
   set IR_CMD="%MERLIN_ROOT%\bin\Debug\ir.exe"
 )
 
-%IR_CMD% "%~dpn0" %*
+%IR_CMD% "%~dp0ri" %*
===================================================================
add: $/Dev10/feature/vs_langs01_s/Merlin/Main/Languages/Ruby/Scripts/bin/rdoc
File: rdoc
===================================================================
--- [no source file]
+++ Shelved Change: $/Dev10/feature/vs_langs01_s/Merlin/Main/Languages/Ruby/Scripts/bin/rdoc;i-scripts
@@ -1,0 +1,66 @@
+#!/usr/bin/env ir
+#  RDoc: Documentation tool for source code
+#        (see lib/rdoc/rdoc.rb for more information)
+#
+#  Copyright (c) 2003 Dave Thomas
+#  Released under the same terms as Ruby
+#
+#  $Revision: 11708 $
+
+## Transitional Hack ####
+#
+#  RDoc was initially distributed independently, and installed
+#  itself into <prefix>/lib/ruby/site_ruby/<ver>/rdoc...
+#
+#  Now that RDoc is part of the distribution, it's installed into
+#  <prefix>/lib/ruby/<ver>, which unfortunately appears later in the
+#  search path. This means that if you have previously installed RDoc,
+#  and then install from ruby-lang, you'll pick up the old one by
+#  default. This hack checks for the condition, and readjusts the
+#  search path if necessary.
+
+def adjust_for_existing_rdoc(path)
+  
+  $stderr.puts %{
+  It seems as if you have a previously-installed RDoc in
+  the directory #{path}.
+
+  Because this is now out-of-date, you might want to consider
+  removing the directories:
+
+    #{File.join(path, "rdoc")}
+
+  and
+
+    #{File.join(path, "markup")}
+
+  }
+
+  # Move all the site_ruby directories to the end
+  p $:
+  $:.replace($:.partition {|path| /site_ruby/ !~ path}.flatten)
+  p $:
+end
+
+$:.each do |path|
+  if /site_ruby/ =~ path 
+    rdoc_path = File.join(path, 'rdoc', 'rdoc.rb')
+    if File.exists?(rdoc_path)
+      adjust_for_existing_rdoc(path)
+      break
+    end
+  end
+end
+
+## End of Transitional Hack ##
+
+
+require 'rdoc/rdoc'
+
+begin
+  r = RDoc::RDoc.new
+  r.document(ARGV)
+rescue RDoc::RDocError => e
+  $stderr.puts e.message
+  exit(1)
+end
===================================================================
add: $/Dev10/feature/vs_langs01_s/Merlin/Main/Languages/Ruby/Scripts/bin/ri
File: ri
===================================================================
--- [no source file]
+++ Shelved Change: $/Dev10/feature/vs_langs01_s/Merlin/Main/Languages/Ruby/Scripts/bin/ri;i-scripts
@@ -1,0 +1,48 @@
+#!/usr/bin/env ir
+# usage:
+#
+#   ri  name...
+#
+# where name can be 
+#
+#   Class | Class::method | Class#method | Class.method | method
+#
+# All names may be abbreviated to their minimum unbiguous form. If a name
+# _is_ ambiguous, all valid options will be listed.
+#
+# The form '.' method matches either class or instance methods, while 
+# #method matches only instance and ::method matches only class methods.
+#
+#
+# == Installing Documentation
+#
+# 'ri' uses a database of documentation built by the RDoc utility.
+# 
+# So, how do you install this documentation on your system?
+# It depends on how you installed Ruby.
+#
+# <em>If you installed Ruby from source files</em> (that is, if it some point
+# you typed 'make' during the process :), you can install the RDoc
+# documentation yourself. Just go back to the place where you have 
+# your Ruby source and type
+#
+#    make install-doc
+#
+# You'll probably need to do this as a superuser, as the documentation
+# is installed in the Ruby target tree (normally somewhere under 
+# <tt>/usr/local</tt>.
+#
+# <em>If you installed Ruby from a binary distribution</em> (perhaps
+# using a one-click installer, or using some other packaging system),
+# then the team that produced the package probably forgot to package
+# the documentation as well. Contact them, and see if they can add
+# it to the next release.
+#
+
+
+require 'rdoc/ri/ri_driver'
+
+######################################################################
+
+ri = RiDriver.new
+ri.process_args
===================================================================
edit: $/Dev10/feature/vs_langs01_s/Merlin/Main/Languages/Ruby/Scripts/bin/tutorial.bat;C1068248
File: tutorial.bat
===================================================================
--- $/Dev10/feature/vs_langs01_s/Merlin/Main/Languages/Ruby/Scripts/bin/tutorial.bat;C1068248  (server)    3/28/2010 11:51 PM
+++ Shelved Change: $/Dev10/feature/vs_langs01_s/Merlin/Main/Languages/Ruby/Scripts/bin/tutorial.bat;i-scripts
@@ -2,8 +2,8 @@
 
 if defined MERLIN_ROOT (
   REM - This is a dev environment. See http://wiki.github.com/ironruby/ironruby
-  "%MERLIN_ROOT%\Languages\Ruby\Samples\Tutorial\tutorial.bat"
+  call "%MERLIN_ROOT%\Languages\Ruby\Samples\Tutorial\tutorial.bat"
 ) else (
-  ..\Samples\Tutorial\tutorial.bat"
+  call "%~dp0..\Samples\Tutorial\tutorial.bat"
 )
 
===================================================================