From 50e29703dc65e19abae7cd049ae3d66bb5e7e74b Mon Sep 17 00:00:00 2001 From: mutouyun Date: Sat, 8 Jun 2019 20:47:42 +0800 Subject: [PATCH] modify pro files --- .travis.yml | 3 +- build/{ => chat}/chat.pro | 6 ++-- build/cpp-ipc.pro | 4 +++ build/ipc.pro | 72 --------------------------------------- build/ipc/ipc.pro | 72 +++++++++++++++++++++++++++++++++++++++ build/{ => test}/test.pro | 24 ++++++------- 6 files changed, 92 insertions(+), 89 deletions(-) rename build/{ => chat}/chat.pro (74%) create mode 100644 build/cpp-ipc.pro delete mode 100644 build/ipc.pro create mode 100644 build/ipc/ipc.pro rename build/{ => test}/test.pro (55%) diff --git a/.travis.yml b/.travis.yml index 43e405d..70f9999 100644 --- a/.travis.yml +++ b/.travis.yml @@ -31,8 +31,7 @@ script: make; export IPC_TARGET=test-ipc; else - qmake -o Makefile ipc.pro QMAKE_CC=$CC QMAKE_CXX=$CXX QMAKE_LINK=$CXX QMAKE_CXXFLAGS+=-std=gnu++1z; - qmake -o MakefileTest test.pro QMAKE_CC=$CC QMAKE_CXX=$CXX QMAKE_LINK=$CXX QMAKE_CXXFLAGS+=-std=gnu++1z; + qmake -o Makefile cpp-ipc.pro QMAKE_CC=$CC QMAKE_CXX=$CXX QMAKE_LINK=$CXX QMAKE_CXXFLAGS+=-std=gnu++1z; make; make -f MakefileTest; export IPC_TARGET=test; diff --git a/build/chat.pro b/build/chat/chat.pro similarity index 74% rename from build/chat.pro rename to build/chat/chat.pro index eff70a8..fe38574 100644 --- a/build/chat.pro +++ b/build/chat/chat.pro @@ -5,13 +5,13 @@ CONFIG += c++14 c++1z # may be useless CONFIG -= app_bundle CONFIG -= qt -DESTDIR = ../output +DESTDIR = ../../output INCLUDEPATH += \ - ../include + ../../include SOURCES += \ - ../demo/chat/main.cpp + ../../demo/chat/main.cpp LIBS += \ -L$${DESTDIR} -lipc diff --git a/build/cpp-ipc.pro b/build/cpp-ipc.pro new file mode 100644 index 0000000..731f38b --- /dev/null +++ b/build/cpp-ipc.pro @@ -0,0 +1,4 @@ +TEMPLATE = subdirs +SUBDIRS = ipc test chat +test.depends = ipc +chat.depends = ipc \ No newline at end of file diff --git a/build/ipc.pro b/build/ipc.pro deleted file mode 100644 index ddfa35a..0000000 --- a/build/ipc.pro +++ /dev/null @@ -1,72 +0,0 @@ -TEMPLATE = lib -TARGET = ipc - -CONFIG -= qt -CONFIG += c++14 c++1z # may be useless - -DEFINES += __IPC_LIBRARY__ -DESTDIR = ../output - -INCLUDEPATH += \ - ../include \ - ../src - -HEADERS += \ - ../include/export.h \ - ../include/def.h \ - ../include/shm.h \ - ../include/waiter.h \ - ../include/queue.h \ - ../include/ipc.h \ - ../include/rw_lock.h \ - ../include/tls_pointer.h \ - ../include/pool_alloc.h \ - ../include/buffer.h \ - ../src/memory/detail.h \ - ../src/memory/alloc.h \ - ../src/memory/wrapper.h \ - ../src/memory/resource.h \ - ../src/platform/detail.h \ - ../src/platform/waiter_wrapper.h \ - ../src/circ/elem_def.h \ - ../src/circ/elem_array.h \ - ../src/prod_cons.h \ - ../src/policy.h \ - ../src/queue.h \ - ../src/log.h \ - ../src/id_pool.h - -SOURCES += \ - ../src/shm.cpp \ - ../src/ipc.cpp \ - ../src/pool_alloc.cpp \ - ../src/buffer.cpp \ - ../src/waiter.cpp - -unix { - -HEADERS += \ - ../src/platform/waiter_linux.h - -SOURCES += \ - ../src/platform/shm_linux.cpp \ - ../src/platform/tls_pointer_linux.cpp - -target.path = /usr/lib -INSTALLS += target - -} # unix - -else:win32 { - -HEADERS += \ - ../src/platform/to_tchar.h \ - ../src/platform/waiter_win.h - -SOURCES += \ - ../src/platform/shm_win.cpp \ - ../src/platform/tls_pointer_win.cpp - -LIBS += -lKernel32 - -} # else:win32 diff --git a/build/ipc/ipc.pro b/build/ipc/ipc.pro new file mode 100644 index 0000000..233de62 --- /dev/null +++ b/build/ipc/ipc.pro @@ -0,0 +1,72 @@ +TEMPLATE = lib +TARGET = ipc + +CONFIG -= qt +CONFIG += c++14 c++1z # may be useless + +DEFINES += __IPC_LIBRARY__ +DESTDIR = ../../output + +INCLUDEPATH += \ + ../../include \ + ../../src + +HEADERS += \ + ../../include/export.h \ + ../../include/def.h \ + ../../include/shm.h \ + ../../include/waiter.h \ + ../../include/queue.h \ + ../../include/ipc.h \ + ../../include/rw_lock.h \ + ../../include/tls_pointer.h \ + ../../include/pool_alloc.h \ + ../../include/buffer.h \ + ../../src/memory/detail.h \ + ../../src/memory/alloc.h \ + ../../src/memory/wrapper.h \ + ../../src/memory/resource.h \ + ../../src/platform/detail.h \ + ../../src/platform/waiter_wrapper.h \ + ../../src/circ/elem_def.h \ + ../../src/circ/elem_array.h \ + ../../src/prod_cons.h \ + ../../src/policy.h \ + ../../src/queue.h \ + ../../src/log.h \ + ../../src/id_pool.h + +SOURCES += \ + ../../src/shm.cpp \ + ../../src/ipc.cpp \ + ../../src/pool_alloc.cpp \ + ../../src/buffer.cpp \ + ../../src/waiter.cpp + +unix { + +HEADERS += \ + ../../src/platform/waiter_linux.h + +SOURCES += \ + ../../src/platform/shm_linux.cpp \ + ../../src/platform/tls_pointer_linux.cpp + +target.path = /usr/lib +INSTALLS += target + +} # unix + +else:win32 { + +HEADERS += \ + ../../src/platform/to_tchar.h \ + ../../src/platform/waiter_win.h + +SOURCES += \ + ../../src/platform/shm_win.cpp \ + ../../src/platform/tls_pointer_win.cpp + +LIBS += -lKernel32 + +} # else:win32 diff --git a/build/test.pro b/build/test/test.pro similarity index 55% rename from build/test.pro rename to build/test/test.pro index 9703411..48fd5ef 100644 --- a/build/test.pro +++ b/build/test/test.pro @@ -7,7 +7,7 @@ CONFIG += console CONFIG += c++14 c++1z # may be useless CONFIG -= app_bundle -DESTDIR = ../output +DESTDIR = ../../output !msvc:QMAKE_CXXFLAGS += \ -Wno-attributes \ @@ -16,21 +16,21 @@ DESTDIR = ../output -Wno-unused-function INCLUDEPATH += \ - ../test \ - ../test/capo \ - ../include \ - ../src + ../../test \ + ../../test/capo \ + ../../include \ + ../../src HEADERS += \ - ../test/test.h + ../../test/test.h SOURCES += \ - ../test/main.cpp \ - ../test/test_shm.cpp \ - ../test/test_mem.cpp \ - ../test/test_circ.cpp \ - ../test/test_waiter.cpp \ - ../test/test_ipc.cpp + ../../test/main.cpp \ + ../../test/test_shm.cpp \ + ../../test/test_mem.cpp \ + ../../test/test_circ.cpp \ + ../../test/test_waiter.cpp \ + ../../test/test_ipc.cpp LIBS += \ -L$${DESTDIR} -lipc