From 8d32b03448e8e1ba6319fc0ac484d0ab54b29b38 Mon Sep 17 00:00:00 2001
From: "Stephen D. Huston" <shuston@apache.org>
Date: Wed, 22 Apr 2009 20:40:47 +0000
Subject: Re-enable autoconf-based build in rubygen and migrate to use of
 specific MODULE_DIR and CONF_FILE macros

git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/cmake@767651 13f79535-47bb-0310-9956-ffa450edef68
---
 qpid/cpp/rubygen/generate | 72 ++++++++++++++++++++++++++++++++++-------------
 1 file changed, 53 insertions(+), 19 deletions(-)

(limited to 'qpid/cpp/rubygen')

diff --git a/qpid/cpp/rubygen/generate b/qpid/cpp/rubygen/generate
index 775bd3fd58..0ce1fec46a 100755
--- a/qpid/cpp/rubygen/generate
+++ b/qpid/cpp/rubygen/generate
@@ -26,7 +26,8 @@ require 'amqpgen'
 if ARGV.size < 3
   puts <<EOS
 Usage: #{ARGV[0]} OUTDIR  SPEC.xml [ ... ] TEMPLATE.rb [ ... ]
-or:    #{ARGV[0]} OUTDIR  SPEC.xml [ ... ] all [ makefragment.cmake ]
+or:    #{ARGV[0]} OUTDIR  SPEC.xml [ ... ] all [ makefragment.mk |
+                                                 makefragment.cmake ]
 
 Parse all SPEC.xml files to create an AMQP model, run each TEMPLATE
 putting the resulting files under OUTDIR. Prints a list of files
@@ -77,15 +78,18 @@ templates.each { |t|
 }
 
 def cmake_continue(lines) lines.join(" \n    "); end
+def make_continue(lines) lines.join(" \\\n    "); end
 
 # Generate makefile
-makefile=ARGV.grep(/.cmake$/)[0]
-if makefile
+makefile=ARGV.grep(/.mk$/)[0]
+cmakefile=ARGV.grep(/.cmake$/)[0]
+if cmakefile || makefile
   dir=Dir.getwd
   Dir.chdir File.dirname(__FILE__)
   generator_files=Dir["**/*.rb"] << File.basename(__FILE__)
   Dir.chdir dir
-  rgen_generator=generator_files.map{ |f| "${rgen_dir}/#{f}" }
+  rgen_generator=generator_files.map{ |f| "$(rgen_dir)/#{f}" }
+  cmake_rgen_generator=generator_files.map{ |f| "${rgen_dir}/#{f}" }
   rgen_srcs=GenFiles.get.map{ |f| "#{$outdir}/#{f}" }
   rgen_subdirs={}
   rgen_srcs.each { |src|
@@ -95,31 +99,61 @@ if makefile
       rgen_subdirs[subdir] << src
     end
   }
-  File.open(makefile, 'w') { |out|
-    out << <<EOS
+  if (makefile)
+    File.open(makefile, 'w') { |out|
+      out << <<EOS
 # Generated makefile fragment.
 # Including makefile defines $(rgen_dir) $(rgen_cmd) and $(specs).
 
-set(rgen_generator #{cmake_continue rgen_generator})
+rgen_generator=#{make_continue rgen_generator}
 EOS
-    rgen_subdirs.each_key { |subdir|
-      out << "\nset(rgen_#{subdir}_srcs #{cmake_continue(rgen_subdirs[subdir])})\n"
-    }
-    out << <<EOS
-set(rgen_srcs #{cmake_continue rgen_srcs})
+      rgen_subdirs.each_key { |subdir|
+        out << "\nrgen_#{subdir}_srcs = #{make_continue(rgen_subdirs[subdir])}\n"
+      }
+      out << <<EOS
+rgen_srcs=#{make_continue rgen_srcs}
 
 # Header file install rules.
 EOS
-    ["amqp_0_10", "framing", "client/no_keyword","client", "broker"].each { |ns|
-      dir="qpid/#{ns}"
-      dir_ = dir.tr("/", "_")
-      regex=%r|#{dir}/[^/]+\.h$|
+      ["amqp_0_10", "framing", "client/no_keyword","client", "broker"].each { |ns|
+        dir="qpid/#{ns}"
+        dir_ = dir.tr("/", "_")
+        regex=%r|#{dir}/[^/]+\.h$|
+        out << <<EOS
+#{dir_}dir = $(includedir)/#{dir}
+dist_#{dir_}_HEADERS = #{make_continue rgen_srcs.grep(regex)}
+
+EOS
+      } # each
+    }   # File makefile
+  end   # if (makefile)
+
+  if (cmakefile)
+    File.open(cmakefile, 'w') { |out|
+      out << <<EOS
+# Generated makefile fragment.
+# Including makefile defines ${rgen_dir} ${rgen_cmd} and ${specs}.
+
+set(rgen_generator #{cmake_continue cmake_rgen_generator})
+EOS
+      rgen_subdirs.each_key { |subdir|
+        out << "\nset(rgen_#{subdir}_srcs #{cmake_continue(rgen_subdirs[subdir])})\n"
+      }
       out << <<EOS
+set(rgen_srcs #{cmake_continue rgen_srcs})
+
+# Header file install rules.
+EOS
+      ["amqp_0_10", "framing", "client/no_keyword","client", "broker"].each { |ns|
+        dir="qpid/#{ns}"
+        dir_ = dir.tr("/", "_")
+        regex=%r|#{dir}/[^/]+\.h$|
+        out << <<EOS
 set(#{dir_}dir  \${includedir}/#{dir})
 set(dist_#{dir_}_HEADERS #{cmake_continue rgen_srcs.grep(regex)})
 
 EOS
-    }
-  }
+      } # each
+    }   # File makefile
+  end   # if (makefile)
 end
-
-- 
cgit v1.2.1