From 0d71edf42b534c78129dd6a70f14fc7cb6dcd68d Mon Sep 17 00:00:00 2001 From: Alan Conway Date: Fri, 1 Dec 2006 05:13:31 +0000 Subject: Script to bootstrap autconf/automake in a fresh checkout. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@481160 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/bootstrap | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100755 qpid/cpp/bootstrap (limited to 'qpid/cpp/bootstrap') diff --git a/qpid/cpp/bootstrap b/qpid/cpp/bootstrap new file mode 100755 index 0000000000..253eff6a16 --- /dev/null +++ b/qpid/cpp/bootstrap @@ -0,0 +1,8 @@ +#!/bin/sh +aclocal -I m4 +autoheader +libtoolize --automake +automake +autoconf +./configure --enable-warnings --prefix=/tmp/qpid-inst CXXFLAGS=-g + -- cgit v1.2.1 From f59b053fa60ef8fbb5eb0a252716252c8cc2a349 Mon Sep 17 00:00:00 2001 From: Gordon Sim Date: Fri, 1 Dec 2006 15:15:18 +0000 Subject: Path from Jim Meyering (sent to qpid-dev list) to fix issue with gen.mk plus apr dependencies etc. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@481262 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/bootstrap | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'qpid/cpp/bootstrap') diff --git a/qpid/cpp/bootstrap b/qpid/cpp/bootstrap index 253eff6a16..fe76a84989 100755 --- a/qpid/cpp/bootstrap +++ b/qpid/cpp/bootstrap @@ -1,8 +1,13 @@ #!/bin/sh +set -e aclocal -I m4 autoheader libtoolize --automake + +# Generate (for automake) lots of repetitive parts of tests/Makefile.am. +(cd tests && rm -f gen.mk + perl -ne '/^include / or print' Makefile.am \ + | make -f - abs_srcdir=`dirname $(pwd)` gen.mk ) + automake autoconf -./configure --enable-warnings --prefix=/tmp/qpid-inst CXXFLAGS=-g - -- cgit v1.2.1 From 2d7b42bfdd5e43d3c37e3d20ec5a7872cd50bcab Mon Sep 17 00:00:00 2001 From: Alan Conway Date: Mon, 4 Dec 2006 17:03:39 +0000 Subject: 2006-12-01 Jim Meyering * configure.ac: Use an automake conditional to indicate when we have access to files outside of the current hierarchy, and when we have the tools (java and javac) to build some generated files. * gen/Makefile.am: Don't use $(abs_srcdir); not needed. (timestamp): Depend on java sources and C++ template files, if we're building in a qpid tree. Use $(JAVA) and $(JAVAC), rather than hard-coding those names. (gen-src.mk) [$(java_sources), $(cxx_templates)]: New rules to generate these lists of file names. * bootstrap: Also generate gen/gen-src.mk. But do that only if we're in a qpid hierarchy. Redirect make's stdout to /dev/null. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@482255 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/bootstrap | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'qpid/cpp/bootstrap') diff --git a/qpid/cpp/bootstrap b/qpid/cpp/bootstrap index fe76a84989..34b16cb16b 100755 --- a/qpid/cpp/bootstrap +++ b/qpid/cpp/bootstrap @@ -4,10 +4,19 @@ aclocal -I m4 autoheader libtoolize --automake +# If we're building in the qpid tree, we can generate +# some Makefile snippets: + +if test -d ../gentools && test -d ../specs; then + (cd gen && rm -f gen-src.mk + perl -ne '/^(abs_srcdir|if|else|endif|include)\b/ or print' Makefile.am \ + | make -f - abs_srcdir=`pwd` srcdir=. gen-src.mk > /dev/null ) +fi + # Generate (for automake) lots of repetitive parts of tests/Makefile.am. (cd tests && rm -f gen.mk perl -ne '/^include / or print' Makefile.am \ - | make -f - abs_srcdir=`dirname $(pwd)` gen.mk ) + | make -f - abs_srcdir=`dirname $(pwd)` gen.mk > /dev/null ) automake autoconf -- cgit v1.2.1 From 25e43ff200982d174632fda44a7f20240e758250 Mon Sep 17 00:00:00 2001 From: Gordon Sim Date: Tue, 5 Dec 2006 13:12:25 +0000 Subject: Patch submitted on qpid-dev: 2006-12-05 Jim Meyering * gen/Makefile.am (timestamp): Remove unnecessary "; \", that could have obscured a failure. (gen-src.mk): Use echo 'var = '\\, rather than 'var = \'. Both work, but emacs' font-lock mode mishandles the latter. * bootstrap: Give JAVA and JAVAC default values, and export them. Don't define abs_srcdir; no longer needed. Also filter out gen/Makefile.am's echo warning: ... Add comments. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@482637 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/bootstrap | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'qpid/cpp/bootstrap') diff --git a/qpid/cpp/bootstrap b/qpid/cpp/bootstrap index 34b16cb16b..e52b403700 100755 --- a/qpid/cpp/bootstrap +++ b/qpid/cpp/bootstrap @@ -4,13 +4,22 @@ aclocal -I m4 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 + # If we're building in the qpid tree, we can generate # some Makefile snippets: if test -d ../gentools && test -d ../specs; then + # Transform gen/Makefile.am, removing automake-constructs and the + # contents of the sole automake-else clause (the warning), then + # use the result to run the rules that create gen-src.mk, a file + # that must be created before we run automake. (cd gen && rm -f gen-src.mk - perl -ne '/^(abs_srcdir|if|else|endif|include)\b/ or print' Makefile.am \ - | make -f - abs_srcdir=`pwd` srcdir=. gen-src.mk > /dev/null ) + perl -ne '/warning:|^(if|else|endif|include)\b/ or print' Makefile.am \ + | make -f - srcdir=. gen-src.mk > /dev/null ) fi # Generate (for automake) lots of repetitive parts of tests/Makefile.am. -- cgit v1.2.1 From 329712423d1110ec468e2d6c2577dc70feb484dc Mon Sep 17 00:00:00 2001 From: Alan Conway Date: Thu, 4 Jan 2007 14:47:50 +0000 Subject: Added -build flag: a new working copy can be built with just "bootstrap -build" git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@492585 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/bootstrap | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'qpid/cpp/bootstrap') diff --git a/qpid/cpp/bootstrap b/qpid/cpp/bootstrap index e52b403700..7885c8b009 100755 --- a/qpid/cpp/bootstrap +++ b/qpid/cpp/bootstrap @@ -29,3 +29,8 @@ fi automake autoconf + +if [ "$1" = "-build" ] ; then + ./configure + make +fi -- cgit v1.2.1 From d22cee259ec4c03e21c8eafbf7291d2dadb62b11 Mon Sep 17 00:00:00 2001 From: Alan Conway Date: Thu, 4 Jan 2007 14:52:22 +0000 Subject: Added "make check" to -build flag. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@492588 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/bootstrap | 1 + 1 file changed, 1 insertion(+) (limited to 'qpid/cpp/bootstrap') diff --git a/qpid/cpp/bootstrap b/qpid/cpp/bootstrap index 7885c8b009..0b55394e6c 100755 --- a/qpid/cpp/bootstrap +++ b/qpid/cpp/bootstrap @@ -33,4 +33,5 @@ autoconf if [ "$1" = "-build" ] ; then ./configure make + make check fi -- cgit v1.2.1 From 67cf6fc22e256f265be6da60ca4bb2bee5adcbd7 Mon Sep 17 00:00:00 2001 From: Alan Conway Date: Wed, 14 Feb 2007 22:43:06 +0000 Subject: Applied QPID-351 patch 1 with the following mods: - Moved "source distro" instructions in front of "subversion checkout" instructions. - Added instructions on using qpid-autotools-install - Added general blurb with links at top - renamed to README, removed other README-* files. - Updated makefiles (spec file was already OK.) git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@507729 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/bootstrap | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'qpid/cpp/bootstrap') diff --git a/qpid/cpp/bootstrap b/qpid/cpp/bootstrap index 0b55394e6c..c566d357e6 100755 --- a/qpid/cpp/bootstrap +++ b/qpid/cpp/bootstrap @@ -30,7 +30,7 @@ fi automake autoconf -if [ "$1" = "-build" ] ; then +if [ "$1" = "-build" -o "$1" = "--build" ] ; then ./configure make make check -- cgit v1.2.1 From 732544fe86089ab86c03fcc48d5ca4c72667c275 Mon Sep 17 00:00:00 2001 From: Alan Conway Date: Wed, 21 Mar 2007 02:05:56 +0000 Subject: * cpp: svn removed, will rename cpp-0-9 git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@520705 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/bootstrap | 37 ------------------------------------- 1 file changed, 37 deletions(-) delete mode 100755 qpid/cpp/bootstrap (limited to 'qpid/cpp/bootstrap') diff --git a/qpid/cpp/bootstrap b/qpid/cpp/bootstrap deleted file mode 100755 index c566d357e6..0000000000 --- a/qpid/cpp/bootstrap +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/sh -set -e -aclocal -I m4 -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 - -# If we're building in the qpid tree, we can generate -# some Makefile snippets: - -if test -d ../gentools && test -d ../specs; then - # Transform gen/Makefile.am, removing automake-constructs and the - # contents of the sole automake-else clause (the warning), then - # use the result to run the rules that create gen-src.mk, a file - # that must be created before we run automake. - (cd gen && rm -f gen-src.mk - perl -ne '/warning:|^(if|else|endif|include)\b/ or print' Makefile.am \ - | make -f - srcdir=. gen-src.mk > /dev/null ) -fi - -# Generate (for automake) lots of repetitive parts of tests/Makefile.am. -(cd tests && rm -f gen.mk - perl -ne '/^include / or print' Makefile.am \ - | make -f - abs_srcdir=`dirname $(pwd)` gen.mk > /dev/null ) - -automake -autoconf - -if [ "$1" = "-build" -o "$1" = "--build" ] ; then - ./configure - make - make check -fi -- cgit v1.2.1 From d2eb3361494710466280341c98f76c03536d2ebe Mon Sep 17 00:00:00 2001 From: Alan Conway Date: Wed, 21 Mar 2007 02:08:18 +0000 Subject: Renamed cpp-0-9 to cpp git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@520706 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/bootstrap | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100755 qpid/cpp/bootstrap (limited to 'qpid/cpp/bootstrap') diff --git a/qpid/cpp/bootstrap b/qpid/cpp/bootstrap new file mode 100755 index 0000000000..4fbce77e3f --- /dev/null +++ b/qpid/cpp/bootstrap @@ -0,0 +1,39 @@ +#!/bin/sh +set -e +aclocal -I m4 +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 + +# If we're building in the qpid tree, we can generate +# some Makefile snippets: + +if test -d ../specs; then + # Transform gen/Makefile.am, removing automake-constructs and the + # contents of the sole automake-else clause (the warning), then + # use the result to run the rules that create gen-src.mk, a file + # that must be created before we run automake. + (cd gen && rm -f gen-src.mk + perl -ne '/warning:|^(if|else|endif|include)\b/ or print' Makefile.am \ + | make -f - srcdir=. gen-src.mk > /dev/null ) +fi + +# Generate (for automake) lots of repetitive parts of tests/Makefile.am. +(cd tests && rm -f gen.mk + perl -ne '/^include / or print' Makefile.am \ + | make -f - abs_srcdir=`dirname $(pwd)` gen.mk > /dev/null ) + +automake +autoconf + + +if [ "$1" = "-build" -o "$1" = "--build" ] ; then + shift + ./configure "$@" + make + make check +fi -- cgit v1.2.1 From 9ecd69ebc88fb5d82a693e51eef0475c1a6b282e Mon Sep 17 00:00:00 2001 From: Andrew Stitcher Date: Mon, 2 Apr 2007 11:40:48 +0000 Subject: Fix for the most disruptive items in QPID-243. * All #include lines now use '""' rather than '<>' where appropriate. * #include lines within the qpid project use relative includes so that the same path will work in /usr/include when installed as part of the client libraries. * All the source code has now been rearranged to be under src in a directory analogous to the namespace of the classes in it. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@524769 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/bootstrap | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'qpid/cpp/bootstrap') diff --git a/qpid/cpp/bootstrap b/qpid/cpp/bootstrap index 4fbce77e3f..b956edf70f 100755 --- a/qpid/cpp/bootstrap +++ b/qpid/cpp/bootstrap @@ -17,13 +17,13 @@ if test -d ../specs; then # contents of the sole automake-else clause (the warning), then # use the result to run the rules that create gen-src.mk, a file # that must be created before we run automake. - (cd gen && rm -f gen-src.mk + (cd src/gen && rm -f gen-src.mk perl -ne '/warning:|^(if|else|endif|include)\b/ or print' Makefile.am \ | make -f - srcdir=. gen-src.mk > /dev/null ) fi # Generate (for automake) lots of repetitive parts of tests/Makefile.am. -(cd tests && rm -f gen.mk +(cd src/tests && rm -f gen.mk perl -ne '/^include / or print' Makefile.am \ | make -f - abs_srcdir=`dirname $(pwd)` gen.mk > /dev/null ) -- cgit v1.2.1 From 820c6f73cecb054fa422f34a0fd98a42b545e5a1 Mon Sep 17 00:00:00 2001 From: Alan Conway Date: Tue, 3 Apr 2007 21:56:22 +0000 Subject: * Remove redundant Makefile.am, not needed with single src/ makefile. * Fixed automake warnings. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@525297 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/bootstrap | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'qpid/cpp/bootstrap') diff --git a/qpid/cpp/bootstrap b/qpid/cpp/bootstrap index b956edf70f..55bb6152a1 100755 --- a/qpid/cpp/bootstrap +++ b/qpid/cpp/bootstrap @@ -17,9 +17,9 @@ if test -d ../specs; then # contents of the sole automake-else clause (the warning), then # use the result to run the rules that create gen-src.mk, a file # that must be created before we run automake. - (cd src/gen && rm -f gen-src.mk + (cd src && rm -f gen/gen-src.mk perl -ne '/warning:|^(if|else|endif|include)\b/ or print' Makefile.am \ - | make -f - srcdir=. gen-src.mk > /dev/null ) + | make -f - srcdir=. gen/gen-src.mk > /dev/null ) fi # Generate (for automake) lots of repetitive parts of tests/Makefile.am. -- cgit v1.2.1 From 1b3168902f3e3c03288860e55ba02e5200606cff Mon Sep 17 00:00:00 2001 From: Alan Conway Date: Sat, 14 Apr 2007 16:38:02 +0000 Subject: * Moved code generation into top-level gen/ dir with own Makefile.am to correctly install generated headers. * Fixed gen-src.mk/Makefile dependency loop, bootstrap no longer needs to pre-create gen-src.mk. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@528835 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/bootstrap | 10 ---------- 1 file changed, 10 deletions(-) (limited to 'qpid/cpp/bootstrap') diff --git a/qpid/cpp/bootstrap b/qpid/cpp/bootstrap index 55bb6152a1..d911a3bfd1 100755 --- a/qpid/cpp/bootstrap +++ b/qpid/cpp/bootstrap @@ -12,16 +12,6 @@ export JAVA JAVAC # If we're building in the qpid tree, we can generate # some Makefile snippets: -if test -d ../specs; then - # Transform gen/Makefile.am, removing automake-constructs and the - # contents of the sole automake-else clause (the warning), then - # use the result to run the rules that create gen-src.mk, a file - # that must be created before we run automake. - (cd src && rm -f gen/gen-src.mk - perl -ne '/warning:|^(if|else|endif|include)\b/ or print' Makefile.am \ - | make -f - srcdir=. gen/gen-src.mk > /dev/null ) -fi - # Generate (for automake) lots of repetitive parts of tests/Makefile.am. (cd src/tests && rm -f gen.mk perl -ne '/^include / or print' Makefile.am \ -- cgit v1.2.1 From e9a6d2e94a849b83b4a49b9d92392c382962d42e Mon Sep 17 00:00:00 2001 From: Alan Conway Date: Fri, 11 May 2007 20:11:32 +0000 Subject: * cpp/src/Makefile.am: Move generated code into src. Fix generation script. * cpp/src/generate.sh: New generator script, simplify & fix some problems. * cpp/Makefile.am: removed gen subdir * cpp/bootstrap: remove redundant comment * cpp/configure.ac: remove generator tests, now in generate.sh * cpp/gen,cpp/gen/Makefile.am,cpp/gen/gen-src-mk.sh: Replaced by generate.sh * cpp/src/tests/Makefile.am: Remove client_test from EXTRA_DEPS git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@537278 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/bootstrap | 3 --- 1 file changed, 3 deletions(-) (limited to 'qpid/cpp/bootstrap') diff --git a/qpid/cpp/bootstrap b/qpid/cpp/bootstrap index d911a3bfd1..c443112f30 100755 --- a/qpid/cpp/bootstrap +++ b/qpid/cpp/bootstrap @@ -9,9 +9,6 @@ libtoolize --automake : ${JAVAC=javac} export JAVA JAVAC -# If we're building in the qpid tree, we can generate -# some Makefile snippets: - # Generate (for automake) lots of repetitive parts of tests/Makefile.am. (cd src/tests && rm -f gen.mk perl -ne '/^include / or print' Makefile.am \ -- cgit v1.2.1 From 2bc2c756906232e5182cdf0de96840661688297b Mon Sep 17 00:00:00 2001 From: Alan Conway Date: Thu, 7 Jun 2007 14:29:24 +0000 Subject: Build support for clustering, initial CPG wrapper & tests. - src/qpid/cluster/Cpg.cpp: C++ wrapper for the openais CPG library. - src/tests/unit/Cpg.cpp: verify CPG functions in make check. - makefiles etc.: build cluster stuff only if openais is installed. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@545190 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/bootstrap | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'qpid/cpp/bootstrap') diff --git a/qpid/cpp/bootstrap b/qpid/cpp/bootstrap index c443112f30..d1a4bcb6c0 100755 --- a/qpid/cpp/bootstrap +++ b/qpid/cpp/bootstrap @@ -11,7 +11,7 @@ export JAVA JAVAC # Generate (for automake) lots of repetitive parts of tests/Makefile.am. (cd src/tests && rm -f gen.mk - perl -ne '/^include / or print' Makefile.am \ + perl -ne '/^(include |if |else|endif)/ or print' Makefile.am \ | make -f - abs_srcdir=`dirname $(pwd)` gen.mk > /dev/null ) automake -- cgit v1.2.1 From a63b4b46f0244055e6031d33cc4003a369cf0010 Mon Sep 17 00:00:00 2001 From: Alan Conway Date: Thu, 26 Jul 2007 18:54:49 +0000 Subject: Fix for code gen issues (again!) git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@559939 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/bootstrap | 3 +++ 1 file changed, 3 insertions(+) (limited to 'qpid/cpp/bootstrap') diff --git a/qpid/cpp/bootstrap b/qpid/cpp/bootstrap index d1a4bcb6c0..4a0d2cf86b 100755 --- a/qpid/cpp/bootstrap +++ b/qpid/cpp/bootstrap @@ -14,6 +14,9 @@ export JAVA JAVAC perl -ne '/^(include |if |else|endif)/ or print' Makefile.am \ | make -f - abs_srcdir=`dirname $(pwd)` gen.mk > /dev/null ) +# Bootstrap generated code. +(cd src; ./generate.sh) + automake autoconf -- cgit v1.2.1 From f0281e4654f49dd1b0e4607d6721553847e428a2 Mon Sep 17 00:00:00 2001 From: Alan Conway Date: Wed, 1 Aug 2007 16:50:33 +0000 Subject: * src/generate.sh: Moved requirements test to configure.ac * rubygen: Cleanup and improvements, template for cluster work. * configure.ac: - support for ruby code generator + cleanup. - moved "can generate" tests to configure.ac - removed redundant APR stuff. * bootstrap: Remove codegen from bootstrap, all in config/make. * src/Makefile.am (libqpidcommon_la_LIBADD): - Ruby code generator. - Improvements to existing generator rules. - Removed APR stuff. * configure.ac (CPPUNIT_CXXFLAGS): Removed APR stuff. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@561869 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/bootstrap | 4 ---- 1 file changed, 4 deletions(-) (limited to 'qpid/cpp/bootstrap') diff --git a/qpid/cpp/bootstrap b/qpid/cpp/bootstrap index 4a0d2cf86b..d56ae5bef4 100755 --- a/qpid/cpp/bootstrap +++ b/qpid/cpp/bootstrap @@ -14,13 +14,9 @@ export JAVA JAVAC perl -ne '/^(include |if |else|endif)/ or print' Makefile.am \ | make -f - abs_srcdir=`dirname $(pwd)` gen.mk > /dev/null ) -# Bootstrap generated code. -(cd src; ./generate.sh) - automake autoconf - if [ "$1" = "-build" -o "$1" = "--build" ] ; then shift ./configure "$@" -- cgit v1.2.1 From 6cb197ee036143a671456a1999b1b6c68186062f Mon Sep 17 00:00:00 2001 From: Alan Conway Date: Thu, 9 Aug 2007 00:03:43 +0000 Subject: Moved Proxy generation to rubygen. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@564051 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/bootstrap | 3 +++ 1 file changed, 3 insertions(+) (limited to 'qpid/cpp/bootstrap') diff --git a/qpid/cpp/bootstrap b/qpid/cpp/bootstrap index d56ae5bef4..978aab0968 100755 --- a/qpid/cpp/bootstrap +++ b/qpid/cpp/bootstrap @@ -14,6 +14,9 @@ export JAVA JAVAC perl -ne '/^(include |if |else|endif)/ or print' Makefile.am \ | make -f - abs_srcdir=`dirname $(pwd)` gen.mk > /dev/null ) +# Create initial empty Makefile include files, make will generate the real contents. +touch src/rubygen.mk src/generate.mk + automake autoconf -- cgit v1.2.1 From 05dc293dc161f555b0bbf22926d94d1b789c39b3 Mon Sep 17 00:00:00 2001 From: Alan Conway Date: Thu, 9 Aug 2007 17:43:14 +0000 Subject: Fix for make rpmbuild issue: Configure forces rebuild of src/Makefile by touching .mk include files. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@564293 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/bootstrap | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'qpid/cpp/bootstrap') diff --git a/qpid/cpp/bootstrap b/qpid/cpp/bootstrap index 978aab0968..2ecdefabd2 100755 --- a/qpid/cpp/bootstrap +++ b/qpid/cpp/bootstrap @@ -14,9 +14,8 @@ export JAVA JAVAC perl -ne '/^(include |if |else|endif)/ or print' Makefile.am \ | make -f - abs_srcdir=`dirname $(pwd)` gen.mk > /dev/null ) -# Create initial empty Makefile include files, make will generate the real contents. +# Create empty Makefile include files, make will generate the real contents. touch src/rubygen.mk src/generate.mk - automake autoconf -- cgit v1.2.1 From 732ecad2dee33e362405a40bee644b777f6589b1 Mon Sep 17 00:00:00 2001 From: Alan Conway Date: Fri, 17 Aug 2007 15:52:07 +0000 Subject: * Fixes for code generation. - Generate make fragments in $(srcdir) to fix VPATH builds. - rubygen: generates its own .mk fragment - rubygen: moved template info from Makefile.am to generated rubygen.mk, fixes circular dependency between Makefile and rubygen.mk - removed unused templates. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@567072 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/bootstrap | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'qpid/cpp/bootstrap') diff --git a/qpid/cpp/bootstrap b/qpid/cpp/bootstrap index 2ecdefabd2..d96749e14b 100755 --- a/qpid/cpp/bootstrap +++ b/qpid/cpp/bootstrap @@ -14,8 +14,15 @@ export JAVA JAVAC perl -ne '/^(include |if |else|endif)/ or print' Makefile.am \ | make -f - abs_srcdir=`dirname $(pwd)` gen.mk > /dev/null ) -# Create empty Makefile include files, make will generate the real contents. -touch src/rubygen.mk src/generate.mk +# Create initial Makefile fragments that will force make to generate +# the real ones. +cat > src/rubygen.mk < Date: Thu, 20 Sep 2007 21:07:25 +0000 Subject: * cpp/bootstrap, cpp/rubygen/generate, cpp/src/Makefile.am: Fixed generated headers to install properly. * cpp/qpidc.spec.in: removed apr dependency. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@577916 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/bootstrap | 7 ------- 1 file changed, 7 deletions(-) (limited to 'qpid/cpp/bootstrap') diff --git a/qpid/cpp/bootstrap b/qpid/cpp/bootstrap index d96749e14b..feb45f7510 100755 --- a/qpid/cpp/bootstrap +++ b/qpid/cpp/bootstrap @@ -4,11 +4,6 @@ aclocal -I m4 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 \ @@ -21,8 +16,6 @@ cat > src/rubygen.mk < Date: Fri, 19 Oct 2007 16:23:30 +0000 Subject: git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@586520 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/bootstrap | 1 + 1 file changed, 1 insertion(+) (limited to 'qpid/cpp/bootstrap') diff --git a/qpid/cpp/bootstrap b/qpid/cpp/bootstrap index feb45f7510..84f0fbd89b 100755 --- a/qpid/cpp/bootstrap +++ b/qpid/cpp/bootstrap @@ -16,6 +16,7 @@ cat > src/rubygen.mk < Date: Fri, 23 Nov 2007 13:37:42 +0000 Subject: QPID-689 from tross@redhat.com. This patch introduces formal schema specification for management and code generation for management classes. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@597662 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/bootstrap | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'qpid/cpp/bootstrap') diff --git a/qpid/cpp/bootstrap b/qpid/cpp/bootstrap index 84f0fbd89b..c1fb753201 100755 --- a/qpid/cpp/bootstrap +++ b/qpid/cpp/bootstrap @@ -15,6 +15,10 @@ cat > src/rubygen.mk < src/managementgen.mk < Date: Fri, 30 May 2008 08:13:21 +0000 Subject: Convert remaining cppunit tests to boost test framework to reduce dependencies. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@661587 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/bootstrap | 5 ----- 1 file changed, 5 deletions(-) (limited to 'qpid/cpp/bootstrap') diff --git a/qpid/cpp/bootstrap b/qpid/cpp/bootstrap index c1fb753201..2dc8f91b30 100755 --- a/qpid/cpp/bootstrap +++ b/qpid/cpp/bootstrap @@ -4,11 +4,6 @@ aclocal -I m4 autoheader libtoolize --automake -# 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 \ - | make -f - abs_srcdir=`dirname $(pwd)` gen.mk > /dev/null ) - # Create initial Makefile fragments that will force make to generate # the real ones. cat > src/rubygen.mk < Date: Mon, 30 Nov 2009 19:34:36 +0000 Subject: Clean up test environment variables, prepare for running more tests in cmake. - consolidate test env vars in test_env.sh, also useful from command line. - generate test_env.sh with autoconf/cmake to cover library location differences. - Remove explicit mention of .libs, use $QPID_MODULE_DIR to load modules. - Fix run_test to run valgrind under cmake git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@885557 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/bootstrap | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'qpid/cpp/bootstrap') diff --git a/qpid/cpp/bootstrap b/qpid/cpp/bootstrap index 2dc8f91b30..5f33fec63f 100755 --- a/qpid/cpp/bootstrap +++ b/qpid/cpp/bootstrap @@ -8,7 +8,7 @@ libtoolize --automake # the real ones. cat > src/rubygen.mk < src/managementgen.mk < Date: Wed, 17 Mar 2010 16:33:50 +0000 Subject: C++ automake build picks up version number from qpid/QPID_VERSION.txt. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@924359 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/bootstrap | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'qpid/cpp/bootstrap') diff --git a/qpid/cpp/bootstrap b/qpid/cpp/bootstrap index 5f33fec63f..925344acf7 100755 --- a/qpid/cpp/bootstrap +++ b/qpid/cpp/bootstrap @@ -1,5 +1,8 @@ #!/bin/sh -set -e + +# Copy the global QPID_VERSION.txt file into the source tree. +cp ../QPID_VERSION.txt . + aclocal -I m4 autoheader libtoolize --automake @@ -15,10 +18,10 @@ cat > src/managementgen.mk < Date: Sun, 31 Oct 2010 23:39:39 +0000 Subject: add ASF licence to various files in the cpp tree git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1029521 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/bootstrap | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'qpid/cpp/bootstrap') diff --git a/qpid/cpp/bootstrap b/qpid/cpp/bootstrap index 925344acf7..632f6a0d8c 100755 --- a/qpid/cpp/bootstrap +++ b/qpid/cpp/bootstrap @@ -1,4 +1,22 @@ #!/bin/sh +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# # Copy the global QPID_VERSION.txt file into the source tree. cp ../QPID_VERSION.txt . -- cgit v1.2.1 From d0d761ced35b32a75d365028b3dc73e004810fb6 Mon Sep 17 00:00:00 2001 From: Alan Conway Date: Mon, 10 Jan 2011 20:13:37 +0000 Subject: Add --add-missing to automake call in bootstrap. Automatically adds missing automake files to the project. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1057342 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/bootstrap | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'qpid/cpp/bootstrap') diff --git a/qpid/cpp/bootstrap b/qpid/cpp/bootstrap index 632f6a0d8c..d6ff19765b 100755 --- a/qpid/cpp/bootstrap +++ b/qpid/cpp/bootstrap @@ -36,7 +36,7 @@ cat > src/managementgen.mk <