diff options
| author | Alan Conway <aconway@apache.org> | 2013-05-02 21:47:13 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2013-05-02 21:47:13 +0000 |
| commit | ba9f80714ae4870c01b450b4f89cfa87d51a6827 (patch) | |
| tree | f66a443236e4a7886f7e8ca2e449d52c7d1766ec /qpid/cpp/src | |
| parent | 276e15f7b9baa99372f290f52f40bda2b9c5e5b7 (diff) | |
| download | qpid-python-ba9f80714ae4870c01b450b4f89cfa87d51a6827.tar.gz | |
QPID-4798: Fix up c++ code generation to use stripped spec files.
The stripped specs have no <doc> elements, this was tripping up the code
generator. Fixed the generator to process <doc> elements if they are present but
to carry on without them if they are not.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1478582 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src')
| -rw-r--r-- | qpid/cpp/src/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | qpid/cpp/src/tests/legacystore/system_test.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/qpid/cpp/src/CMakeLists.txt b/qpid/cpp/src/CMakeLists.txt index 1fe2198ea6..68610c4c40 100644 --- a/qpid/cpp/src/CMakeLists.txt +++ b/qpid/cpp/src/CMakeLists.txt @@ -175,7 +175,7 @@ inherit_value ("winver_LEGAL_COPYRIGHT" "") # present, and if any sources have changed, forcing a re-gen of source code. set(AMQP_SPEC_DIR ${qpid-cpp_SOURCE_DIR}/../specs) -set(AMQP_SPEC ${AMQP_SPEC_DIR}/amqp.0-10-qpid-errata.xml) +set(AMQP_SPEC ${AMQP_SPEC_DIR}/amqp.0-10-qpid-errata.stripped.xml) if (EXISTS ${AMQP_SPEC}) include(FindRuby) include(FindPythonInterp) diff --git a/qpid/cpp/src/tests/legacystore/system_test.sh b/qpid/cpp/src/tests/legacystore/system_test.sh index 4cccc5ac8d..dbf8902cff 100644 --- a/qpid/cpp/src/tests/legacystore/system_test.sh +++ b/qpid/cpp/src/tests/legacystore/system_test.sh @@ -28,7 +28,7 @@ if ! test -d "$QPID_DIR" ; then fi STORE_LIB=../lib/.libs/msgstore.so -xml_spec=$QPID_DIR/specs/amqp.0-10-qpid-errata.xml +xml_spec=$QPID_DIR/specs/amqp.0-10-qpid-errata.stripped.xml test -f $xml_spec || error "$xml_spec not found: invalid \$QPID_DIR ?" export PYTHONPATH=$QPID_DIR/python:$QPID_DIR/extras/qmf/src/py:$QPID_DIR/tools/src/py |