Make this a real Qt module.

Combined the launcher and core modules into a single unit.
Use core/launcher as QT += processmanager
Use declarative as QT += processmanagerdeclarative

Change-Id: I1d167a47236c8a624ed7eab01bcf994e6de25e80
Reviewed-by: Chris Craig <ext-chris.craig@nokia.com>

36 files changed, 62 insertions, 172 deletions

diff --git a/src/core/core-lib.pri b/src/core/core-lib.pri
index e6540f4..5144882 100644
--- a/src/core/core-lib.pri
+++ b/src/core/core-lib.pri
@@ -1,4 +1,4 @@
-QT += network
+QT += network jsonstream
 
 INCLUDEPATH += $$PWD
 
@@ -21,6 +21,9 @@ PUBLIC_HEADERS += \
   $$PWD/prelaunchprocessbackend.h \
   $$PWD/remoteprocessbackend.h \
   $$PWD/processmanager-global.h \
+  $$PWD/launcherclient.h \
+  $$PWD/pipelauncher.h \
+  $$PWD/socketlauncher.h \
   $$PWD/procutils.h
 
 HEADERS += \
@@ -46,4 +49,7 @@ SOURCES += \
   $$PWD/remoteprocessbackendfactory.cpp \
   $$PWD/pipeprocessbackendfactory.cpp \
   $$PWD/socketprocessbackendfactory.cpp \
+  $$PWD/launcherclient.cpp \
+  $$PWD/pipelauncher.cpp \
+  $$PWD/socketlauncher.cpp \
   $$PWD/procutils.cpp
diff --git a/src/core/core.pri b/src/core/core.pri
deleted file mode 100644
index f934acc..0000000
--- a/src/core/core.pri
+++ /dev/null
@@ -1,10 +0,0 @@
-CONFIG += network
-
-INCLUDEPATH += $$PWD
-LIBS += -L$$PWD -lprocessmanager-core
-
-mac|unix {
-    CONFIG += rpath_libdirs
-    QMAKE_RPATHDIR += $$PWD
-    QMAKE_LFLAGS += "-Wl,-rpath $$PWD"
-}
diff --git a/src/core/core.pro b/src/core/core.pro
index 343572a..7072f12 100644
--- a/src/core/core.pro
+++ b/src/core/core.pro
@@ -1,16 +1,17 @@
 TEMPLATE = lib
-TARGET = processmanager-core
+TARGET   = $$QT.processmanager.name
+MODULE   = processmanager
 
-include($$PWD/../../config.pri)
-include($$PWD/core-lib.pri)
+load(qt_module)
+load(qt_module_config)
 
-mac {
-    QMAKE_POST_LINK = install_name_tool -id $$PWD/${TARGET} ${TARGET}
-}
+DESTDIR = $$QT.processmanager.libs
+VERSION = $$QT.processmanager.VERSION
+DEFINES += QT_ADDON_PROCESSMANAGER_LIB
 
-target.path = $$INSTALLBASE/lib
+CONFIG += module create_prl
+MODULE_PRI = ../../modules/qt_processmanager.pri
 
-headers.path = $$INSTALLBASE/include/qtprocessmanager
-headers.files = $$PUBLIC_HEADERS
+include($$PWD/core-lib.pri)
 
-INSTALLS += target headers
+mac:QMAKE_FRAMEWORK_BUNDLE_NAME = $$QT.processmanager.name
diff --git a/src/core/gdbprocessbackendfactory.h b/src/core/gdbprocessbackendfactory.h
index 4ea99ab..d5f76cf 100644
--- a/src/core/gdbprocessbackendfactory.h
+++ b/src/core/gdbprocessbackendfactory.h
@@ -45,7 +45,7 @@
 
 QT_BEGIN_NAMESPACE_PROCESSMANAGER
 
