From d79f8c8d2df262a77cdf27f2511022c9fc007517 Mon Sep 17 00:00:00 2001 From: Justin Karneges Date: Thu, 2 Nov 2023 10:50:55 -0700 Subject: [PATCH] rename src/corelib to src/cpp this is preparation for consolidating all C++ code into src/cpp --- .gitignore | 12 ++++++------ package.sh | 1 - src/{corelib => cpp}/bufferlist.cpp | 0 src/{corelib => cpp}/bufferlist.h | 0 src/{corelib => cpp}/callback.h | 0 src/{corelib => cpp}/cors.cpp | 0 src/{corelib => cpp}/cors.h | 0 src/{corelib/corelib.pro => cpp/cpp.pro} | 6 +++--- .../corelib/corelib.pri => cpp/cpp/cpp.pri} | 0 .../corelib/corelib.pro => cpp/cpp/cpp.pro} | 4 ++-- src/{corelib => cpp}/httpheaders.cpp | 0 src/{corelib => cpp}/httpheaders.h | 0 src/{corelib => cpp}/httprequest.h | 0 src/{corelib => cpp}/inspectdata.h | 0 src/{corelib => cpp}/jwt.cpp | 0 src/{corelib => cpp}/jwt.h | 0 src/{corelib => cpp}/layertracker.cpp | 0 src/{corelib => cpp}/layertracker.h | 0 src/{corelib => cpp}/log.cpp | 0 src/{corelib => cpp}/log.h | 0 src/{corelib => cpp}/logutil.cpp | 0 src/{corelib => cpp}/logutil.h | 0 src/{corelib => cpp}/packet/httprequestdata.h | 0 src/{corelib => cpp}/packet/httpresponsedata.h | 0 src/{corelib => cpp}/packet/retryrequestpacket.cpp | 0 src/{corelib => cpp}/packet/retryrequestpacket.h | 0 src/{corelib => cpp}/packet/statspacket.cpp | 0 src/{corelib => cpp}/packet/statspacket.h | 0 src/{corelib => cpp}/packet/wscontrolpacket.cpp | 0 src/{corelib => cpp}/packet/wscontrolpacket.h | 0 src/{corelib => cpp}/packet/zrpcrequestpacket.cpp | 0 src/{corelib => cpp}/packet/zrpcrequestpacket.h | 0 src/{corelib => cpp}/packet/zrpcresponsepacket.cpp | 0 src/{corelib => cpp}/packet/zrpcresponsepacket.h | 0 src/{corelib => cpp}/processquit.cpp | 0 src/{corelib => cpp}/processquit.h | 0 src/{corelib => cpp}/qzmq/.gitignore | 0 src/{corelib => cpp}/qzmq/COPYING | 0 src/{corelib => cpp}/qzmq/README | 0 src/{corelib => cpp}/qzmq/examples/examples.pri | 0 src/{corelib => cpp}/qzmq/examples/examples.pro | 0 .../qzmq/examples/helloclient/helloclient.cpp | 0 .../qzmq/examples/helloclient/helloclient.pro | 0 .../qzmq/examples/helloserver/helloserver.cpp | 0 .../qzmq/examples/helloserver/helloserver.pro | 0 src/{corelib => cpp}/qzmq/qzmq.pro | 0 src/{corelib => cpp}/qzmq/src/qzmqcontext.cpp | 0 src/{corelib => cpp}/qzmq/src/qzmqcontext.h | 0 src/{corelib => cpp}/qzmq/src/qzmqreprouter.cpp | 0 src/{corelib => cpp}/qzmq/src/qzmqreprouter.h | 0 src/{corelib => cpp}/qzmq/src/qzmqreqmessage.h | 0 src/{corelib => cpp}/qzmq/src/qzmqsocket.cpp | 0 src/{corelib => cpp}/qzmq/src/qzmqsocket.h | 0 src/{corelib => cpp}/qzmq/src/qzmqvalve.cpp | 0 src/{corelib => cpp}/qzmq/src/qzmqvalve.h | 0 src/{corelib => cpp}/qzmq/src/src.pri | 0 src/{corelib => cpp}/rtimer.cpp | 0 src/{corelib => cpp}/rtimer.h | 0 src/{corelib => cpp}/settings.cpp | 0 src/{corelib => cpp}/settings.h | 0 src/{corelib => cpp}/simplehttpserver.cpp | 0 src/{corelib => cpp}/simplehttpserver.h | 0 src/{corelib => cpp}/stats.cpp | 0 src/{corelib => cpp}/stats.h | 0 src/{corelib => cpp}/statsmanager.cpp | 0 src/{corelib => cpp}/statsmanager.h | 0 src/{corelib => cpp}/statusreasons.cpp | 0 src/{corelib => cpp}/statusreasons.h | 0 .../tests/httpheaderstest/httpheaderstest.cpp | 0 .../tests/httpheaderstest/httpheaderstest.pro | 0 src/{corelib => cpp}/tests/jwttest/jwttest.cpp | 0 src/{corelib => cpp}/tests/jwttest/jwttest.pro | 0 src/{corelib => cpp}/tests/tests.pri | 4 ++-- src/{corelib => cpp}/tests/tests.pro | 0 src/{corelib => cpp}/timerwheel.cpp | 0 src/{corelib => cpp}/timerwheel.h | 0 src/{corelib => cpp}/tnetstring.cpp | 0 src/{corelib => cpp}/tnetstring.h | 0 src/{corelib => cpp}/uuidutil.cpp | 0 src/{corelib => cpp}/uuidutil.h | 0 src/{corelib => cpp}/websocket.h | 0 src/{corelib => cpp}/wscontrol.h | 0 src/{corelib => cpp}/zhttpmanager.cpp | 0 src/{corelib => cpp}/zhttpmanager.h | 0 src/{corelib => cpp}/zhttprequest.cpp | 0 src/{corelib => cpp}/zhttprequest.h | 0 src/{corelib => cpp}/zhttprequestpacket.cpp | 0 src/{corelib => cpp}/zhttprequestpacket.h | 0 src/{corelib => cpp}/zhttpresponsepacket.cpp | 0 src/{corelib => cpp}/zhttpresponsepacket.h | 0 src/{corelib => cpp}/zrpcmanager.cpp | 0 src/{corelib => cpp}/zrpcmanager.h | 0 src/{corelib => cpp}/zrpcrequest.cpp | 0 src/{corelib => cpp}/zrpcrequest.h | 0 src/{corelib => cpp}/zutil.cpp | 0 src/{corelib => cpp}/zutil.h | 0 src/{corelib => cpp}/zwebsocket.cpp | 0 src/{corelib => cpp}/zwebsocket.h | 0 .../libpushpin-handler/libpushpin-handler.pri | 6 +++--- .../libpushpin-handler/libpushpin-handler.pro | 4 ++-- src/handler/pushpin-handler/pushpin-handler.pri | 6 +++--- src/handler/pushpin-handler/pushpin-handler.pro | 4 ++-- src/handler/tests/tests.pri | 10 +++++----- src/m2adapter/m2adapter.pri | 6 +++--- src/m2adapter/m2adapter.pro | 4 ++-- src/proxy/libpushpin-proxy/libpushpin-proxy.pri | 6 +++--- src/proxy/libpushpin-proxy/libpushpin-proxy.pro | 4 ++-- src/proxy/pushpin-proxy/pushpin-proxy.pri | 6 +++--- src/proxy/pushpin-proxy/pushpin-proxy.pro | 4 ++-- src/proxy/tests/tests.pri | 10 +++++----- src/runner/librunner/librunner.pri | 4 ++-- src/runner/librunner/librunner.pro | 4 ++-- src/runner/runner/runner.pri | 4 ++-- src/runner/runner/runner.pro | 4 ++-- src/runner/tests/tests.pri | 8 ++++---- src/src.pro | 14 +++++++------- 116 files changed, 67 insertions(+), 68 deletions(-) rename src/{corelib => cpp}/bufferlist.cpp (100%) rename src/{corelib => cpp}/bufferlist.h (100%) rename src/{corelib => cpp}/callback.h (100%) rename src/{corelib => cpp}/cors.cpp (100%) rename src/{corelib => cpp}/cors.h (100%) rename src/{corelib/corelib.pro => cpp/cpp.pro} (62%) rename src/{corelib/corelib/corelib.pri => cpp/cpp/cpp.pri} (100%) rename src/{corelib/corelib/corelib.pro => cpp/cpp/cpp.pro} (83%) rename src/{corelib => cpp}/httpheaders.cpp (100%) rename src/{corelib => cpp}/httpheaders.h (100%) rename src/{corelib => cpp}/httprequest.h (100%) rename src/{corelib => cpp}/inspectdata.h (100%) rename src/{corelib => cpp}/jwt.cpp (100%) rename src/{corelib => cpp}/jwt.h (100%) rename src/{corelib => cpp}/layertracker.cpp (100%) rename src/{corelib => cpp}/layertracker.h (100%) rename src/{corelib => cpp}/log.cpp (100%) rename src/{corelib => cpp}/log.h (100%) rename src/{corelib => cpp}/logutil.cpp (100%) rename src/{corelib => cpp}/logutil.h (100%) rename src/{corelib => cpp}/packet/httprequestdata.h (100%) rename src/{corelib => cpp}/packet/httpresponsedata.h (100%) rename src/{corelib => cpp}/packet/retryrequestpacket.cpp (100%) rename src/{corelib => cpp}/packet/retryrequestpacket.h (100%) rename src/{corelib => cpp}/packet/statspacket.cpp (100%) rename src/{corelib => cpp}/packet/statspacket.h (100%) rename src/{corelib => cpp}/packet/wscontrolpacket.cpp (100%) rename src/{corelib => cpp}/packet/wscontrolpacket.h (100%) rename src/{corelib => cpp}/packet/zrpcrequestpacket.cpp (100%) rename src/{corelib => cpp}/packet/zrpcrequestpacket.h (100%) rename src/{corelib => cpp}/packet/zrpcresponsepacket.cpp (100%) rename src/{corelib => cpp}/packet/zrpcresponsepacket.h (100%) rename src/{corelib => cpp}/processquit.cpp (100%) rename src/{corelib => cpp}/processquit.h (100%) rename src/{corelib => cpp}/qzmq/.gitignore (100%) rename src/{corelib => cpp}/qzmq/COPYING (100%) rename src/{corelib => cpp}/qzmq/README (100%) rename src/{corelib => cpp}/qzmq/examples/examples.pri (100%) rename src/{corelib => cpp}/qzmq/examples/examples.pro (100%) rename src/{corelib => cpp}/qzmq/examples/helloclient/helloclient.cpp (100%) rename src/{corelib => cpp}/qzmq/examples/helloclient/helloclient.pro (100%) rename src/{corelib => cpp}/qzmq/examples/helloserver/helloserver.cpp (100%) rename src/{corelib => cpp}/qzmq/examples/helloserver/helloserver.pro (100%) rename src/{corelib => cpp}/qzmq/qzmq.pro (100%) rename src/{corelib => cpp}/qzmq/src/qzmqcontext.cpp (100%) rename src/{corelib => cpp}/qzmq/src/qzmqcontext.h (100%) rename src/{corelib => cpp}/qzmq/src/qzmqreprouter.cpp (100%) rename src/{corelib => cpp}/qzmq/src/qzmqreprouter.h (100%) rename src/{corelib => cpp}/qzmq/src/qzmqreqmessage.h (100%) rename src/{corelib => cpp}/qzmq/src/qzmqsocket.cpp (100%) rename src/{corelib => cpp}/qzmq/src/qzmqsocket.h (100%) rename src/{corelib => cpp}/qzmq/src/qzmqvalve.cpp (100%) rename src/{corelib => cpp}/qzmq/src/qzmqvalve.h (100%) rename src/{corelib => cpp}/qzmq/src/src.pri (100%) rename src/{corelib => cpp}/rtimer.cpp (100%) rename src/{corelib => cpp}/rtimer.h (100%) rename src/{corelib => cpp}/settings.cpp (100%) rename src/{corelib => cpp}/settings.h (100%) rename src/{corelib => cpp}/simplehttpserver.cpp (100%) rename src/{corelib => cpp}/simplehttpserver.h (100%) rename src/{corelib => cpp}/stats.cpp (100%) rename src/{corelib => cpp}/stats.h (100%) rename src/{corelib => cpp}/statsmanager.cpp (100%) rename src/{corelib => cpp}/statsmanager.h (100%) rename src/{corelib => cpp}/statusreasons.cpp (100%) rename src/{corelib => cpp}/statusreasons.h (100%) rename src/{corelib => cpp}/tests/httpheaderstest/httpheaderstest.cpp (100%) rename src/{corelib => cpp}/tests/httpheaderstest/httpheaderstest.pro (100%) rename src/{corelib => cpp}/tests/jwttest/jwttest.cpp (100%) rename src/{corelib => cpp}/tests/jwttest/jwttest.pro (100%) rename src/{corelib => cpp}/tests/tests.pri (81%) rename src/{corelib => cpp}/tests/tests.pro (100%) rename src/{corelib => cpp}/timerwheel.cpp (100%) rename src/{corelib => cpp}/timerwheel.h (100%) rename src/{corelib => cpp}/tnetstring.cpp (100%) rename src/{corelib => cpp}/tnetstring.h (100%) rename src/{corelib => cpp}/uuidutil.cpp (100%) rename src/{corelib => cpp}/uuidutil.h (100%) rename src/{corelib => cpp}/websocket.h (100%) rename src/{corelib => cpp}/wscontrol.h (100%) rename src/{corelib => cpp}/zhttpmanager.cpp (100%) rename src/{corelib => cpp}/zhttpmanager.h (100%) rename src/{corelib => cpp}/zhttprequest.cpp (100%) rename src/{corelib => cpp}/zhttprequest.h (100%) rename src/{corelib => cpp}/zhttprequestpacket.cpp (100%) rename src/{corelib => cpp}/zhttprequestpacket.h (100%) rename src/{corelib => cpp}/zhttpresponsepacket.cpp (100%) rename src/{corelib => cpp}/zhttpresponsepacket.h (100%) rename src/{corelib => cpp}/zrpcmanager.cpp (100%) rename src/{corelib => cpp}/zrpcmanager.h (100%) rename src/{corelib => cpp}/zrpcrequest.cpp (100%) rename src/{corelib => cpp}/zrpcrequest.h (100%) rename src/{corelib => cpp}/zutil.cpp (100%) rename src/{corelib => cpp}/zutil.h (100%) rename src/{corelib => cpp}/zwebsocket.cpp (100%) rename src/{corelib => cpp}/zwebsocket.h (100%) diff --git a/.gitignore b/.gitignore index 3cdbeb81..db8f059b 100644 --- a/.gitignore +++ b/.gitignore @@ -22,12 +22,12 @@ vendor /Makefile /src/config.h /src/Makefile -/src/corelib/Makefile -/src/corelib/corelib/Makefile -/src/corelib/libpushpin-core.a -/src/corelib/tests/Makefile -/src/corelib/tests/*test/Makefile -/src/corelib/tests/*test/*test +/src/cpp/Makefile +/src/cpp/cpp/Makefile +/src/cpp/libpushpin-cpp.a +/src/cpp/tests/Makefile +/src/cpp/tests/*test/Makefile +/src/cpp/tests/*test/*test /src/m2adapter/Makefile /src/proxy/Makefile /src/proxy/libpushpin-proxy/Makefile diff --git a/package.sh b/package.sh index c8500046..1decb8ee 100755 --- a/package.sh +++ b/package.sh @@ -13,7 +13,6 @@ DESTDIR=build/pushpin-$VERSION mkdir -p $DESTDIR cp -a .gitignore build.rs Cargo.lock Cargo.toml CHANGELOG.md configure examples LICENSE pushpin.pro pushpin.qc qcm README.md src tools $DESTDIR -rm -rf $DESTDIR/src/corelib/qzmq/.git $DESTDIR/src/corelib/common/.git sed -i -e "s/^version = .*/version = \"$VERSION\"/g" $DESTDIR/Cargo.toml diff --git a/src/corelib/bufferlist.cpp b/src/cpp/bufferlist.cpp similarity index 100% rename from src/corelib/bufferlist.cpp rename to src/cpp/bufferlist.cpp diff --git a/src/corelib/bufferlist.h b/src/cpp/bufferlist.h similarity index 100% rename from src/corelib/bufferlist.h rename to src/cpp/bufferlist.h diff --git a/src/corelib/callback.h b/src/cpp/callback.h similarity index 100% rename from src/corelib/callback.h rename to src/cpp/callback.h diff --git a/src/corelib/cors.cpp b/src/cpp/cors.cpp similarity index 100% rename from src/corelib/cors.cpp rename to src/cpp/cors.cpp diff --git a/src/corelib/cors.h b/src/cpp/cors.h similarity index 100% rename from src/corelib/cors.h rename to src/cpp/cors.h diff --git a/src/corelib/corelib.pro b/src/cpp/cpp.pro similarity index 62% rename from src/corelib/corelib.pro rename to src/cpp/cpp.pro index 65e540f4..34968b51 100644 --- a/src/corelib/corelib.pro +++ b/src/cpp/cpp.pro @@ -1,11 +1,11 @@ TEMPLATE = subdirs -corelib.subdir = corelib +cpp.subdir = cpp tests.subdir = tests -tests.depends = corelib +tests.depends = cpp tests.CONFIG += no_default_install SUBDIRS += \ - corelib \ + cpp \ tests diff --git a/src/corelib/corelib/corelib.pri b/src/cpp/cpp/cpp.pri similarity index 100% rename from src/corelib/corelib/corelib.pri rename to src/cpp/cpp/cpp.pri diff --git a/src/corelib/corelib/corelib.pro b/src/cpp/cpp/cpp.pro similarity index 83% rename from src/corelib/corelib/corelib.pro rename to src/cpp/cpp/cpp.pro index 46466950..beed813b 100644 --- a/src/corelib/corelib/corelib.pro +++ b/src/cpp/cpp/cpp.pro @@ -3,7 +3,7 @@ CONFIG -= app_bundle CONFIG += staticlib QT -= gui QT += network -TARGET = pushpin-core +TARGET = pushpin-cpp DESTDIR = .. MOC_DIR = $$OUT_PWD/_moc @@ -11,4 +11,4 @@ OBJECTS_DIR = $$OUT_PWD/_obj include($$OUT_PWD/../../rust/lib.pri) include($$OUT_PWD/../../../conf.pri) -include(corelib.pri) +include(cpp.pri) diff --git a/src/corelib/httpheaders.cpp b/src/cpp/httpheaders.cpp similarity index 100% rename from src/corelib/httpheaders.cpp rename to src/cpp/httpheaders.cpp diff --git a/src/corelib/httpheaders.h b/src/cpp/httpheaders.h similarity index 100% rename from src/corelib/httpheaders.h rename to src/cpp/httpheaders.h diff --git a/src/corelib/httprequest.h b/src/cpp/httprequest.h similarity index 100% rename from src/corelib/httprequest.h rename to src/cpp/httprequest.h diff --git a/src/corelib/inspectdata.h b/src/cpp/inspectdata.h similarity index 100% rename from src/corelib/inspectdata.h rename to src/cpp/inspectdata.h diff --git a/src/corelib/jwt.cpp b/src/cpp/jwt.cpp similarity index 100% rename from src/corelib/jwt.cpp rename to src/cpp/jwt.cpp diff --git a/src/corelib/jwt.h b/src/cpp/jwt.h similarity index 100% rename from src/corelib/jwt.h rename to src/cpp/jwt.h diff --git a/src/corelib/layertracker.cpp b/src/cpp/layertracker.cpp similarity index 100% rename from src/corelib/layertracker.cpp rename to src/cpp/layertracker.cpp diff --git a/src/corelib/layertracker.h b/src/cpp/layertracker.h similarity index 100% rename from src/corelib/layertracker.h rename to src/cpp/layertracker.h diff --git a/src/corelib/log.cpp b/src/cpp/log.cpp similarity index 100% rename from src/corelib/log.cpp rename to src/cpp/log.cpp diff --git a/src/corelib/log.h b/src/cpp/log.h similarity index 100% rename from src/corelib/log.h rename to src/cpp/log.h diff --git a/src/corelib/logutil.cpp b/src/cpp/logutil.cpp similarity index 100% rename from src/corelib/logutil.cpp rename to src/cpp/logutil.cpp diff --git a/src/corelib/logutil.h b/src/cpp/logutil.h similarity index 100% rename from src/corelib/logutil.h rename to src/cpp/logutil.h diff --git a/src/corelib/packet/httprequestdata.h b/src/cpp/packet/httprequestdata.h similarity index 100% rename from src/corelib/packet/httprequestdata.h rename to src/cpp/packet/httprequestdata.h diff --git a/src/corelib/packet/httpresponsedata.h b/src/cpp/packet/httpresponsedata.h similarity index 100% rename from src/corelib/packet/httpresponsedata.h rename to src/cpp/packet/httpresponsedata.h diff --git a/src/corelib/packet/retryrequestpacket.cpp b/src/cpp/packet/retryrequestpacket.cpp similarity index 100% rename from src/corelib/packet/retryrequestpacket.cpp rename to src/cpp/packet/retryrequestpacket.cpp diff --git a/src/corelib/packet/retryrequestpacket.h b/src/cpp/packet/retryrequestpacket.h similarity index 100% rename from src/corelib/packet/retryrequestpacket.h rename to src/cpp/packet/retryrequestpacket.h diff --git a/src/corelib/packet/statspacket.cpp b/src/cpp/packet/statspacket.cpp similarity index 100% rename from src/corelib/packet/statspacket.cpp rename to src/cpp/packet/statspacket.cpp diff --git a/src/corelib/packet/statspacket.h b/src/cpp/packet/statspacket.h similarity index 100% rename from src/corelib/packet/statspacket.h rename to src/cpp/packet/statspacket.h diff --git a/src/corelib/packet/wscontrolpacket.cpp b/src/cpp/packet/wscontrolpacket.cpp similarity index 100% rename from src/corelib/packet/wscontrolpacket.cpp rename to src/cpp/packet/wscontrolpacket.cpp diff --git a/src/corelib/packet/wscontrolpacket.h b/src/cpp/packet/wscontrolpacket.h similarity index 100% rename from src/corelib/packet/wscontrolpacket.h rename to src/cpp/packet/wscontrolpacket.h diff --git a/src/corelib/packet/zrpcrequestpacket.cpp b/src/cpp/packet/zrpcrequestpacket.cpp similarity index 100% rename from src/corelib/packet/zrpcrequestpacket.cpp rename to src/cpp/packet/zrpcrequestpacket.cpp diff --git a/src/corelib/packet/zrpcrequestpacket.h b/src/cpp/packet/zrpcrequestpacket.h similarity index 100% rename from src/corelib/packet/zrpcrequestpacket.h rename to src/cpp/packet/zrpcrequestpacket.h diff --git a/src/corelib/packet/zrpcresponsepacket.cpp b/src/cpp/packet/zrpcresponsepacket.cpp similarity index 100% rename from src/corelib/packet/zrpcresponsepacket.cpp rename to src/cpp/packet/zrpcresponsepacket.cpp diff --git a/src/corelib/packet/zrpcresponsepacket.h b/src/cpp/packet/zrpcresponsepacket.h similarity index 100% rename from src/corelib/packet/zrpcresponsepacket.h rename to src/cpp/packet/zrpcresponsepacket.h diff --git a/src/corelib/processquit.cpp b/src/cpp/processquit.cpp similarity index 100% rename from src/corelib/processquit.cpp rename to src/cpp/processquit.cpp diff --git a/src/corelib/processquit.h b/src/cpp/processquit.h similarity index 100% rename from src/corelib/processquit.h rename to src/cpp/processquit.h diff --git a/src/corelib/qzmq/.gitignore b/src/cpp/qzmq/.gitignore similarity index 100% rename from src/corelib/qzmq/.gitignore rename to src/cpp/qzmq/.gitignore diff --git a/src/corelib/qzmq/COPYING b/src/cpp/qzmq/COPYING similarity index 100% rename from src/corelib/qzmq/COPYING rename to src/cpp/qzmq/COPYING diff --git a/src/corelib/qzmq/README b/src/cpp/qzmq/README similarity index 100% rename from src/corelib/qzmq/README rename to src/cpp/qzmq/README diff --git a/src/corelib/qzmq/examples/examples.pri b/src/cpp/qzmq/examples/examples.pri similarity index 100% rename from src/corelib/qzmq/examples/examples.pri rename to src/cpp/qzmq/examples/examples.pri diff --git a/src/corelib/qzmq/examples/examples.pro b/src/cpp/qzmq/examples/examples.pro similarity index 100% rename from src/corelib/qzmq/examples/examples.pro rename to src/cpp/qzmq/examples/examples.pro diff --git a/src/corelib/qzmq/examples/helloclient/helloclient.cpp b/src/cpp/qzmq/examples/helloclient/helloclient.cpp similarity index 100% rename from src/corelib/qzmq/examples/helloclient/helloclient.cpp rename to src/cpp/qzmq/examples/helloclient/helloclient.cpp diff --git a/src/corelib/qzmq/examples/helloclient/helloclient.pro b/src/cpp/qzmq/examples/helloclient/helloclient.pro similarity index 100% rename from src/corelib/qzmq/examples/helloclient/helloclient.pro rename to src/cpp/qzmq/examples/helloclient/helloclient.pro diff --git a/src/corelib/qzmq/examples/helloserver/helloserver.cpp b/src/cpp/qzmq/examples/helloserver/helloserver.cpp similarity index 100% rename from src/corelib/qzmq/examples/helloserver/helloserver.cpp rename to src/cpp/qzmq/examples/helloserver/helloserver.cpp diff --git a/src/corelib/qzmq/examples/helloserver/helloserver.pro b/src/cpp/qzmq/examples/helloserver/helloserver.pro similarity index 100% rename from src/corelib/qzmq/examples/helloserver/helloserver.pro rename to src/cpp/qzmq/examples/helloserver/helloserver.pro diff --git a/src/corelib/qzmq/qzmq.pro b/src/cpp/qzmq/qzmq.pro similarity index 100% rename from src/corelib/qzmq/qzmq.pro rename to src/cpp/qzmq/qzmq.pro diff --git a/src/corelib/qzmq/src/qzmqcontext.cpp b/src/cpp/qzmq/src/qzmqcontext.cpp similarity index 100% rename from src/corelib/qzmq/src/qzmqcontext.cpp rename to src/cpp/qzmq/src/qzmqcontext.cpp diff --git a/src/corelib/qzmq/src/qzmqcontext.h b/src/cpp/qzmq/src/qzmqcontext.h similarity index 100% rename from src/corelib/qzmq/src/qzmqcontext.h rename to src/cpp/qzmq/src/qzmqcontext.h diff --git a/src/corelib/qzmq/src/qzmqreprouter.cpp b/src/cpp/qzmq/src/qzmqreprouter.cpp similarity index 100% rename from src/corelib/qzmq/src/qzmqreprouter.cpp rename to src/cpp/qzmq/src/qzmqreprouter.cpp diff --git a/src/corelib/qzmq/src/qzmqreprouter.h b/src/cpp/qzmq/src/qzmqreprouter.h similarity index 100% rename from src/corelib/qzmq/src/qzmqreprouter.h rename to src/cpp/qzmq/src/qzmqreprouter.h diff --git a/src/corelib/qzmq/src/qzmqreqmessage.h b/src/cpp/qzmq/src/qzmqreqmessage.h similarity index 100% rename from src/corelib/qzmq/src/qzmqreqmessage.h rename to src/cpp/qzmq/src/qzmqreqmessage.h diff --git a/src/corelib/qzmq/src/qzmqsocket.cpp b/src/cpp/qzmq/src/qzmqsocket.cpp similarity index 100% rename from src/corelib/qzmq/src/qzmqsocket.cpp rename to src/cpp/qzmq/src/qzmqsocket.cpp diff --git a/src/corelib/qzmq/src/qzmqsocket.h b/src/cpp/qzmq/src/qzmqsocket.h similarity index 100% rename from src/corelib/qzmq/src/qzmqsocket.h rename to src/cpp/qzmq/src/qzmqsocket.h diff --git a/src/corelib/qzmq/src/qzmqvalve.cpp b/src/cpp/qzmq/src/qzmqvalve.cpp similarity index 100% rename from src/corelib/qzmq/src/qzmqvalve.cpp rename to src/cpp/qzmq/src/qzmqvalve.cpp diff --git a/src/corelib/qzmq/src/qzmqvalve.h b/src/cpp/qzmq/src/qzmqvalve.h similarity index 100% rename from src/corelib/qzmq/src/qzmqvalve.h rename to src/cpp/qzmq/src/qzmqvalve.h diff --git a/src/corelib/qzmq/src/src.pri b/src/cpp/qzmq/src/src.pri similarity index 100% rename from src/corelib/qzmq/src/src.pri rename to src/cpp/qzmq/src/src.pri diff --git a/src/corelib/rtimer.cpp b/src/cpp/rtimer.cpp similarity index 100% rename from src/corelib/rtimer.cpp rename to src/cpp/rtimer.cpp diff --git a/src/corelib/rtimer.h b/src/cpp/rtimer.h similarity index 100% rename from src/corelib/rtimer.h rename to src/cpp/rtimer.h diff --git a/src/corelib/settings.cpp b/src/cpp/settings.cpp similarity index 100% rename from src/corelib/settings.cpp rename to src/cpp/settings.cpp diff --git a/src/corelib/settings.h b/src/cpp/settings.h similarity index 100% rename from src/corelib/settings.h rename to src/cpp/settings.h diff --git a/src/corelib/simplehttpserver.cpp b/src/cpp/simplehttpserver.cpp similarity index 100% rename from src/corelib/simplehttpserver.cpp rename to src/cpp/simplehttpserver.cpp diff --git a/src/corelib/simplehttpserver.h b/src/cpp/simplehttpserver.h similarity index 100% rename from src/corelib/simplehttpserver.h rename to src/cpp/simplehttpserver.h diff --git a/src/corelib/stats.cpp b/src/cpp/stats.cpp similarity index 100% rename from src/corelib/stats.cpp rename to src/cpp/stats.cpp diff --git a/src/corelib/stats.h b/src/cpp/stats.h similarity index 100% rename from src/corelib/stats.h rename to src/cpp/stats.h diff --git a/src/corelib/statsmanager.cpp b/src/cpp/statsmanager.cpp similarity index 100% rename from src/corelib/statsmanager.cpp rename to src/cpp/statsmanager.cpp diff --git a/src/corelib/statsmanager.h b/src/cpp/statsmanager.h similarity index 100% rename from src/corelib/statsmanager.h rename to src/cpp/statsmanager.h diff --git a/src/corelib/statusreasons.cpp b/src/cpp/statusreasons.cpp similarity index 100% rename from src/corelib/statusreasons.cpp rename to src/cpp/statusreasons.cpp diff --git a/src/corelib/statusreasons.h b/src/cpp/statusreasons.h similarity index 100% rename from src/corelib/statusreasons.h rename to src/cpp/statusreasons.h diff --git a/src/corelib/tests/httpheaderstest/httpheaderstest.cpp b/src/cpp/tests/httpheaderstest/httpheaderstest.cpp similarity index 100% rename from src/corelib/tests/httpheaderstest/httpheaderstest.cpp rename to src/cpp/tests/httpheaderstest/httpheaderstest.cpp diff --git a/src/corelib/tests/httpheaderstest/httpheaderstest.pro b/src/cpp/tests/httpheaderstest/httpheaderstest.pro similarity index 100% rename from src/corelib/tests/httpheaderstest/httpheaderstest.pro rename to src/cpp/tests/httpheaderstest/httpheaderstest.pro diff --git a/src/corelib/tests/jwttest/jwttest.cpp b/src/cpp/tests/jwttest/jwttest.cpp similarity index 100% rename from src/corelib/tests/jwttest/jwttest.cpp rename to src/cpp/tests/jwttest/jwttest.cpp diff --git a/src/corelib/tests/jwttest/jwttest.pro b/src/cpp/tests/jwttest/jwttest.pro similarity index 100% rename from src/corelib/tests/jwttest/jwttest.pro rename to src/cpp/tests/jwttest/jwttest.pro diff --git a/src/corelib/tests/tests.pri b/src/cpp/tests/tests.pri similarity index 81% rename from src/corelib/tests/tests.pri rename to src/cpp/tests/tests.pri index 5b3c746f..44382005 100644 --- a/src/corelib/tests/tests.pri +++ b/src/cpp/tests/tests.pri @@ -8,8 +8,8 @@ SRC_DIR = $$PWD/.. QZMQ_DIR = $$SRC_DIR/qzmq RUST_DIR = $$SRC_DIR/../rust -LIBS += -L$$SRC_DIR -lpushpin-core -PRE_TARGETDEPS += $$PWD/../libpushpin-core.a +LIBS += -L$$SRC_DIR -lpushpin-cpp +PRE_TARGETDEPS += $$PWD/../libpushpin-cpp.a include($$PWD/../../rust/lib.pri) include($$PWD/../../../conf.pri) diff --git a/src/corelib/tests/tests.pro b/src/cpp/tests/tests.pro similarity index 100% rename from src/corelib/tests/tests.pro rename to src/cpp/tests/tests.pro diff --git a/src/corelib/timerwheel.cpp b/src/cpp/timerwheel.cpp similarity index 100% rename from src/corelib/timerwheel.cpp rename to src/cpp/timerwheel.cpp diff --git a/src/corelib/timerwheel.h b/src/cpp/timerwheel.h similarity index 100% rename from src/corelib/timerwheel.h rename to src/cpp/timerwheel.h diff --git a/src/corelib/tnetstring.cpp b/src/cpp/tnetstring.cpp similarity index 100% rename from src/corelib/tnetstring.cpp rename to src/cpp/tnetstring.cpp diff --git a/src/corelib/tnetstring.h b/src/cpp/tnetstring.h similarity index 100% rename from src/corelib/tnetstring.h rename to src/cpp/tnetstring.h diff --git a/src/corelib/uuidutil.cpp b/src/cpp/uuidutil.cpp similarity index 100% rename from src/corelib/uuidutil.cpp rename to src/cpp/uuidutil.cpp diff --git a/src/corelib/uuidutil.h b/src/cpp/uuidutil.h similarity index 100% rename from src/corelib/uuidutil.h rename to src/cpp/uuidutil.h diff --git a/src/corelib/websocket.h b/src/cpp/websocket.h similarity index 100% rename from src/corelib/websocket.h rename to src/cpp/websocket.h diff --git a/src/corelib/wscontrol.h b/src/cpp/wscontrol.h similarity index 100% rename from src/corelib/wscontrol.h rename to src/cpp/wscontrol.h diff --git a/src/corelib/zhttpmanager.cpp b/src/cpp/zhttpmanager.cpp similarity index 100% rename from src/corelib/zhttpmanager.cpp rename to src/cpp/zhttpmanager.cpp diff --git a/src/corelib/zhttpmanager.h b/src/cpp/zhttpmanager.h similarity index 100% rename from src/corelib/zhttpmanager.h rename to src/cpp/zhttpmanager.h diff --git a/src/corelib/zhttprequest.cpp b/src/cpp/zhttprequest.cpp similarity index 100% rename from src/corelib/zhttprequest.cpp rename to src/cpp/zhttprequest.cpp diff --git a/src/corelib/zhttprequest.h b/src/cpp/zhttprequest.h similarity index 100% rename from src/corelib/zhttprequest.h rename to src/cpp/zhttprequest.h diff --git a/src/corelib/zhttprequestpacket.cpp b/src/cpp/zhttprequestpacket.cpp similarity index 100% rename from src/corelib/zhttprequestpacket.cpp rename to src/cpp/zhttprequestpacket.cpp diff --git a/src/corelib/zhttprequestpacket.h b/src/cpp/zhttprequestpacket.h similarity index 100% rename from src/corelib/zhttprequestpacket.h rename to src/cpp/zhttprequestpacket.h diff --git a/src/corelib/zhttpresponsepacket.cpp b/src/cpp/zhttpresponsepacket.cpp similarity index 100% rename from src/corelib/zhttpresponsepacket.cpp rename to src/cpp/zhttpresponsepacket.cpp diff --git a/src/corelib/zhttpresponsepacket.h b/src/cpp/zhttpresponsepacket.h similarity index 100% rename from src/corelib/zhttpresponsepacket.h rename to src/cpp/zhttpresponsepacket.h diff --git a/src/corelib/zrpcmanager.cpp b/src/cpp/zrpcmanager.cpp similarity index 100% rename from src/corelib/zrpcmanager.cpp rename to src/cpp/zrpcmanager.cpp diff --git a/src/corelib/zrpcmanager.h b/src/cpp/zrpcmanager.h similarity index 100% rename from src/corelib/zrpcmanager.h rename to src/cpp/zrpcmanager.h diff --git a/src/corelib/zrpcrequest.cpp b/src/cpp/zrpcrequest.cpp similarity index 100% rename from src/corelib/zrpcrequest.cpp rename to src/cpp/zrpcrequest.cpp diff --git a/src/corelib/zrpcrequest.h b/src/cpp/zrpcrequest.h similarity index 100% rename from src/corelib/zrpcrequest.h rename to src/cpp/zrpcrequest.h diff --git a/src/corelib/zutil.cpp b/src/cpp/zutil.cpp similarity index 100% rename from src/corelib/zutil.cpp rename to src/cpp/zutil.cpp diff --git a/src/corelib/zutil.h b/src/cpp/zutil.h similarity index 100% rename from src/corelib/zutil.h rename to src/cpp/zutil.h diff --git a/src/corelib/zwebsocket.cpp b/src/cpp/zwebsocket.cpp similarity index 100% rename from src/corelib/zwebsocket.cpp rename to src/cpp/zwebsocket.cpp diff --git a/src/corelib/zwebsocket.h b/src/cpp/zwebsocket.h similarity index 100% rename from src/corelib/zwebsocket.h rename to src/cpp/zwebsocket.h diff --git a/src/handler/libpushpin-handler/libpushpin-handler.pri b/src/handler/libpushpin-handler/libpushpin-handler.pri index 608e409b..b8854e56 100644 --- a/src/handler/libpushpin-handler/libpushpin-handler.pri +++ b/src/handler/libpushpin-handler/libpushpin-handler.pri @@ -3,11 +3,11 @@ QMAKE_CFLAGS += $$(CFLAGS) QMAKE_LFLAGS += $$(LDFLAGS) SRC_DIR = $$PWD/.. -CORE_DIR = $$PWD/../../corelib -QZMQ_DIR = $$CORE_DIR/qzmq +CPP_DIR = $$PWD/../../cpp +QZMQ_DIR = $$CPP_DIR/qzmq INCLUDEPATH += $$SRC_DIR -INCLUDEPATH += $$CORE_DIR +INCLUDEPATH += $$CPP_DIR INCLUDEPATH += $$QZMQ_DIR/src diff --git a/src/handler/libpushpin-handler/libpushpin-handler.pro b/src/handler/libpushpin-handler/libpushpin-handler.pro index ebd3f760..d050da2e 100644 --- a/src/handler/libpushpin-handler/libpushpin-handler.pro +++ b/src/handler/libpushpin-handler/libpushpin-handler.pro @@ -9,8 +9,8 @@ DESTDIR = .. MOC_DIR = $$OUT_PWD/_moc OBJECTS_DIR = $$OUT_PWD/_obj -LIBS += -L$$PWD/../../corelib -lpushpin-core -PRE_TARGETDEPS += $$PWD/../../corelib/libpushpin-core.a +LIBS += -L$$PWD/../../cpp -lpushpin-cpp +PRE_TARGETDEPS += $$PWD/../../cpp/libpushpin-cpp.a include($$OUT_PWD/../../rust/lib.pri) include($$OUT_PWD/../../../conf.pri) diff --git a/src/handler/pushpin-handler/pushpin-handler.pri b/src/handler/pushpin-handler/pushpin-handler.pri index 5e8dbd3a..88fca2a1 100644 --- a/src/handler/pushpin-handler/pushpin-handler.pri +++ b/src/handler/pushpin-handler/pushpin-handler.pri @@ -3,11 +3,11 @@ QMAKE_CFLAGS += $$(CFLAGS) QMAKE_LFLAGS += $$(LDFLAGS) SRC_DIR = $$PWD/.. -CORE_DIR = $$PWD/../../corelib -QZMQ_DIR = $$CORE_DIR/qzmq +CPP_DIR = $$PWD/../../cpp +QZMQ_DIR = $$CPP_DIR/qzmq INCLUDEPATH += $$SRC_DIR -INCLUDEPATH += $$CORE_DIR +INCLUDEPATH += $$CPP_DIR INCLUDEPATH += $$QZMQ_DIR/src DEFINES += NO_IRISNET diff --git a/src/handler/pushpin-handler/pushpin-handler.pro b/src/handler/pushpin-handler/pushpin-handler.pro index bc4961d6..6f56cb55 100644 --- a/src/handler/pushpin-handler/pushpin-handler.pro +++ b/src/handler/pushpin-handler/pushpin-handler.pro @@ -10,8 +10,8 @@ OBJECTS_DIR = $$OUT_PWD/_obj LIBS += -L$$PWD/.. -lpushpin-handler PRE_TARGETDEPS += $$PWD/../libpushpin-handler.a -LIBS += -L$$PWD/../../corelib -lpushpin-core -PRE_TARGETDEPS += $$PWD/../../corelib/libpushpin-core.a +LIBS += -L$$PWD/../../cpp -lpushpin-cpp +PRE_TARGETDEPS += $$PWD/../../cpp/libpushpin-cpp.a include($$OUT_PWD/../../rust/lib.pri) include($$OUT_PWD/../../../conf.pri) diff --git a/src/handler/tests/tests.pri b/src/handler/tests/tests.pri index e8ff8994..fb017213 100644 --- a/src/handler/tests/tests.pri +++ b/src/handler/tests/tests.pri @@ -5,20 +5,20 @@ QT *= network testlib TESTS_DIR = $$PWD SRC_DIR = $$PWD/.. -CORE_DIR = $$PWD/../../corelib -QZMQ_DIR = $$CORE_DIR/qzmq +CPP_DIR = $$PWD/../../cpp +QZMQ_DIR = $$CPP_DIR/qzmq LIBS += -L$$SRC_DIR -lpushpin-handler PRE_TARGETDEPS += $$PWD/../libpushpin-handler.a -LIBS += -L$$PWD/../../corelib -lpushpin-core -PRE_TARGETDEPS += $$PWD/../../corelib/libpushpin-core.a +LIBS += -L$$PWD/../../cpp -lpushpin-cpp +PRE_TARGETDEPS += $$PWD/../../cpp/libpushpin-cpp.a include($$PWD/../../rust/lib.pri) include($$PWD/../../../conf.pri) INCLUDEPATH += $$SRC_DIR -INCLUDEPATH += $$CORE_DIR +INCLUDEPATH += $$CPP_DIR INCLUDEPATH += $$QZMQ_DIR/src DEFINES += NO_IRISNET diff --git a/src/m2adapter/m2adapter.pri b/src/m2adapter/m2adapter.pri index 732273db..15f9bc41 100644 --- a/src/m2adapter/m2adapter.pri +++ b/src/m2adapter/m2adapter.pri @@ -1,7 +1,7 @@ -CORE_DIR = $$PWD/../corelib -QZMQ_DIR = $$PWD/../corelib/qzmq +CPP_DIR = $$PWD/../cpp +QZMQ_DIR = $$PWD/../cpp/qzmq -INCLUDEPATH += $$CORE_DIR +INCLUDEPATH += $$CPP_DIR INCLUDEPATH += $$QZMQ_DIR/src diff --git a/src/m2adapter/m2adapter.pro b/src/m2adapter/m2adapter.pro index dc7e3252..cfbe5ff0 100644 --- a/src/m2adapter/m2adapter.pro +++ b/src/m2adapter/m2adapter.pro @@ -8,8 +8,8 @@ DESTDIR = ../../bin MOC_DIR = $$OUT_PWD/_moc OBJECTS_DIR = $$OUT_PWD/_obj -LIBS += -L$$PWD/../corelib -lpushpin-core -PRE_TARGETDEPS += $$PWD/../corelib/libpushpin-core.a +LIBS += -L$$PWD/../cpp -lpushpin-cpp +PRE_TARGETDEPS += $$PWD/../cpp/libpushpin-cpp.a include($$OUT_PWD/../rust/lib.pri) include($$OUT_PWD/../../conf.pri) diff --git a/src/proxy/libpushpin-proxy/libpushpin-proxy.pri b/src/proxy/libpushpin-proxy/libpushpin-proxy.pri index 001e29ac..3b43247c 100644 --- a/src/proxy/libpushpin-proxy/libpushpin-proxy.pri +++ b/src/proxy/libpushpin-proxy/libpushpin-proxy.pri @@ -3,12 +3,12 @@ QMAKE_CFLAGS += $$(CFLAGS) QMAKE_LFLAGS += $$(LDFLAGS) SRC_DIR = $$PWD/.. -CORE_DIR = $$PWD/../../corelib -QZMQ_DIR = $$CORE_DIR/qzmq +CPP_DIR = $$PWD/../../cpp +QZMQ_DIR = $$CPP_DIR/qzmq RUST_DIR = $$SRC_DIR/../rust INCLUDEPATH += $$SRC_DIR -INCLUDEPATH += $$CORE_DIR +INCLUDEPATH += $$CPP_DIR INCLUDEPATH += $$QZMQ_DIR/src diff --git a/src/proxy/libpushpin-proxy/libpushpin-proxy.pro b/src/proxy/libpushpin-proxy/libpushpin-proxy.pro index fbd9b166..c2a861a8 100644 --- a/src/proxy/libpushpin-proxy/libpushpin-proxy.pro +++ b/src/proxy/libpushpin-proxy/libpushpin-proxy.pro @@ -9,8 +9,8 @@ DESTDIR = .. MOC_DIR = $$OUT_PWD/_moc OBJECTS_DIR = $$OUT_PWD/_obj -LIBS += -L$$PWD/../../corelib -lpushpin-core -PRE_TARGETDEPS += $$PWD/../../corelib/libpushpin-core.a +LIBS += -L$$PWD/../../cpp -lpushpin-cpp +PRE_TARGETDEPS += $$PWD/../../cpp/libpushpin-cpp.a include($$OUT_PWD/../../rust/lib.pri) include($$OUT_PWD/../../../conf.pri) diff --git a/src/proxy/pushpin-proxy/pushpin-proxy.pri b/src/proxy/pushpin-proxy/pushpin-proxy.pri index 5efb1008..2cddb3c2 100644 --- a/src/proxy/pushpin-proxy/pushpin-proxy.pri +++ b/src/proxy/pushpin-proxy/pushpin-proxy.pri @@ -3,12 +3,12 @@ QMAKE_CFLAGS += $$(CFLAGS) QMAKE_LFLAGS += $$(LDFLAGS) SRC_DIR = $$PWD/.. -CORE_DIR = $$PWD/../../corelib -QZMQ_DIR = $$CORE_DIR/qzmq +CPP_DIR = $$PWD/../../cpp +QZMQ_DIR = $$CPP_DIR/qzmq RUST_DIR = $$SRC_DIR/../rust INCLUDEPATH += $$SRC_DIR -INCLUDEPATH += $$CORE_DIR +INCLUDEPATH += $$CPP_DIR INCLUDEPATH += $$QZMQ_DIR/src DEFINES += NO_IRISNET diff --git a/src/proxy/pushpin-proxy/pushpin-proxy.pro b/src/proxy/pushpin-proxy/pushpin-proxy.pro index d67fe58a..a63e96b0 100644 --- a/src/proxy/pushpin-proxy/pushpin-proxy.pro +++ b/src/proxy/pushpin-proxy/pushpin-proxy.pro @@ -11,8 +11,8 @@ OBJECTS_DIR = $$OUT_PWD/_obj LIBS += -L$$PWD/.. -lpushpin-proxy PRE_TARGETDEPS += $$PWD/../libpushpin-proxy.a -LIBS += -L$$PWD/../../corelib -lpushpin-core -PRE_TARGETDEPS += $$PWD/../../corelib/libpushpin-core.a +LIBS += -L$$PWD/../../cpp -lpushpin-cpp +PRE_TARGETDEPS += $$PWD/../../cpp/libpushpin-cpp.a include($$OUT_PWD/../../rust/lib.pri) include($$OUT_PWD/../../../conf.pri) diff --git a/src/proxy/tests/tests.pri b/src/proxy/tests/tests.pri index 17238677..c66651ea 100644 --- a/src/proxy/tests/tests.pri +++ b/src/proxy/tests/tests.pri @@ -5,21 +5,21 @@ QT *= network testlib TESTS_DIR = $$PWD SRC_DIR = $$PWD/.. -CORE_DIR = $$PWD/../../corelib -QZMQ_DIR = $$CORE_DIR/qzmq +CPP_DIR = $$PWD/../../cpp +QZMQ_DIR = $$CPP_DIR/qzmq RUST_DIR = $$SRC_DIR/../rust LIBS += -L$$SRC_DIR -lpushpin-proxy PRE_TARGETDEPS += $$PWD/../libpushpin-proxy.a -LIBS += -L$$PWD/../../corelib -lpushpin-core -PRE_TARGETDEPS += $$PWD/../../corelib/libpushpin-core.a +LIBS += -L$$PWD/../../cpp -lpushpin-cpp +PRE_TARGETDEPS += $$PWD/../../cpp/libpushpin-cpp.a include($$PWD/../../rust/lib.pri) include($$PWD/../../../conf.pri) INCLUDEPATH += $$SRC_DIR -INCLUDEPATH += $$CORE_DIR +INCLUDEPATH += $$CPP_DIR INCLUDEPATH += $$QZMQ_DIR/src DEFINES += NO_IRISNET diff --git a/src/runner/librunner/librunner.pri b/src/runner/librunner/librunner.pri index e1eef590..2c1510d6 100644 --- a/src/runner/librunner/librunner.pri +++ b/src/runner/librunner/librunner.pri @@ -3,10 +3,10 @@ QMAKE_CFLAGS += $$(CFLAGS) QMAKE_LFLAGS += $$(LDFLAGS) SRC_DIR = $$PWD/.. -CORE_DIR = $$PWD/../../corelib +CPP_DIR = $$PWD/../../cpp INCLUDEPATH += $$SRC_DIR -INCLUDEPATH += $$CORE_DIR +INCLUDEPATH += $$CPP_DIR DEFINES += NO_IRISNET diff --git a/src/runner/librunner/librunner.pro b/src/runner/librunner/librunner.pro index 71a9e961..52e1660e 100644 --- a/src/runner/librunner/librunner.pro +++ b/src/runner/librunner/librunner.pro @@ -9,8 +9,8 @@ DESTDIR = .. MOC_DIR = $$OUT_PWD/_moc OBJECTS_DIR = $$OUT_PWD/_obj -LIBS += -L$$PWD/../../corelib -lpushpin-core -PRE_TARGETDEPS += $$PWD/../../corelib/libpushpin-core.a +LIBS += -L$$PWD/../../cpp -lpushpin-cpp +PRE_TARGETDEPS += $$PWD/../../cpp/libpushpin-cpp.a include($$OUT_PWD/../../../conf.pri) include(librunner.pri) diff --git a/src/runner/runner/runner.pri b/src/runner/runner/runner.pri index 688378ff..631a4d0f 100644 --- a/src/runner/runner/runner.pri +++ b/src/runner/runner/runner.pri @@ -3,10 +3,10 @@ QMAKE_CFLAGS += $$(CFLAGS) QMAKE_LFLAGS += $$(LDFLAGS) SRC_DIR = $$PWD/.. -CORE_DIR = $$PWD/../../corelib +CPP_DIR = $$PWD/../../cpp INCLUDEPATH += $$SRC_DIR -INCLUDEPATH += $$CORE_DIR +INCLUDEPATH += $$CPP_DIR DEFINES += NO_IRISNET diff --git a/src/runner/runner/runner.pro b/src/runner/runner/runner.pro index e35812d7..4fcbf1a8 100644 --- a/src/runner/runner/runner.pro +++ b/src/runner/runner/runner.pro @@ -11,8 +11,8 @@ OBJECTS_DIR = $$OUT_PWD/_obj LIBS += -L$$PWD/.. -lrunner PRE_TARGETDEPS += $$PWD/../librunner.a -LIBS += -L$$PWD/../../corelib -lpushpin-core -PRE_TARGETDEPS += $$PWD/../../corelib/libpushpin-core.a +LIBS += -L$$PWD/../../cpp -lpushpin-cpp +PRE_TARGETDEPS += $$PWD/../../cpp/libpushpin-cpp.a include($$OUT_PWD/../../../conf.pri) include(runner.pri) diff --git a/src/runner/tests/tests.pri b/src/runner/tests/tests.pri index abeb0d85..6034794c 100644 --- a/src/runner/tests/tests.pri +++ b/src/runner/tests/tests.pri @@ -5,17 +5,17 @@ QT *= network testlib TESTS_DIR = $$PWD SRC_DIR = $$PWD/.. -CORE_DIR = $$PWD/../../corelib +CPP_DIR = $$PWD/../../cpp LIBS += -L$$SRC_DIR -lrunner PRE_TARGETDEPS += $$PWD/../librunner.a -LIBS += -L$$PWD/../../corelib -lpushpin-core -PRE_TARGETDEPS += $$PWD/../../corelib/libpushpin-core.a +LIBS += -L$$PWD/../../cpp -lpushpin-cpp +PRE_TARGETDEPS += $$PWD/../../cpp/libpushpin-cpp.a include($$PWD/../../../conf.pri) INCLUDEPATH += $$SRC_DIR -INCLUDEPATH += $$CORE_DIR +INCLUDEPATH += $$CPP_DIR DEFINES += NO_IRISNET diff --git a/src/src.pro b/src/src.pro index eb630c44..772684c5 100644 --- a/src/src.pro +++ b/src/src.pro @@ -4,26 +4,26 @@ include($$OUT_PWD/../conf.pri) rust.subdir = rust -corelib.subdir = corelib -corelib.depends = rust +cpp.subdir = cpp +cpp.depends = rust m2adapter.subdir = m2adapter -m2adapter.depends = corelib +m2adapter.depends = cpp proxy.subdir = proxy -proxy.depends = corelib +proxy.depends = cpp handler.subdir = handler -handler.depends = corelib +handler.depends = cpp runner.subdir = runner -runner.depends = corelib +runner.depends = cpp pushpin.subdir = pushpin SUBDIRS += \ rust \ - corelib \ + cpp \ m2adapter \ proxy \ handler \