diff options
| author | Alan Conway <aconway@apache.org> | 2007-08-01 16:50:33 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2007-08-01 16:50:33 +0000 |
| commit | f0281e4654f49dd1b0e4607d6721553847e428a2 (patch) | |
| tree | acc50e0425b88016d7ccaec6839c9d8e1af103aa /qpid/cpp/src/generate.sh | |
| parent | c6766aa1bf420a908acef1ea577755f8741c9d03 (diff) | |
| download | qpid-python-f0281e4654f49dd1b0e4607d6721553847e428a2.tar.gz | |
* 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
Diffstat (limited to 'qpid/cpp/src/generate.sh')
| -rwxr-xr-x | qpid/cpp/src/generate.sh | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/qpid/cpp/src/generate.sh b/qpid/cpp/src/generate.sh index 1d8f946ecd..2cc31ff922 100755 --- a/qpid/cpp/src/generate.sh +++ b/qpid/cpp/src/generate.sh @@ -1,19 +1,19 @@ # !/bin/sh # Generate code from AMQP specification. -# srcdir must +# specs and gentools_dir are set by Makefile # -srcdir=`dirname $0` set -e -gentools_dir="$srcdir/../gentools" -specs_dir="$srcdir/../../specs" -specs="$specs_dir/amqp-transitional.0-10.xml $srcdir/../xml/cluster.xml" - test -z "$JAVA" && JAVA=java ; -test -z "$JAVAC" && JAVAC=javac ; +test -z "$JAVAC" && JAVAC=javac ; + +checkspecs() { + for s in $specs; do test -f $s || return 1; done + return 0 +} # Can we generate code? -if { test -d $gentools_dir && test -d $specs_dir && \ +if { test -d $gentools_dir && checkspecs && which $JAVA && which $JAVAC; } > /dev/null; then echo "Generating code." @@ -40,8 +40,8 @@ make_assign() { make_assign "generator" "" $specs \ `find ../gentools \( -name '*.java' -o -name '*.tmpl' \) -print` fi -) > generate.mk-t -mv generate.mk-t generate.mk +) > gen/generate.mk-t +mv gen/generate.mk-t gen/generate.mk |