[DRE-commits] [SCM] yard.git branch, master, updated. upstream/0.7.4-44-g2e948b4

[Cédric Boutillier]

The following commit has been merged in the master branch:
commit 78838fb15dbefc78d953d291828b8502d12cec85
Author: Cédric Boutillier <cedric.boutillier at gmail.com>
Date:   Sun May 6 14:36:03 2012 +0200

    Refresh require-in-executables.patch

diff --git a/debian/patches/require-in-executables.patch b/debian/patches/require-in-executables.patch
index 14bbc71..99726da 100644
--- a/debian/patches/require-in-executables.patch
+++ b/debian/patches/require-in-executables.patch
@@ -1,52 +1,65 @@
-## Description: add some description
-## Origin/Author: add some origin or author
-## Bug: bug URL
+Description: Do not modify $LOAD_PATH in YARD binaries
+ We know exactly where to find the library
+Author: Cédric Boutiller <cedric.boutillier at gmail.com>
+Last-Update: 2012-05-04
+
+--- a/bin/yardoc
++++ b/bin/yardoc
+@@ -1,11 +1,11 @@
+ #!/usr/bin/env ruby
+ 
+-# We do all this work just to find the proper load path
+-path = __FILE__
+-while File.symlink?(path)
+-  path = File.expand_path(File.readlink(__FILE__), File.dirname(__FILE__))
+-end
+-$:.unshift(File.join(File.dirname(File.expand_path(path)), '..', 'lib'))
++## We do all this work just to find the proper load path
++#path = __FILE__
++#while File.symlink?(path)
++#  path = File.expand_path(File.readlink(__FILE__), File.dirname(__FILE__))
++#end
++#$:.unshift(File.join(File.dirname(File.expand_path(path)), '..', 'lib'))
+ 
+ require 'yard'
+ 
 --- a/bin/yard
 +++ b/bin/yard
-@@ -1,4 +1,5 @@
- #!/usr/bin/env ruby
--require File.dirname(__FILE__) + '/../lib/yard'
-+$: << File.dirname(__FILE__) + '/../lib'
-+require 'yard'
- 
- YARD::CLI::CommandParser.run(*ARGV)
---- a/bin/yard-graph
-+++ b/bin/yard-graph
-@@ -1,4 +1,5 @@
+@@ -1,11 +1,11 @@
  #!/usr/bin/env ruby
--require File.dirname(__FILE__) + '/../lib/yard'
-+$: << File.dirname(__FILE__) + '/../lib'
-+require 'yard'
- 
- YARD::CLI::Graph.run(*ARGV)
---- a/bin/yard-server
-+++ b/bin/yard-server
-@@ -1,4 +1,5 @@
- #!/usr/bin/env ruby
--require File.dirname(__FILE__) + '/../lib/yard'
-+$: << File.dirname(__FILE__) + '/../lib'
-+require 'yard'
  
--YARD::CLI::Server.run(*ARGV)
-\ No newline at end of file
-+YARD::CLI::Server.run(*ARGV)
---- a/bin/yardoc
-+++ b/bin/yardoc
-@@ -1,4 +1,5 @@
- #!/usr/bin/env ruby
--require File.dirname(__FILE__) + '/../lib/yard'
-+$: << File.dirname(__FILE__) + '/../lib'
-+require 'yard'
+-# We do all this work just to find the proper load path
+-path = __FILE__
+-while File.symlink?(path)
+-  path = File.expand_path(File.readlink(__FILE__), File.dirname(__FILE__))
+-end
+-$:.unshift(File.join(File.dirname(File.expand_path(path)), '..', 'lib'))
++## We do all this work just to find the proper load path
++#path = __FILE__
++#while File.symlink?(path)
++#  path = File.expand_path(File.readlink(__FILE__), File.dirname(__FILE__))
++#end
++#$:.unshift(File.join(File.dirname(File.expand_path(path)), '..', 'lib'))
+ 
+ require 'yard'
  
- YARD::CLI::Yardoc.run(*ARGV)
 --- a/bin/yri
 +++ b/bin/yri
-@@ -1,4 +1,5 @@
+@@ -1,11 +1,11 @@
  #!/usr/bin/env ruby
--require File.dirname(__FILE__) + '/../lib/yard'
-+$: << File.dirname(__FILE__) + '/../lib'
-+require 'yard'
  
--YARD::CLI::YRI.run(*ARGV)
-\ No newline at end of file
-+YARD::CLI::YRI.run(*ARGV)
+-# We do all this work just to find the proper load path
+-path = __FILE__
+-while File.symlink?(path)
+-  path = File.expand_path(File.readlink(__FILE__), File.dirname(__FILE__))
+-end
+-$:.unshift(File.join(File.dirname(File.expand_path(path)), '..', 'lib'))
++## We do all this work just to find the proper load path
++#path = __FILE__
++#while File.symlink?(path)
++#  path = File.expand_path(File.readlink(__FILE__), File.dirname(__FILE__))
++#end
++#$:.unshift(File.join(File.dirname(File.expand_path(path)), '..', 'lib'))
+ 
+ require 'yard'
+ 

-- 
yard.git