You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ac...@apache.org on 2007/01/25 17:45:49 UTC
svn commit: r499845 - in /incubator/qpid/trunk/qpid/cpp: ./ gen/Makefile.am
gen/make-gen-src-mk.sh qpidc.spec.in rpm/Makefile.am tests/Makefile.am
Author: aconway
Date: Thu Jan 25 08:45:48 2007
New Revision: 499845
URL: http://svn.apache.org/viewvc?view=rev&rev=499845
Log:
* qpidc.spec.in: updated to release 3 for RPM.
* gen/make-gen-src-mk.sh: fixed problem with makefile generation in a new checkout.
* Other Makefile.am: added missing files to maintainer-clean.
* Added missing svn-ignores.
Added:
incubator/qpid/trunk/qpid/cpp/gen/make-gen-src-mk.sh (with props)
Modified:
incubator/qpid/trunk/qpid/cpp/ (props changed)
incubator/qpid/trunk/qpid/cpp/gen/Makefile.am
incubator/qpid/trunk/qpid/cpp/qpidc.spec.in
incubator/qpid/trunk/qpid/cpp/rpm/Makefile.am
incubator/qpid/trunk/qpid/cpp/tests/Makefile.am
Propchange: incubator/qpid/trunk/qpid/cpp/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Jan 25 08:45:48 2007
@@ -9,9 +9,5 @@
stamp-h1
libtool
config.in
-qpid-cpp-0.1.tar.bz2
-qpid-cpp-0.1.tar.gz
config.cache
-qpidc-0.1.tar.bz2
-qpidc-0.1.tar.gz
qpidc.spec
Modified: incubator/qpid/trunk/qpid/cpp/gen/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/gen/Makefile.am?view=diff&rev=499845&r1=499844&r2=499845
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/gen/Makefile.am (original)
+++ incubator/qpid/trunk/qpid/cpp/gen/Makefile.am Thu Jan 25 08:45:48 2007
@@ -6,7 +6,7 @@
# Distribute the generated sources, at least for now, since
# the generator code is in java.
EXTRA_DIST = $(BUILT_SOURCES)
-MAINTAINERCLEANFILES = $(BUILT_SOURCES)
+DISTCLEANFILES = $(BUILT_SOURCES) timestamp gen-src.mk
# Don't attempt to run the code generator unless configure has set
# CAN_GENERATE_CODE, indicating that the amqp.xml and tools needed
@@ -26,26 +26,7 @@
-c -o . -t $(gentools_dir)/templ.cpp $(spec)
touch timestamp
-DISTCLEANFILES = gen-src.mk
gen-src.mk: timestamp
- ( echo 'generated_sources = '\\ \
- && ls *.cpp | sort -u | sed 's/.*/ & \\/;$$s/ \\//'; \
- echo 'generated_headers = '\\ \
- && ls *.h | sort -u | sed 's/.*/ & \\/;$$s/ \\//'; \
- ) > $@-t
- ( echo if CAN_GENERATE_CODE; \
- echo 'java_sources = '\\ \
- && find $(gentools_srcdir) -name '*.java' \
- | sort -u | sed 's/.*/ & \\/;$$s/ \\//'; \
- echo 'cxx_templates = '\\ \
- && find $(gentools_dir)/templ.cpp -name '*.tmpl' \
- | sort -u | sed 's/.*/ & \\/;$$s/ \\//'; \
- echo '# Empty rules, in case any of these files is removed,'; \
- echo '# renamed, or no longer generated.'; \
- echo '$$(spec):'; \
- echo '$$(java_sources):'; \
- echo '$$(cxx_templates):'; \
- echo endif \
- ) >> $@-t
+ ./make-gen-src-mk.sh $(gentools_dir) $(gentools_srcdir) >> $@-t
mv $@-t $@
endif
Added: incubator/qpid/trunk/qpid/cpp/gen/make-gen-src-mk.sh
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/gen/make-gen-src-mk.sh?view=auto&rev=499845
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/gen/make-gen-src-mk.sh (added)
+++ incubator/qpid/trunk/qpid/cpp/gen/make-gen-src-mk.sh Thu Jan 25 08:45:48 2007
@@ -0,0 +1,30 @@
+#!/bin/sh
+# Generate the gen-src.mk makefile fragment, to stdout.
+# Usage: <gentools_dir> <gentools_srcdir>
+
+gentools_dir=$1
+gentools_srcdir=$2
+
+wildcard() { echo `ls $* 2>/dev/null` ; }
+
+cat <<EOF
+generated_sources = `wildcard *.cpp`
+
+generated_headers = `wildcard *.h`
+
+if CAN_GENERATE_CODE
+
+java_sources = `wildcard $gentools_srcdir/*.java`
+
+cxx_templates = `wildcard $gentools_dir/templ.cpp/*.tmpl`
+
+# Empty rules in case one of these files is removed,
+# renamed or no longer generated.
+\$(spec):
+\$(java_sources):
+\$(cxx_templates):
+endif
+
+EOF
+
+
Propchange: incubator/qpid/trunk/qpid/cpp/gen/make-gen-src-mk.sh
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/qpid/trunk/qpid/cpp/gen/make-gen-src-mk.sh
------------------------------------------------------------------------------
svn:executable = *
Modified: incubator/qpid/trunk/qpid/cpp/qpidc.spec.in
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/qpidc.spec.in?view=diff&rev=499845&r1=499844&r2=499845
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/qpidc.spec.in (original)
+++ incubator/qpid/trunk/qpid/cpp/qpidc.spec.in Thu Jan 25 08:45:48 2007
@@ -5,7 +5,7 @@
Name: @PACKAGE@
Version: @VERSION@
-Release: 1%{?dist}
+Release: 3%{?dist}
Summary: Libraries for Qpid C++ client applications
Group: System Environment/Libraries
License: Apache Software License
@@ -137,3 +137,6 @@
* Fri Dec 8 2006 David Lutterkort <dl...@redhat.com> - 0.1-1
- Initial version based on Jim Meyering's sketch and discussions with Alan
Conway
+
+* Thu Jan 25 Alan Conway <ac...@redhat.com> - 0.1-3
+- Applied Jim Meyereings fixes from http://mail-archives.apache.org/mod_mbox/incubator-qpid-dev/200701.mbox/%3c87hcugzmyp.fsf@rho.meyering.net%3e
Modified: incubator/qpid/trunk/qpid/cpp/rpm/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/rpm/Makefile.am?view=diff&rev=499845&r1=499844&r2=499845
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/rpm/Makefile.am (original)
+++ incubator/qpid/trunk/qpid/cpp/rpm/Makefile.am Thu Jan 25 08:45:48 2007
@@ -14,9 +14,10 @@
# Build source and binary RPMs.
rpm: dist
- rpmbuild $(RPMOPTS) -ba $(SPEC)
+ rpmbuild $(RPMOPTS) $(RPMEXTRAOPTS) -ba $(SPEC)
+ rpmlint RPMS/*.rpm
-# Source RPM only.
+# Build source RPM only.
srpm: dist
rpmbuild $(RPMOPTS) -bs $(SPEC)
Modified: incubator/qpid/trunk/qpid/cpp/tests/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/tests/Makefile.am?view=diff&rev=499845&r1=499844&r2=499845
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/tests/Makefile.am (original)
+++ incubator/qpid/trunk/qpid/cpp/tests/Makefile.am Thu Jan 25 08:45:48 2007
@@ -75,6 +75,9 @@
TESTS = run-unit-tests run-python-tests
EXTRA_DIST += $(TESTS)
+CLEANFILES=qpidd.log
+DISTCLEANFILES=gen.mk
+
include gen.mk
abs_builddir = @abs_builddir@