turn qamqp into a proper library, set up test dir structure, moved qamqp test app to manual test

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
+}
+

qamqp.pro

@@ -0,0 +1,4 @@
+TEMPLATE = subdirs
+SUBDIRS += src \
+           tests
+CONFIG += ordered

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 \
+PRIVATE_HEADERS += \
-           $$PWD/amqp_authenticator.h \
+    amqp_p.h \
-           $$PWD/amqp_channel.h \
+    amqp_channel_p.h \
-           $$PWD/amqp_channel_p.h \
+    amqp_connection_p.h \
-           $$PWD/amqp_connection.h \
+    amqp_exchange_p.h \
-           $$PWD/amqp_connection_p.h \
+    amqp_queue_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 \
 
-SOURCES += $$PWD/amqp.cpp \
+INSTALL_HEADERS += \
-           $$PWD/amqp_authenticator.cpp \
+    amqp.h \
-           $$PWD/amqp_channel.cpp \
+    amqp_authenticator.h \
-           $$PWD/amqp_connection.cpp \
+    amqp_channel.h \
-           $$PWD/amqp_exchange.cpp \
+    amqp_connection.h \
-           $$PWD/amqp_frame.cpp \
+    amqp_exchange.h \
-           $$PWD/amqp_message.cpp \
+    amqp_frame.h \
-           $$PWD/amqp_network.cpp \
+    amqp_global.h \
-           $$PWD/amqp_queue.cpp \
+    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

tests/manual/manual.pro

@@ -0,0 +1,3 @@
+TEMPLATE = subdirs
+SUBDIRS = \
+    qamqp

tests/manual/qamqp/QamqpApp.h

@@ -9,9 +9,9 @@
 #include <QTextStream>
 #include <QTimer>
 
-#include "qamqp/amqp.h"
+#include "amqp.h"
-#include "qamqp/amqp_exchange.h"
+#include "amqp_exchange.h"
-#include "qamqp/amqp_queue.h"
+#include "amqp_queue.h"
 
 #include "pubsub/EmitLog.h"
 #include "pubsub/ReceiveLog.h"

tests/manual/qamqp/pubsub/EmitLog.h

@@ -7,8 +7,8 @@
 #include <QTimer>
 #include <QDateTime>
 
-#include "qamqp/amqp.h"
+#include "amqp.h"
-#include "qamqp/amqp_exchange.h"
+#include "amqp_exchange.h"
 
 namespace QAMQP
 {

tests/manual/qamqp/pubsub/ReceiveLog.h

@@ -7,9 +7,8 @@
 #include <QThread>
 #include <QTime>
 
-#include "qamqp/amqp.h"
+#include "amqp.h"
-#include "qamqp/amqp_queue.h"
+#include "amqp_queue.h"
-
 
 namespace QAMQP
 {

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 \
+    QamqpApp.h \
-  src/pubsub/EmitLog.h \
+    pubsub/EmitLog.h \
-  src/pubsub/ReceiveLog.h \
+    pubsub/ReceiveLog.h \
-  src/routing/EmitLogDirect.h \
+    routing/EmitLogDirect.h \
-  src/routing/ReceiveLogDirect.h \
+    routing/ReceiveLogDirect.h \
-  src/sendreceive/Receive.h \
+    sendreceive/Receive.h \
-  src/sendreceive/Send.h \
+    sendreceive/Send.h \
-  src/workqueues/NewTask.h \
+    workqueues/NewTask.h \
-  src/workqueues/Worker.h \
+    workqueues/Worker.h
 
 SOURCES += \
-  src/main.cpp \
+    main.cpp
-
-include(src/qamqp/qamqp.pri)

tests/manual/qamqp/routing/EmitLogDirect.h

@@ -8,8 +8,8 @@
 #include <QTimer>
 #include <QDateTime>
 
-#include "qamqp/amqp.h"
+#include "amqp.h"
-#include "qamqp/amqp_exchange.h"
+#include "amqp_exchange.h"
 
 namespace QAMQP
 {

tests/manual/qamqp/routing/ReceiveLogDirect.h

@@ -8,8 +8,8 @@
 #include <QThread>
 #include <QTime>
 
-#include "qamqp/amqp.h"
+#include "amqp.h"
-#include "qamqp/amqp_queue.h"
+#include "amqp_queue.h"
 
 
 namespace QAMQP

tests/manual/qamqp/sendreceive/Receive.h

@@ -9,8 +9,8 @@
 #include <QTimer>
 #include <QDateTime>
 
-#include "qamqp/amqp.h"
+#include "amqp.h"
-#include "qamqp/amqp_queue.h"
+#include "amqp_queue.h"
 
 
 namespace QAMQP

tests/manual/qamqp/sendreceive/Send.h

@@ -9,9 +9,9 @@
 #include <QTimer>
 #include <QDateTime>
 
-#include "qamqp/amqp.h"
+#include "amqp.h"
-#include "qamqp/amqp_exchange.h"
+#include "amqp_exchange.h"
-#include "qamqp/amqp_queue.h"
+#include "amqp_queue.h"
 
 namespace QAMQP
 {

tests/manual/qamqp/workqueues/NewTask.h

@@ -7,9 +7,9 @@
 #include <QTimer>
 #include <QDateTime>
 
-#include "qamqp/amqp.h"
+#include "amqp.h"
-#include "qamqp/amqp_exchange.h"
+#include "amqp_exchange.h"
-#include "qamqp/amqp_queue.h"
+#include "amqp_queue.h"
 
 namespace QAMQP
 {

tests/manual/qamqp/workqueues/Worker.h

@@ -7,8 +7,8 @@
 #include <QThread>
 #include <QTime>
 
-#include "qamqp/amqp.h"
+#include "amqp.h"
-#include "qamqp/amqp_queue.h"
+#include "amqp_queue.h"
 
 
 namespace QAMQP

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