Libguestfs - Nov 2011 - [PATCH] out of tree build: ruby

---
 ruby/Rakefile.in |   18 +++++++++---------
 1 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/ruby/Rakefile.in b/ruby/Rakefile.in
index da9f3f1..99a195d 100644
--- a/ruby/Rakefile.in
+++ b/ruby/Rakefile.in
@@ -27,7 +27,7 @@ PKG_VERSION='@PACKAGE_VERSION@'
 EXT_CONF='@srcdir@/ext/hivex/extconf.rb'
 MAKEFILE='@builddir@/ext/hivex/Makefile'
 HIVEX_MODULE='@builddir@/ext/hivex/_hivex.so'
-HIVEX_SRC='@srcdir@/ext/hivex/_hivex.c'
+HIVEX_SRC='@abs_srcdir@/ext/hivex/_hivex.c'
 
 CLEAN.include [ "@builddir@/ext/**/*.o", HIVEX_MODULE,
                 "@builddir@/ext/**/depend" ]
@@ -38,13 +38,13 @@ CLOBBER.include [ "@builddir@/config.save",
"@builddir@/ext/**/mkmf.log",
 # Build locally
 
 file MAKEFILE => EXT_CONF do |t|
-     unless sh "top_srcdir=$(pwd)/@top_srcdir@;
top_builddir=$(pwd)/@top_builddir@; export ARCHFLAGS=\"-arch $(uname
-m)\"; cd #{File::dirname(EXT_CONF)}; ruby #{File::basename(EXT_CONF)}
--with-_hivex-include=$top_srcdir/lib
--with-_hivex-lib=$top_builddir/lib/.libs"
+     unless sh "top_srcdir=$(pwd)/@top_srcdir@;
top_builddir=$(pwd)/@top_builddir@; export ARCHFLAGS=\"-arch $(uname
-m)\"; mkdir -p @builddir@/ext/guestfs; cd @builddir@/hivex; ruby
#(EXT_CONF} --with-_hivex-include=$top_srcdir/lib
--with-_hivex-lib=$top_builddir/lib/.libs"
          $stderr.puts "Failed to run extconf"
          break
      end
 end
 file HIVEX_MODULE => [ MAKEFILE, HIVEX_SRC ] do |t|
-    Dir::chdir(File::dirname(EXT_CONF)) do
+    Dir::chdir("@builddir@/ext/hivex") do
          unless sh "make"
              $stderr.puts "make failed"
              break
@@ -61,19 +61,19 @@ end
 task :test => :build
 
 RDOC_FILES = FileList[
-    "README.rdoc",
-    "lib/**/*.rb",
-    "ext/**/*.[ch]"
+    "@srcdir@/README.rdoc",
+    "@srcdir@/lib/**/*.rb",
+    "@srcdir@/ext/**/*.[ch]"
 ]
 
 Rake::RDocTask.new do |rd|
-    rd.main = "README.rdoc"
+    rd.main = "@srcdir@/README.rdoc"
     rd.rdoc_dir = "doc/site/api"
     rd.rdoc_files.include(RDOC_FILES)
 end
 
 Rake::RDocTask.new(:ri) do |rd|
-    rd.main = "README.rdoc"
+    rd.main = "@srcdir@/README.rdoc"
     rd.rdoc_dir = "doc/ri"
     rd.options << "--ri-system"
     rd.rdoc_files.include(RDOC_FILES)
@@ -82,7 +82,7 @@ end
 # Package tasks
 
 PKG_FILES = FileList[
-  "Rakefile", "COPYING", "README",
"NEWS", "README.rdoc",
+  "Rakefile", "COPYING", "README",
"NEWS", "@srcdir@/README.rdoc",
   "lib/**/*.rb",
   "ext/**/*.[ch]", "ext/**/MANIFEST",
"ext/**/extconf.rb",
   "tests/**/*",
-- 
1.7.7.3

On Mon, Nov 21, 2011 at 11:27:59PM +0100, Hilko Bengen
wrote:
> ---
>  ruby/Rakefile.in |   18 +++++++++---------
>  1 files changed, 9 insertions(+), 9 deletions(-)
Thanks, ACKed and pushed.

Rich.

-- 
Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones
virt-top is 'top' for virtual machines.  Tiny program with many
powerful monitoring features, net stats, disk stats, logging, etc.
http://et.redhat.com/~rjones/virt-top

Sorry, but I had to revert this one as it broke normal in-tree builds
(I only spotted this after doing a 'make distclean').

    make[2]: Entering directory `/home/rjones/d/hivex/ruby'
    rake build
    rake/rdoctask is deprecated.  Use rdoc/task instead (in RDoc 2.4.2+)
    rake/gempackagetask is deprecated.  Use rubygems/package_task instead
    top_srcdir=$(pwd)/..; top_builddir=$(pwd)/..; export ARCHFLAGS="-arch
$(unam
    sh: line 0: cd: ./hivex: No such file or directory

Rich.

-- 
Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones
virt-p2v converts physical machines to virtual machines.  Boot with a
live CD or over the network (PXE) and turn machines into Xen guests.
http://et.redhat.com/~rjones/virt-p2v