qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From acon...@apache.org
Subject svn commit: r577916 - in /incubator/qpid/trunk/qpid/cpp: bootstrap qpidc.spec.in rubygen/generate src/Makefile.am
Date Thu, 20 Sep 2007 21:07:26 GMT
Author: aconway
Date: Thu Sep 20 14:07:25 2007
New Revision: 577916

URL: http://svn.apache.org/viewvc?rev=577916&view=rev
Log:

	* cpp/bootstrap, cpp/rubygen/generate, cpp/src/Makefile.am:
	Fixed generated headers to install properly.

	* cpp/qpidc.spec.in: removed apr dependency.

Modified:
    incubator/qpid/trunk/qpid/cpp/bootstrap
    incubator/qpid/trunk/qpid/cpp/qpidc.spec.in
    incubator/qpid/trunk/qpid/cpp/rubygen/generate
    incubator/qpid/trunk/qpid/cpp/src/Makefile.am

Modified: incubator/qpid/trunk/qpid/cpp/bootstrap
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/bootstrap?rev=577916&r1=577915&r2=577916&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/bootstrap (original)
+++ incubator/qpid/trunk/qpid/cpp/bootstrap Thu Sep 20 14:07:25 2007
@@ -4,11 +4,6 @@
 autoheader
 libtoolize --automake
 
-# These are needed only if you don't already have the gen/*.{h,cpp} files.
-: ${JAVA=java}
-: ${JAVAC=javac}
-export JAVA JAVAC
-
 # Generate (for automake) lots of repetitive parts of tests/Makefile.am.
 (cd src/tests && rm -f gen.mk
   perl -ne '/^(include |if |else|endif)/ or print' Makefile.am \
@@ -20,8 +15,6 @@
 \$(srcdir)/rubygen.mk: force
 	\$(rgen_cmd)
 EOF
-
-touch src/generate.mk 
 
 automake
 autoconf

Modified: incubator/qpid/trunk/qpid/cpp/qpidc.spec.in
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/qpidc.spec.in?rev=577916&r1=577915&r2=577916&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/qpidc.spec.in (original)
+++ incubator/qpid/trunk/qpid/cpp/qpidc.spec.in Thu Sep 20 14:07:25 2007
@@ -5,7 +5,7 @@
 
 Name:           @PACKAGE@
 Version:        @VERSION@
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Libraries for Qpid C++ client applications
 Group:          System Environment/Libraries
 License:        Apache Software License
@@ -13,7 +13,6 @@
 Source0:        @DOWNLOAD_URL@/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires: apr-devel
 BuildRequires: boost-devel
 BuildRequires: cppunit-devel
 BuildRequires: doxygen
@@ -23,7 +22,6 @@
 BuildRequires: libtool
 BuildRequires: pkgconfig
 
-Requires: apr
 Requires: boost
 
 Requires(post):/sbin/chkconfig
@@ -40,7 +38,6 @@
 Summary: Header files and documentation for developing Qpid C++ clients
 Group: Development/System
 Requires: %name = %version-%release
-Requires: apr-devel
 Requires: boost-devel
 Requires: e2fsprogs-devel
 
@@ -151,6 +148,8 @@
 
 %changelog
 
+* Thu Sep 20 2007 Alan Conway <aconway@redhat.com> - 0.2-7
+- Removed apr dependency.
 
 * Wed Aug 1 2007 Alan Conway <aconway@redhat.com> - 0.2-6
 - added --disable-cluster flag
@@ -188,3 +187,4 @@
 * Fri Dec  8 2006 David Lutterkort <dlutter@redhat.com> - 0.1-1
 - Initial version based on Jim Meyering's sketch and discussions with Alan
   Conway
+

Modified: incubator/qpid/trunk/qpid/cpp/rubygen/generate
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/rubygen/generate?rev=577916&r1=577915&r2=577916&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/rubygen/generate (original)
+++ incubator/qpid/trunk/qpid/cpp/rubygen/generate Thu Sep 20 14:07:25 2007
@@ -30,6 +30,8 @@
 end
 templates.each { |t| load t }
 
+def make_continue(lines) lines.join(" \\\n    "); end
+
 # Generate makefile
 makefile=ARGV.grep(/.mk$/)[0]
 if makefile
@@ -39,25 +41,33 @@
   Dir.chdir dir
   rgen_generator=generator_files.map{ |f| "$(rgen_dir)/#{f}" }
   rgen_srcs=GenFiles.get.map{ |f| "#{Outdir}/#{f}" }
-  rgen_client_cpp = rgen_srcs.select { |f| f =~ /qpid\/client\/.+\.cpp$/ }
-  rgen_common_cpp = rgen_srcs.select { |f| f =~ /qpid\/framing\/.+\.cpp$/ }
-  rgen_h = rgen_srcs.select { |f| f =~ /.+\.h$/ }
 
   File.open(makefile, 'w') { |out|
     out << <<EOS
 # Generated makefile fragment.
 # Including makefile defines $(rgen_dir) $(rgen_cmd) and $(specs).
 
-rgen_generator=#{rgen_generator.join(" \\\n	")}
+rgen_generator=#{make_continue rgen_generator}
 
-rgen_client_cpp=#{rgen_client_cpp.join(" \\\n	")}
+rgen_client_cpp=#{make_continue(rgen_srcs.grep %r|/qpid/client/.+\.cpp$|)}
 
-rgen_common_cpp=#{rgen_common_cpp.join(" \\\n	")}
+rgen_common_cpp=#{make_continue(rgen_srcs.grep %r|qpid/framing/.+\.cpp$|)}
 
-rgen_h=#{rgen_h.join(" \\\n	")}
+rgen_srcs=#{make_continue rgen_srcs}
 
-rgen_srcs=rgen_h rgen_client_cpp rgen_common_cpp
+# Header file install rules.
+EOS
+    ["framing", "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
+    }
+    out << <<EOS
 if GENERATE
 $(rgen_srcs) $(srcdir)/#{File.basename makefile}: $(rgen_generator) $(specs)
 	$(rgen_cmd)

Modified: incubator/qpid/trunk/qpid/cpp/src/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/Makefile.am?rev=577916&r1=577915&r2=577916&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/Makefile.am (original)
+++ incubator/qpid/trunk/qpid/cpp/src/Makefile.am Thu Sep 20 14:07:25 2007
@@ -14,13 +14,7 @@
 # AMQP_XML is defined in ../configure.ac
 specs=@AMQP_XML@ $(top_srcdir)/xml/cluster.xml
 
-EXTRA_DIST += $(rgen_h) 
-
-
 if GENERATE
-
-maintainer-clean-local:
-	rm -rf gen
 
 # Ruby generator.
 rgen_dir=$(top_srcdir)/rubygen



Mime
View raw message