20 Oct
2006
20 Oct
'06
7:08 p.m.
2006-10-20 Roland Levillain <roland(a)lrde.epita.fr>
Fix Rblena installation.
* ruby/Makefile.am (EXTRA_DIST): Move ltrequire.rb...
(dist_ruby_SCRIPT): ...here.
(ruby_SCRIPT): Add swilena_display.rb.
* ruby/ltrequire.rb: Update to latest version from clspr.
--- 10.261/tools/swilena/ruby/Makefile.am Tue, 11 Jul 2006 15:29:25 +0200 levill_r
(oln/v/17_Makefile.a 1.8 600)
+++ 10.262/tools/swilena/ruby/Makefile.am Fri, 20 Oct 2006 19:00:57 +0200 levill_r
(oln/v/17_Makefile.a 1.9 600)
@@ -8,7 +8,11 @@
rubydir = $(libdir)/ruby
# ltrequire.rb: Extension of the `require' understanding Libtool libraries.
-EXTRA_DIST = ltrequire.rb
+dist_ruby_SCRIPT = ltrequire.rb
+
+# A utility script to display images (not installed).
+# FIXME: Is it still useful?
+dist_noinst_ruby_SCRIPT = swilena_display.rb
$(srcdir)/makefile.swig: $(top_srcdir)/tools/swilena/expand.sh
top_srcdir="$(top_srcdir)" $< $(top_srcdir)/tools/swilena/
--- 10.261/tools/swilena/ruby/ltrequire.rb Thu, 13 Jul 2006 16:20:10 +0200 levill_r
(oln/w/42_ltrequire. 1.2 644)
+++ 10.262/tools/swilena/ruby/ltrequire.rb Fri, 20 Oct 2006 19:00:57 +0200 levill_r
(oln/w/42_ltrequire. 1.3 644)
@@ -35,12 +35,17 @@
if dlname.empty?
raise "No dlname found in " + libtool_library
end
- if installed
- filename = File.join(File.dirname(libtool_library), dlname)
+
+ if $LTREQUIRE_NO_PATH_PREFIX then
+ # Simply return the name of the dynamic module.
+ dlname
else
- filename = File.join(File.dirname(libtool_library), '.libs', dlname)
+ if installed
+ File.join(File.dirname(libtool_library), dlname)
+ else
+ File.join(File.dirname(libtool_library), '.libs', dlname)
+ end
end
- filename
end
# Add a hook to Kernel.require to handle Libtool libraries.
--- 10.261/oln.prj
+++ 10.262/oln.prj
@@ -1,17 +1,20 @@
;; -*- Prcs -*-
(Created-By-Prcs-Version 1 3 3)
(Project-Description "Olena")
-(Project-Version oln 10 261)
-(Parent-Version oln 10 260)
+(Project-Version oln 10 262)
+(Parent-Version oln 10 261)
(Version-Log "2006-10-20 Roland Levillain <roland(a)lrde.epita.fr>
- Fix Pylena installation.
+ Fix Rblena installation.
+
+ * ruby/Makefile.am (EXTRA_DIST): Move ltrequire.rb...
+ (dist_ruby_SCRIPT): ...here.
+ (ruby_SCRIPT): Add swilena_display.rb.
+ * ruby/ltrequire.rb: Update to latest version from clspr.
- * python/Makefile.am (python_PYTHON): Add ltihooks.py.
- (EXTRA_DIST): Remove.
")
(New-Version-Log "")
-(Checkin-Time "Fri, 20 Oct 2006 16:26:01 +0200")
+(Checkin-Time "Fri, 20 Oct 2006 19:00:57 +0200")
(Checkin-Login levill_r)
;; diff-ignore tests/data/.*pbm$
;; diff-ignore .*\.pbm$
@@ -1051,7 +1054,7 @@
(tools/swilena/python/tests/Makefile.am (oln/v/15_Makefile.a 1.9 644))
(tools/swilena/python/tests/simple1.py (oln/v/16_simple1.py 1.6 744))
- (tools/swilena/ruby/Makefile.am (oln/v/17_Makefile.a 1.8 600))
+ (tools/swilena/ruby/Makefile.am (oln/v/17_Makefile.a 1.9 600))
(tools/swilena/ruby/tests/Makefile.am (oln/v/18_Makefile.a 1.8 644))
(tools/swilena/ruby/tests/simple1.rb (oln/v/19_simple1.rb 1.6 755))
@@ -1513,7 +1516,7 @@
;; Files added by populate at Tue, 11 Jul 2006 15:28:44 +0200,
;; to version 10.240(w), by levill_r:
- (tools/swilena/ruby/ltrequire.rb (oln/w/42_ltrequire. 1.2 644))
+ (tools/swilena/ruby/ltrequire.rb (oln/w/42_ltrequire. 1.3 644))
(tools/swilena/python/ltihooks.py (oln/w/43_ltihooks.p 1.1 644))
;; Files added by populate at Tue, 11 Jul 2006 17:53:57 +0200,