diff --git a/qamqp.pri b/qamqp.pri new file mode 100644 index 0000000..11daaf5 --- /dev/null +++ b/qamqp.pri @@ -0,0 +1,27 @@ +QAMQP_VERSION = 1.0.0 + +isEmpty(QAMQP_LIBRARY_TYPE) { + QAMQP_LIBRARY_TYPE = shared +} + +QT += network +QAMQP_INCLUDEPATH = $${PWD}/src +QAMQP_LIBS = -lqamqp +contains(QAMQP_LIBRARY_TYPE, staticlib) { + DEFINES += QAMQP_STATIC +} else { + DEFINES += QAMQP_SHARED + win32:QAMQP_LIBS = -lqamqp1 +} + +isEmpty(PREFIX) { + unix { + PREFIX = /usr + } else { + PREFIX = $$[QT_INSTALL_PREFIX] + } +} +isEmpty(LIBDIR) { + LIBDIR = lib +} + diff --git a/qamqp.pro b/qamqp.pro new file mode 100644 index 0000000..ddb7595 --- /dev/null +++ b/qamqp.pro @@ -0,0 +1,4 @@ +TEMPLATE = subdirs +SUBDIRS += src \ + tests +CONFIG += ordered diff --git a/src/src.pro b/src/src.pro index 1992c80..a7c9d8d 100644 --- a/src/src.pro +++ b/src/src.pro @@ -1,29 +1,63 @@ -QT += network +include(../qamqp.pri) -DEPENDPATH += $$PWD +INCLUDEPATH += . +TEMPLATE = lib +TARGET = qamqp +QT += core network +QT -= gui +DEFINES += QAMQP_BUILD +CONFIG += $${QAMQP_LIBRARY_TYPE} +VERSION = $${QAMQP_VERSION} +win32:DESTDIR = $$OUT_PWD -HEADERS += $$PWD/amqp.h \ - $$PWD/amqp_authenticator.h \ - $$PWD/amqp_channel.h \ - $$PWD/amqp_channel_p.h \ - $$PWD/amqp_connection.h \ - $$PWD/amqp_connection_p.h \ - $$PWD/amqp_exchange.h \ - $$PWD/amqp_exchange_p.h \ - $$PWD/amqp_frame.h \ - $$PWD/amqp_message.h \ - $$PWD/amqp_network.h \ - $$PWD/amqp_p.h \ - $$PWD/amqp_queue.h \ - $$PWD/amqp_queue_p.h \ - $$PWD/amqp_global.h \ +PRIVATE_HEADERS += \ + amqp_p.h \ + amqp_channel_p.h \ + amqp_connection_p.h \ + amqp_exchange_p.h \ + amqp_queue_p.h -SOURCES += $$PWD/amqp.cpp \ - $$PWD/amqp_authenticator.cpp \ - $$PWD/amqp_channel.cpp \ - $$PWD/amqp_connection.cpp \ - $$PWD/amqp_exchange.cpp \ - $$PWD/amqp_frame.cpp \ - $$PWD/amqp_message.cpp \ - $$PWD/amqp_network.cpp \ - $$PWD/amqp_queue.cpp \ +INSTALL_HEADERS += \ + amqp.h \ + amqp_authenticator.h \ + amqp_channel.h \ + amqp_connection.h \ + amqp_exchange.h \ + amqp_frame.h \ + amqp_global.h \ + amqp_message.h \ + amqp_network.h \ + amqp_queue.h + +HEADERS += \ + $${INSTALL_HEADERS} \ + $${PRIVATE_HEADERS} + +SOURCES += \ + amqp.cpp \ + amqp_authenticator.cpp \ + amqp_channel.cpp \ + amqp_connection.cpp \ + amqp_exchange.cpp \ + amqp_frame.cpp \ + amqp_message.cpp \ + amqp_network.cpp \ + amqp_queue.cpp + +# install +headers.files = $${INSTALL_HEADERS} +headers.path = $${PREFIX}/include/qamqp +target.path = $${PREFIX}/$${LIBDIR} +INSTALLS += headers target + +# pkg-config support +CONFIG += create_pc create_prl no_install_prl +QMAKE_PKGCONFIG_DESTDIR = pkgconfig +QMAKE_PKGCONFIG_LIBDIR = $$target.path +QMAKE_PKGCONFIG_INCDIR = $$headers.path +equals(QAMQP_LIBRARY_TYPE, staticlib) { + QMAKE_PKGCONFIG_CFLAGS = -DQAMQP_STATIC +} else { + QMAKE_PKGCONFIG_CFLAGS = -DQAMQP_SHARED +} +unix:QMAKE_CLEAN += -r pkgconfig lib$${TARGET}.prl diff --git a/tests/manual/manual.pro b/tests/manual/manual.pro new file mode 100644 index 0000000..19b9c30 --- /dev/null +++ b/tests/manual/manual.pro @@ -0,0 +1,3 @@ +TEMPLATE = subdirs +SUBDIRS = \ + qamqp diff --git a/tests/manual/qamqp/QamqpApp.h b/tests/manual/qamqp/QamqpApp.h index 2651e35..49b0af0 100644 --- a/tests/manual/qamqp/QamqpApp.h +++ b/tests/manual/qamqp/QamqpApp.h @@ -9,9 +9,9 @@ #include #include -#include "qamqp/amqp.h" -#include "qamqp/amqp_exchange.h" -#include "qamqp/amqp_queue.h" +#include "amqp.h" +#include "amqp_exchange.h" +#include "amqp_queue.h" #include "pubsub/EmitLog.h" #include "pubsub/ReceiveLog.h" diff --git a/tests/manual/qamqp/pubsub/EmitLog.h b/tests/manual/qamqp/pubsub/EmitLog.h index 6d4dde6..88e600a 100644 --- a/tests/manual/qamqp/pubsub/EmitLog.h +++ b/tests/manual/qamqp/pubsub/EmitLog.h @@ -7,8 +7,8 @@ #include #include -#include "qamqp/amqp.h" -#include "qamqp/amqp_exchange.h" +#include "amqp.h" +#include "amqp_exchange.h" namespace QAMQP { diff --git a/tests/manual/qamqp/pubsub/ReceiveLog.h b/tests/manual/qamqp/pubsub/ReceiveLog.h index 5993f68..6a1b164 100644 --- a/tests/manual/qamqp/pubsub/ReceiveLog.h +++ b/tests/manual/qamqp/pubsub/ReceiveLog.h @@ -7,9 +7,8 @@ #include #include -#include "qamqp/amqp.h" -#include "qamqp/amqp_queue.h" - +#include "amqp.h" +#include "amqp_queue.h" namespace QAMQP { diff --git a/tests/manual/qamqp/qamqp.pro b/tests/manual/qamqp/qamqp.pro index 0f22db4..2b3de81 100644 --- a/tests/manual/qamqp/qamqp.pro +++ b/tests/manual/qamqp/qamqp.pro @@ -1,21 +1,20 @@ +DEPTH = ../../.. +include($${DEPTH}/qamqp.pri) +include($${DEPTH}/tests/tests.pri) +CONFIG -= testcase + TEMPLATE = app TARGET = qamqp -DEPENDPATH += . src - -INCLUDEPATH += . ./src - HEADERS += \ - src/QamqpApp.h \ - src/pubsub/EmitLog.h \ - src/pubsub/ReceiveLog.h \ - src/routing/EmitLogDirect.h \ - src/routing/ReceiveLogDirect.h \ - src/sendreceive/Receive.h \ - src/sendreceive/Send.h \ - src/workqueues/NewTask.h \ - src/workqueues/Worker.h \ + QamqpApp.h \ + pubsub/EmitLog.h \ + pubsub/ReceiveLog.h \ + routing/EmitLogDirect.h \ + routing/ReceiveLogDirect.h \ + sendreceive/Receive.h \ + sendreceive/Send.h \ + workqueues/NewTask.h \ + workqueues/Worker.h SOURCES += \ - src/main.cpp \ - -include(src/qamqp/qamqp.pri) + main.cpp diff --git a/tests/manual/qamqp/routing/EmitLogDirect.h b/tests/manual/qamqp/routing/EmitLogDirect.h index 6346430..b015fd8 100644 --- a/tests/manual/qamqp/routing/EmitLogDirect.h +++ b/tests/manual/qamqp/routing/EmitLogDirect.h @@ -8,8 +8,8 @@ #include #include -#include "qamqp/amqp.h" -#include "qamqp/amqp_exchange.h" +#include "amqp.h" +#include "amqp_exchange.h" namespace QAMQP { diff --git a/tests/manual/qamqp/routing/ReceiveLogDirect.h b/tests/manual/qamqp/routing/ReceiveLogDirect.h index cedbabf..2b92e5a 100644 --- a/tests/manual/qamqp/routing/ReceiveLogDirect.h +++ b/tests/manual/qamqp/routing/ReceiveLogDirect.h @@ -8,8 +8,8 @@ #include #include -#include "qamqp/amqp.h" -#include "qamqp/amqp_queue.h" +#include "amqp.h" +#include "amqp_queue.h" namespace QAMQP diff --git a/tests/manual/qamqp/sendreceive/Receive.h b/tests/manual/qamqp/sendreceive/Receive.h index 7b99e8c..e9a460e 100644 --- a/tests/manual/qamqp/sendreceive/Receive.h +++ b/tests/manual/qamqp/sendreceive/Receive.h @@ -9,8 +9,8 @@ #include #include -#include "qamqp/amqp.h" -#include "qamqp/amqp_queue.h" +#include "amqp.h" +#include "amqp_queue.h" namespace QAMQP diff --git a/tests/manual/qamqp/sendreceive/Send.h b/tests/manual/qamqp/sendreceive/Send.h index d015663..37a8f9a 100644 --- a/tests/manual/qamqp/sendreceive/Send.h +++ b/tests/manual/qamqp/sendreceive/Send.h @@ -9,9 +9,9 @@ #include #include -#include "qamqp/amqp.h" -#include "qamqp/amqp_exchange.h" -#include "qamqp/amqp_queue.h" +#include "amqp.h" +#include "amqp_exchange.h" +#include "amqp_queue.h" namespace QAMQP { diff --git a/tests/manual/qamqp/workqueues/NewTask.h b/tests/manual/qamqp/workqueues/NewTask.h index d6c6d4e..34ad813 100644 --- a/tests/manual/qamqp/workqueues/NewTask.h +++ b/tests/manual/qamqp/workqueues/NewTask.h @@ -7,9 +7,9 @@ #include #include -#include "qamqp/amqp.h" -#include "qamqp/amqp_exchange.h" -#include "qamqp/amqp_queue.h" +#include "amqp.h" +#include "amqp_exchange.h" +#include "amqp_queue.h" namespace QAMQP { diff --git a/tests/manual/qamqp/workqueues/Worker.h b/tests/manual/qamqp/workqueues/Worker.h index eadd373..7161862 100644 --- a/tests/manual/qamqp/workqueues/Worker.h +++ b/tests/manual/qamqp/workqueues/Worker.h @@ -7,8 +7,8 @@ #include #include -#include "qamqp/amqp.h" -#include "qamqp/amqp_queue.h" +#include "amqp.h" +#include "amqp_queue.h" namespace QAMQP diff --git a/tests/tests.pri b/tests/tests.pri new file mode 100644 index 0000000..80d7f7a --- /dev/null +++ b/tests/tests.pri @@ -0,0 +1,6 @@ +INCLUDEPATH += $${QAMQP_INCLUDEPATH} +LIBS += -L$${DEPTH}/src $${QAMQP_LIBS} +QT = core network testlib +QT -= gui +CONFIG -= app_bundle +CONFIG += testcase