-class GdbProcessBackendFactory : public StandardProcessBackendFactory
+class Q_ADDON_PROCESSMANAGER_EXPORT GdbProcessBackendFactory : public StandardProcessBackendFactory
 {
     Q_OBJECT
 
diff --git a/src/launcher/launcherclient.cpp b/src/core/launcherclient.cpp
index 351bb65..351bb65 100644
--- a/src/launcher/launcherclient.cpp
+++ b/src/core/launcherclient.cpp
diff --git a/src/launcher/launcherclient.h b/src/core/launcherclient.h
index 13dd8e8..13dd8e8 100644
--- a/src/launcher/launcherclient.h
+++ b/src/core/launcherclient.h
diff --git a/src/launcher/pipelauncher.cpp b/src/core/pipelauncher.cpp
index d3bcf6e..d3bcf6e 100644
--- a/src/launcher/pipelauncher.cpp
+++ b/src/core/pipelauncher.cpp
diff --git a/src/launcher/pipelauncher.h b/src/core/pipelauncher.h
index 765449d..4688024 100644
--- a/src/launcher/pipelauncher.h
+++ b/src/core/pipelauncher.h
@@ -50,7 +50,7 @@ QT_BEGIN_NAMESPACE_PROCESSMANAGER
 
 class LauncherClient;
 
-class PipeLauncher : public ProcessBackendManager {
+class Q_ADDON_PROCESSMANAGER_EXPORT PipeLauncher : public ProcessBackendManager {
     Q_OBJECT
 
 public:
diff --git a/src/core/pipeprocessbackendfactory.h b/src/core/pipeprocessbackendfactory.h
index 20f461b..4542c2e 100644
--- a/src/core/pipeprocessbackendfactory.h
+++ b/src/core/pipeprocessbackendfactory.h
@@ -44,7 +44,7 @@
 
 QT_BEGIN_NAMESPACE_PROCESSMANAGER
 
-class PipeProcessBackendFactory : public RemoteProcessBackendFactory
+class Q_ADDON_PROCESSMANAGER_EXPORT PipeProcessBackendFactory : public RemoteProcessBackendFactory
 {
     Q_OBJECT
 public:
diff --git a/src/core/prelaunchprocessbackend.h b/src/core/prelaunchprocessbackend.h
index abca5b2..cefb1a4 100644
--- a/src/core/prelaunchprocessbackend.h
+++ b/src/core/prelaunchprocessbackend.h
@@ -61,7 +61,7 @@ public:
     } n;
 };
 
-class PrelaunchProcessBackend : public UnixProcessBackend
+class Q_ADDON_PROCESSMANAGER_EXPORT PrelaunchProcessBackend : public UnixProcessBackend
 {
     Q_OBJECT
 
diff --git a/src/core/prelaunchprocessbackendfactory.h b/src/core/prelaunchprocessbackendfactory.h
index c066026..3f1d087 100644
--- a/src/core/prelaunchprocessbackendfactory.h
+++ b/src/core/prelaunchprocessbackendfactory.h
@@ -49,7 +49,7 @@ QT_BEGIN_NAMESPACE_PROCESSMANAGER
 
 class PrelaunchProcessBackend;
 
-class PrelaunchProcessBackendFactory : public ProcessBackendFactory
+class Q_ADDON_PROCESSMANAGER_EXPORT PrelaunchProcessBackendFactory : public ProcessBackendFactory
 {
     Q_OBJECT
 public:
diff --git a/src/core/process.h b/src/core/process.h
index 7f0a751..3b1291b 100644
--- a/src/core/process.h
+++ b/src/core/process.h
@@ -45,7 +45,7 @@
 
 QT_BEGIN_NAMESPACE_PROCESSMANAGER
 
-class Process : public QObject
+class Q_ADDON_PROCESSMANAGER_EXPORT Process : public QObject
 {
     Q_OBJECT
 
diff --git a/src/core/processbackend.h b/src/core/processbackend.h
index 333f75a..77f05a3 100644
--- a/src/core/processbackend.h
+++ b/src/core/processbackend.h
@@ -46,7 +46,7 @@
 
 QT_BEGIN_NAMESPACE_PROCESSMANAGER
 
-class ProcessBackend : public QObject
+class Q_ADDON_PROCESSMANAGER_EXPORT ProcessBackend : public QObject
 {
     Q_OBJECT
 
diff --git a/src/core/processbackendfactory.h b/src/core/processbackendfactory.h
index 9130ce1..a6b31b8 100644
--- a/src/core/processbackendfactory.h
+++ b/src/core/processbackendfactory.h
@@ -50,7 +50,7 @@ QT_BEGIN_NAMESPACE_PROCESSMANAGER
 class ProcessBackend;
 class ProcessInfo;
 
-class ProcessBackendFactory : public QObject
+class Q_ADDON_PROCESSMANAGER_EXPORT ProcessBackendFactory : public QObject
 {
     Q_OBJECT
 public:
diff --git a/src/core/processbackendmanager.h b/src/core/processbackendmanager.h
index 6c0d993..0c98a83 100644
--- a/src/core/processbackendmanager.h
+++ b/src/core/processbackendmanager.h
@@ -53,7 +53,7 @@ class ProcessInfo;
 class ProcessBackendFactory;
 class ProcessBackend;
 
-class ProcessBackendManager : public QObject
+class Q_ADDON_PROCESSMANAGER_EXPORT ProcessBackendManager : public QObject
 {
     Q_OBJECT
 
diff --git a/src/core/processfrontend.h b/src/core/processfrontend.h
index ffc588e..644d414 100644
--- a/src/core/processfrontend.h
+++ b/src/core/processfrontend.h
@@ -50,7 +50,7 @@ QT_BEGIN_NAMESPACE_PROCESSMANAGER
 
 class ProcessBackend;
 
-class ProcessFrontend : public QObject
+class Q_ADDON_PROCESSMANAGER_EXPORT ProcessFrontend : public QObject
 {
     Q_OBJECT
 
diff --git a/src/core/processinfo.h b/src/core/processinfo.h
index cae23b3..ae8c76c 100644
--- a/src/core/processinfo.h
+++ b/src/core/processinfo.h
@@ -62,7 +62,7 @@ const QLatin1String OomAdjustment = QLatin1String("oomAdjustment");
 const QLatin1String StartOutputPattern = QLatin1String("startOutputPattern");
 }
 
-class ProcessInfo : public QObject
+class Q_ADDON_PROCESSMANAGER_EXPORT ProcessInfo : public QObject
 {
     Q_OBJECT
     Q_PROPERTY(QString identifier READ identifier WRITE setIdentifier NOTIFY identifierChanged)
diff --git a/src/core/processmanager.h b/src/core/processmanager.h
index ff3020a..ad844ca 100644
--- a/src/core/processmanager.h
+++ b/src/core/processmanager.h
@@ -55,7 +55,7 @@ class ProcessBackendFactory;
 class ProcessBackendManager;
 class ProcessBackend;
 
-class ProcessManager : public QObject
+class Q_ADDON_PROCESSMANAGER_EXPORT ProcessManager : public QObject
 {
     Q_OBJECT
     Q_PROPERTY(bool memoryRestricted READ memoryRestricted
diff --git a/src/core/remoteprocessbackend.h b/src/core/remoteprocessbackend.h
index 5a1f71f..c57c492 100644
--- a/src/core/remoteprocessbackend.h
+++ b/src/core/remoteprocessbackend.h
@@ -48,7 +48,7 @@
 
 QT_BEGIN_NAMESPACE_PROCESSMANAGER
 
-class RemoteProcessBackend : public ProcessBackend
+class Q_ADDON_PROCESSMANAGER_EXPORT RemoteProcessBackend : public ProcessBackend
 {
     Q_OBJECT
 
diff --git a/src/core/remoteprocessbackendfactory.h b/src/core/remoteprocessbackendfactory.h
index 82c4fb0..07e65ce 100644
--- a/src/core/remoteprocessbackendfactory.h
+++ b/src/core/remoteprocessbackendfactory.h
@@ -48,7 +48,7 @@ QT_BEGIN_NAMESPACE_PROCESSMANAGER
 
 class RemoteProcessBackend;
 
-class RemoteProcessBackendFactory : public ProcessBackendFactory
+class Q_ADDON_PROCESSMANAGER_EXPORT RemoteProcessBackendFactory : public ProcessBackendFactory
 {
     Q_OBJECT
 public:
diff --git a/src/launcher/socketlauncher.cpp b/src/core/socketlauncher.cpp
index bb6561f..bb6561f 100644
--- a/src/launcher/socketlauncher.cpp
+++ b/src/core/socketlauncher.cpp
diff --git a/src/launcher/socketlauncher.h b/src/core/socketlauncher.h
index 2d6ac74..5a34740 100644
--- a/src/launcher/socketlauncher.h
+++ b/src/core/socketlauncher.h
@@ -50,7 +50,7 @@ QT_BEGIN_NAMESPACE_PROCESSMANAGER
 
 class LauncherClient;
 
-class SocketLauncher : public ProcessBackendManager {
+class Q_ADDON_PROCESSMANAGER_EXPORT SocketLauncher : public ProcessBackendManager {
     Q_OBJECT
 
 public:
diff --git a/src/core/socketprocessbackendfactory.h b/src/core/socketprocessbackendfactory.h
index ac7ad19..9a54265 100644
--- a/src/core/socketprocessbackendfactory.h
+++ b/src/core/socketprocessbackendfactory.h
@@ -46,7 +46,7 @@ class QLocalSocket;
 
 QT_BEGIN_NAMESPACE_PROCESSMANAGER
 
-class SocketProcessBackendFactory : public RemoteProcessBackendFactory
+class Q_ADDON_PROCESSMANAGER_EXPORT SocketProcessBackendFactory : public RemoteProcessBackendFactory
 {
     Q_OBJECT
 public:
diff --git a/src/core/standardprocessbackend.h b/src/core/standardprocessbackend.h
index 452d192..3862bb6 100644
--- a/src/core/standardprocessbackend.h
+++ b/src/core/standardprocessbackend.h
@@ -46,7 +46,7 @@
 
 QT_BEGIN_NAMESPACE_PROCESSMANAGER
 
-class StandardProcessBackend : public UnixProcessBackend
+class Q_ADDON_PROCESSMANAGER_EXPORT StandardProcessBackend : public UnixProcessBackend
 {
     Q_OBJECT
 
diff --git a/src/core/standardprocessbackendfactory.h b/src/core/standardprocessbackendfactory.h
index 98a7526..2822523 100644
--- a/src/core/standardprocessbackendfactory.h
+++ b/src/core/standardprocessbackendfactory.h
@@ -46,7 +46,7 @@
 
 QT_BEGIN_NAMESPACE_PROCESSMANAGER
 
-class StandardProcessBackendFactory : public ProcessBackendFactory
+class Q_ADDON_PROCESSMANAGER_EXPORT StandardProcessBackendFactory : public ProcessBackendFactory
 {
     Q_OBJECT
 
diff --git a/src/core/unixprocessbackend.h b/src/core/unixprocessbackend.h
index c1a09fe..9177e0f 100644
--- a/src/core/unixprocessbackend.h
+++ b/src/core/unixprocessbackend.h
@@ -47,7 +47,7 @@
 
 QT_BEGIN_NAMESPACE_PROCESSMANAGER
 
-class UnixProcessBackend : public ProcessBackend
+class Q_ADDON_PROCESSMANAGER_EXPORT UnixProcessBackend : public ProcessBackend
 {
     Q_OBJECT
 
diff --git a/src/declarative/declarative-lib.pri b/src/declarative/declarative-lib.pri
index 8c253e8..32b785a 100644
--- a/src/declarative/declarative-lib.pri
+++ b/src/declarative/declarative-lib.pri
@@ -1,4 +1,5 @@
-QT += declarative
+QT += declarative processmanager
+
 CONFIG += network
 
 INCLUDEPATH += $$PWD
diff --git a/src/declarative/declarative.pro b/src/declarative/declarative.pro
index 051ef27..c1c2ff8 100644
--- a/src/declarative/declarative.pro
+++ b/src/declarative/declarative.pro
@@ -1,25 +1,29 @@
 TEMPLATE = lib
-TARGET = processmanager-declarative
+TARGET   = $$QT.processmanagerdeclarative.name
+MODULE   = processmanagerdeclarative
 
-LIBS += -L../core
+load(qt_module)
+load(qt_module_config)
+
+DESTDIR = $$QT.processmanagerdeclarative.libs
+VERSION = $$QT.processmanagerdeclarative.VERSION
+DEFINES += QT_ADDON_PROCESSMANAGER_LIB
+
+CONFIG += module create_prl
+MODULE_PRI = ../../modules/qt_processmanagerdeclarative.pri
 
-include($$PWD/../../config.pri)
-include(../core/core.pri)
 include(declarative-lib.pri)
 
 SOURCES += \
   plugin.cpp
 
-mac:!staticlib {
-    QMAKE_POST_LINK = install_name_tool -id $$PWD/${TARGET} ${TARGET}
-}
+IMPORTNAME = QtAddOnProcessManager
 
-qmldir.path = $$INSTALLBASE/imports/com/nokia/QtProcessManager
+qmldir.path = $$[QT_INSTALL_IMPORTS]/$$IMPORTNAME
 qmldir.files += $$PWD/qmldir
 
-headers.path = $$INSTALLBASE/include/qtprocessmanager
-headers.files = $$HEADERS
-
-target.path = $$INSTALLBASE/lib
+INSTALLS += qmldir
 
-INSTALLS += target headers qmldir
+# XXX will not work on Windows
+system(mkdir -p $$QT_MODULE_IMPORT_BASE/$$IMPORTNAME)
+system(cp qmldir $$QT_MODULE_IMPORT_BASE/$$IMPORTNAME)
diff --git a/src/declarative/declarativeprocess.h b/src/declarative/declarativeprocess.h
index 296ae3e..adec779 100644
--- a/src/declarative/declarativeprocess.h
+++ b/src/declarative/declarativeprocess.h
@@ -7,7 +7,7 @@
 
 #include "processfrontend.h"
 
-class DeclarativeProcess : public ProcessFrontend
+class Q_ADDON_PROCESSMANAGER_EXPORT DeclarativeProcess : public ProcessFrontend
 {
     Q_OBJECT
 
diff --git a/src/declarative/declarativeprocessmanager.h b/src/declarative/declarativeprocessmanager.h
index 51c38ca..be7474b 100644
--- a/src/declarative/declarativeprocessmanager.h
+++ b/src/declarative/declarativeprocessmanager.h
@@ -49,7 +49,8 @@
 
 QT_BEGIN_NAMESPACE_PROCESSMANAGER
 
-class DeclarativeProcessManager : public ProcessManager, public QDeclarativeParserStatus
+class Q_ADDON_PROCESSMANAGER_EXPORT DeclarativeProcessManager : public ProcessManager,
+                                                                public QDeclarativeParserStatus
 {
     Q_OBJECT
     Q_INTERFACES(QDeclarativeParserStatus)
diff --git a/src/declarative/processinfotemplate.h b/src/declarative/processinfotemplate.h
index 0183929..39b036a 100644
--- a/src/declarative/processinfotemplate.h
+++ b/src/declarative/processinfotemplate.h
@@ -51,7 +51,7 @@ QT_BEGIN_NAMESPACE_PROCESSMANAGER
 
 class ProcessInfo;
 
-class ProcessInfoTemplate : public QObject
+class Q_ADDON_PROCESSMANAGER_EXPORT ProcessInfoTemplate : public QObject
 {
     Q_OBJECT
 
diff --git a/src/launcher/launcher-lib.pri b/src/launcher/launcher-lib.pri
deleted file mode 100644
index 23be8fe..0000000
--- a/src/launcher/launcher-lib.pri
+++ /dev/null
@@ -1,14 +0,0 @@
-QT += network
-CONFIG += network
-
-INCLUDEPATH += $$PWD
-
-HEADERS += \
-  $$PWD/launcherclient.h \
-  $$PWD/pipelauncher.h \
-  $$PWD/socketlauncher.h
-
-SOURCES += \
-  $$PWD/launcherclient.cpp \
-  $$PWD/pipelauncher.cpp \
-  $$PWD/socketlauncher.cpp
diff --git a/src/launcher/launcher.pri b/src/launcher/launcher.pri
deleted file mode 100644
index 1a7ddf9..0000000
--- a/src/launcher/launcher.pri
+++ /dev/null
@@ -1,13 +0,0 @@
-include(../core/core.pri)
-
-CONFIG += network
-QT += jsonstream
-
-INCLUDEPATH += $$PWD
-LIBS += -L$$PWD -lprocessmanager-launcher
-
-mac|unix {
-    CONFIG += rpath_libdirs
-    QMAKE_RPATHDIR += $$PWD
-    QMAKE_LFLAGS += "-Wl,-rpath $$PWD"
-}
diff --git a/src/launcher/launcher.pro b/src/launcher/launcher.pro
deleted file mode 100644
index 9070918..0000000
--- a/src/launcher/launcher.pro
+++ /dev/null
@@ -1,20 +0,0 @@
-TEMPLATE = lib
-TARGET = processmanager-launcher
-
-QT += jsonstream
-LIBS += -L../core
-
-include($$PWD/../../config.pri)
-include(../core/core.pri)
-include(launcher-lib.pri)
-
-mac:!staticlib {
-    QMAKE_POST_LINK = install_name_tool -id $$PWD/${TARGET} ${TARGET}
-}
-
-headers.path = $$INSTALLBASE/include/qtprocessmanager
-headers.files = $$HEADERS
-
-target.path = $$INSTALLBASE/lib
-
-INSTALLS += target headers
diff --git a/src/launcher/main.cpp b/src/launcher/main.cpp
deleted file mode 100644
index db32f14..0000000
--- a/src/launcher/main.cpp
+++ /dev/null
@@ -1,53 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** GNU Lesser General Public License Usage
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this
-** file. Please review the following information to ensure the GNU Lesser
-** General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <QCoreApplication>
-#include "socketlauncher.h"
-#include "standardprocessbackendfactory.h"
-
-QT_USE_NAMESPACE_PROCESSMANAGER
-
-int main(int argc, char **argv)
-{
-    QCoreApplication app(argc, argv);
-    SocketLauncher launcher;
-    launcher.addFactory(new StandardProcessBackendFactory);
-    launcher.listen("/tmp/launcher");
-    return app.exec();
-}
diff --git a/src/src.pro b/src/src.pro
index 8daef63..bfe3ffa 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -1,17 +1,4 @@
 TEMPLATE = subdirs
+CONFIG += ordered
 
-module_processmanager_core.subdir = core
-module_processmanager_core.target = module-processmanager-core
-
-module_processmanager_declarative.subdir = declarative
-module_processmanager_declarative.target = module-processmanager-declarative
-module_processmanager_declarative.depends += module-processmanager-core
-
-module_processmanager_launcher.subdir = launcher
-module_processmanager_launcher.target = module-processmanager-launcher
-module_processmanager_launcher.depends += module-processmanager-core
-
-SUBDIRS += \
-  module_processmanager_core \
-  module_processmanager_declarative \
-  module_processmanager_launcher
+SUBDIRS = core declarative