Fixed install paths.

2020-06-04 19:25:05 -03:00 · 2020-06-04 19:25:05 -03:00 · eb25244ca5
commit eb25244ca5
parent 673ce425f2
11 changed files with 78 additions and 152 deletions
--- a/Manager/Manager.pro
+++ b/Manager/Manager.pro
@ -35,12 +35,10 @@ CONFIG += console link_prl
 CONFIG -= app_bundle
 CONFIG -= qt

-DESTDIR = $${OUT_PWD}/$${BIN_DIR}
-
 TARGET = manager

 SOURCES = \
-    main.cpp
+    src/main.cpp

 INCLUDEPATH += \
    .. \
@ -72,9 +70,13 @@ isEmpty(STATIC_BUILD) | isEqual(STATIC_BUILD, 0) {
    win32-g++: QMAKE_LFLAGS = -static -static-libgcc -static-libstdc++
 }

-win32: QMAKE_POST_LINK = \
-    $$sprintf($$QMAKE_MKDIR_CMD, $$shell_path($${OUT_PWD}/../dshow/VirtualCamera/$${DSHOW_PLUGIN_NAME}.plugin/$$normalizedArch(TARGET_ARCH))) $${CMD_SEP} \
-    $(COPY) $$shell_path($${OUT_PWD}/$${BIN_DIR}/$${TARGET}.exe) $$shell_path($${OUT_PWD}/../dshow/VirtualCamera/$${DSHOW_PLUGIN_NAME}.plugin/$$normalizedArch(TARGET_ARCH))
-macx: QMAKE_POST_LINK = \
-    $$sprintf($$QMAKE_MKDIR_CMD, $$shell_path($${OUT_PWD}/../cmio/VirtualCamera/$${CMIO_PLUGIN_NAME}.plugin/Contents/Resources)) $${CMD_SEP} \
-    $(COPY) $$shell_path($${OUT_PWD}/$${BIN_DIR}/$${TARGET}) $$shell_path($${OUT_PWD}/../cmio/VirtualCamera/$${CMIO_PLUGIN_NAME}.plugin/Contents/Resources)
+win32 {
+    INSTALLPATH = $${DSHOW_PLUGIN_NAME}.plugin/$$normalizedArch(TARGET_ARCH)
+} else {
+    INSTALLPATH = $${CMIO_PLUGIN_NAME}.plugin/Contents/Resources
+}
+
+DESTDIR = $${OUT_PWD}/../$${INSTALLPATH}
+
+INSTALLS += target
+target.path = $${PREFIX}/$${INSTALLPATH}
--- a/Manager/src/main.cpp
+++ b/Manager/src/main.cpp
--- a/akvirtualcamera.pro
+++ b/akvirtualcamera.pro
@ -16,6 +16,9 @@
 #
 # Web-Site: http://webcamoid.github.io/

+win32: include(dshow/dshow.pri)
+macx: include(cmio/cmio.pri)
+
 TEMPLATE = subdirs
 CONFIG += ordered

--- a/cmio/Assistant/Assistant.pro
+++ b/cmio/Assistant/Assistant.pro
@ -33,8 +33,6 @@ CONFIG += console link_prl
 CONFIG -= app_bundle
 CONFIG -= qt

-DESTDIR = $${OUT_PWD}/$${BIN_DIR}
-
 TARGET = $${CMIO_PLUGIN_ASSISTANT_NAME}

 TEMPLATE = app
@ -54,6 +52,9 @@ HEADERS += \
 INCLUDEPATH += \
    ../..

-QMAKE_POST_LINK = \
-    $$sprintf($$QMAKE_MKDIR_CMD, $$shell_path($${OUT_PWD}/../VirtualCamera/$${CMIO_PLUGIN_NAME}.plugin/Contents/Resources)) $${CMD_SEP} \
-    $(COPY) $$shell_path($${OUT_PWD}/$${BIN_DIR}/$${CMIO_PLUGIN_ASSISTANT_NAME}) $$shell_path($${OUT_PWD}/../VirtualCamera/$${CMIO_PLUGIN_NAME}.plugin/Contents/Resources)
+INSTALLPATH = $${CMIO_PLUGIN_NAME}.plugin/Contents/Resources
+
+DESTDIR = $${OUT_PWD}/../../$${INSTALLPATH}
+
+INSTALLS += target
+target.path = $${PREFIX}/$${INSTALLPATH}
--- a/cmio/VirtualCamera/Info.plist.in
+++ b/cmio/VirtualCamera/Info.plist.in
@ -17,11 +17,11 @@
        <key>CFBundlePackageType</key>
        <string>BNDL</string>
        <key>CFBundleShortVersionString</key>
-        <string>8.7.1</string>
+        <string>$$VERSION</string>
        <key>CFBundleSignature</key>
        <string>????</string>
        <key>CFBundleVersion</key>
-        <string>8.7.1</string>
+        <string>$$VERSION</string>
        <key>CFBundleSupportedPlatforms</key>
        <array>
            <string>MacOSX</string>
--- a/cmio/VirtualCamera/VirtualCamera.pro
+++ b/cmio/VirtualCamera/VirtualCamera.pro
@ -77,17 +77,34 @@ SOURCES += \
    src/objectproperties.cpp \
    src/clock.cpp

-OTHER_FILES = \
-    Info.plist
+QMAKE_SUBSTITUTES += Info.plist.in

-INSTALLS += vcam
-vcam.files = $${OUT_PWD}/$${TARGET}.plugin
-vcam.path = $${DATAROOTDIR}
-vcam.CONFIG += no_check_exist
+OTHER_FILES = \
+    Info.plist.in
+
+CONTENTSPATH = $${CMIO_PLUGIN_NAME}.plugin/Contents
+MACBINPATH = $${CONTENTSPATH}/MacOS
+RESOURCESPATH = $${CONTENTSPATH}/Resources
+
+INSTALLS += \
+    targetLib \
+    infoPlist \
+    resources
+
+targetLib.files = $$shell_path($${OUT_PWD}/../../$${MACBINPATH}/$${CMIO_PLUGIN_NAME})
+targetLib.path = $${PREFIX}/$${MACBINPATH}
+targetLib.CONFIG += no_check_exist
+
+infoPlist.files = $$shell_path($${OUT_PWD}/Info.plist)
+infoPlist.path = $${PREFIX}/$${CONTENTSPATH}
+infoPlist.CONFIG += no_check_exist
+
+resources.files = $$shell_path($${PWD}/../../share/TestFrame/TestFrame.bmp)
+resources.path = $${PREFIX}/$${RESOURCESPATH}

 QMAKE_POST_LINK = \
-    $$sprintf($$QMAKE_MKDIR_CMD, $$shell_path($${OUT_PWD}/$${TARGET}.plugin/Contents/MacOS)) $${CMD_SEP} \
-    $$sprintf($$QMAKE_MKDIR_CMD, $$shell_path($${OUT_PWD}/$${TARGET}.plugin/Contents/Resources)) $${CMD_SEP} \
-    $(COPY) $$shell_path($${PWD}/Info.plist) $$shell_path($${OUT_PWD}/$${TARGET}.plugin/Contents) $${CMD_SEP} \
-    $(COPY) $$shell_path($${OUT_PWD}/$${BIN_DIR}/lib$${TARGET}.dylib) $$shell_path($${OUT_PWD}/$${TARGET}.plugin/Contents/MacOS/$${TARGET}) $${CMD_SEP} \
-    $(COPY) $$shell_path($${PWD}/../../share/TestFrame/TestFrame.bmp) $$shell_path($${OUT_PWD}/$${TARGET}.plugin/Contents/Resources)
+    $$sprintf($$QMAKE_MKDIR_CMD, $$shell_path($${OUT_PWD}/../../$${MACBINPATH})) $${CMD_SEP} \
+    $$sprintf($$QMAKE_MKDIR_CMD, $$shell_path($${OUT_PWD}/../../$${RESOURCESPATH})) $${CMD_SEP} \
+    $(COPY) $$shell_path($${OUT_PWD}/Info.plist) $$shell_path($${OUT_PWD}/../../$${CONTENTSPATH}) $${CMD_SEP} \
+    $(COPY) $$shell_path($${OUT_PWD}/$${BIN_DIR}/lib$${CMIO_PLUGIN_NAME}.$${QMAKE_EXTENSION_SHLIB}) $$shell_path($${OUT_PWD}/../../$${MACBINPATH}/$${CMIO_PLUGIN_NAME}) $${CMD_SEP} \
+    $(COPY) $$shell_path($${PWD}/../../share/TestFrame/TestFrame.bmp) $$shell_path($${OUT_PWD}/../../$${RESOURCESPATH})
--- a/cmio/pspec.json
+++ b/cmio/pspec.json
@ -1,4 +0,0 @@
-{
-    "pluginType": "Ak.SubModule",
-    "type": "output"
-}
--- a/commons.pri
+++ b/commons.pri
@ -25,123 +25,29 @@ VER_MIN = 0
 VER_PAT = 0
 VERSION = $${VER_MAJ}.$${VER_MIN}.$${VER_PAT}

-isEmpty(BUNDLENAME): BUNDLENAME = $${COMMONS_APPNAME}
-
 win32 {
    host_name = $$lower($$QMAKE_HOST.os)

    !isEmpty(ProgramW6432) {
-        DEFAULT_PREFIX = $(ProgramW6432)/$${BUNDLENAME}
+        DEFAULT_PREFIX = $(ProgramW6432)
    } else: !isEmpty(ProgramFiles) {
-        DEFAULT_PREFIX = $(ProgramFiles)/$${BUNDLENAME}
+        DEFAULT_PREFIX = $(ProgramFiles)
    } else: contains(host_name, linux) {
-        DEFAULT_PREFIX = /$${BUNDLENAME}
+        DEFAULT_PREFIX = /opt
    } else {
-        DEFAULT_PREFIX = C:/$${BUNDLENAME}
+        DEFAULT_PREFIX = C:/
    }
-} else: macx: isEmpty(NOAPPBUNDLE) {
-    DEFAULT_PREFIX = /Applications
-} else {
-    DEFAULT_PREFIX = $$[QT_INSTALL_PREFIX]
 }
+macx: DEFAULT_PREFIX = /Library/CoreMediaIO/Plug-Ins/DAL

 isEmpty(PREFIX): PREFIX = $${DEFAULT_PREFIX}
-isEmpty(EXECPREFIX) {
-    macx: isEmpty(NOAPPBUNDLE) {
-        EXECPREFIX = $${PREFIX}/$${BUNDLENAME}.app/Contents
-    } else {
-        EXECPREFIX = $${PREFIX}
-    }
-}
-isEmpty(BINDIR) {
-    macx: isEmpty(NOAPPBUNDLE) {
-        BINDIR = $${EXECPREFIX}/MacOS
-    } else {
-        BINDIR = $${EXECPREFIX}/bin
-    }
-}
-isEmpty(SBINDIR): SBINDIR = $${EXECPREFIX}/sbin
-isEmpty(LIBEXECDIR): LIBEXECDIR = $${EXECPREFIX}/libexec
-isEmpty(DATAROOTDIR) {
-    macx: isEmpty(NOAPPBUNDLE) {
-        DATAROOTDIR = $${EXECPREFIX}/Resources
-    } else {
-        DATAROOTDIR = $${PREFIX}/share
-    }
-}
-isEmpty(DATDIR): DATDIR = $${DATAROOTDIR}/$${COMMONS_TARGET}
-isEmpty(SYSCONFDIR): SYSCONFDIR = $${PREFIX}/etc
-isEmpty(SHAREDSTATEDIR): SHAREDSTATEDIR = $${PREFIX}/com
-isEmpty(LOCALSTATEDIR): LOCALSTATEDIR = $${PREFIX}/var
-isEmpty(INCLUDEDIR): INCLUDEDIR = $${PREFIX}/include
-isEmpty(DOCDIR): DOCDIR = $${DATAROOTDIR}/doc/$${COMMONS_TARGET}
-isEmpty(INFODIR): INFODIR = $${DATAROOTDIR}/info
-isEmpty(HTMLDIR): HTMLDIR = $${DOCDIR}/html
-isEmpty(DVIDIR): DVIDIR = $${DOCDIR}/dvi
-isEmpty(PDFDIR): PDFDIR = $${DOCDIR}/pdf
-isEmpty(PSDIR): PSDIR = $${DOCDIR}/ps
-isEmpty(LIBDIR) {
-    macx: isEmpty(NOAPPBUNDLE) {
-        LIBDIR = $${EXECPREFIX}/Frameworks
-    } else {
-        INSTALL_LIBS = $$[QT_INSTALL_LIBS]
-        LIBDIR = $$replace(INSTALL_LIBS, $$[QT_INSTALL_PREFIX], $${EXECPREFIX})
-    }
-}
-isEmpty(LOCALEDIR): LOCALEDIR = $${DATAROOTDIR}/locale
-isEmpty(MANDIR): MANDIR = $${DATAROOTDIR}/man
-isEmpty(LICENSEDIR): LICENSEDIR = $${DATAROOTDIR}/licenses/$${COMMONS_TARGET}
-isEmpty(LOCALDIR): LOCALDIR = $${PREFIX}/local
-isEmpty(LOCALLIBDIR): LOCALLIBDIR = $${LOCALDIR}/lib
-isEmpty(INSTALLQMLDIR) {
-    macx: isEmpty(NOAPPBUNDLE) {
-        INSTALLQMLDIR = $${DATAROOTDIR}/qml
-    } else {
-        INSTALL_QML = $$[QT_INSTALL_QML]
-        INSTALLQMLDIR = $$replace(INSTALL_QML, $$[QT_INSTALL_LIBS], $${LIBDIR})
-    }
-}
-isEmpty(INSTALLPLUGINSDIR) {
-    macx: isEmpty(NOAPPBUNDLE) {
-        INSTALLPLUGINSDIR = $${EXECPREFIX}/Plugins/$${COMMONS_TARGET}
-    } else {
-        INSTALLPLUGINSDIR = $${LIBDIR}/$${COMMONS_TARGET}
-    }
-}
-isEmpty(JARDIR): JARDIR = $${EXECPREFIX}/libs
-
-macx: !isEmpty(NOAPPBUNDLE): DEFINES += NOAPPBUNDLE

 DEFINES += \
    COMMONS_APPNAME=\"\\\"$$COMMONS_APPNAME\\\"\" \
    COMMONS_TARGET=\"\\\"$$COMMONS_TARGET\\\"\" \
    COMMONS_VER_MAJ=\"\\\"$$VER_MAJ\\\"\" \
    COMMONS_VERSION=\"\\\"$$VERSION\\\"\" \
-    PREFIX=\"\\\"$$PREFIX\\\"\" \
-    EXECPREFIX=\"\\\"$$EXECPREFIX\\\"\" \
-    BINDIR=\"\\\"$$BINDIR\\\"\" \
-    SBINDIR=\"\\\"$$SBINDIR\\\"\" \
-    LIBEXECDIR=\"\\\"$$LIBEXECDIR\\\"\" \
-    DATAROOTDIR=\"\\\"$$DATAROOTDIR\\\"\" \
-    DATDIR=\"\\\"$$DATDIR\\\"\" \
-    SYSCONFDIR=\"\\\"$$SYSCONFDIR\\\"\" \
-    SHAREDSTATEDIR=\"\\\"$$SHAREDSTATEDIR\\\"\" \
-    LOCALSTATEDIR=\"\\\"$$LOCALSTATEDIR\\\"\" \
-    INCLUDEDIR=\"\\\"$$INCLUDEDIR\\\"\" \
-    DOCDIR=\"\\\"$$DOCDIR\\\"\" \
-    INFODIR=\"\\\"$$INFODIR\\\"\" \
-    HTMLDIR=\"\\\"$$HTMLDIR\\\"\" \
-    DVIDIR=\"\\\"$$DVIDIR\\\"\" \
-    PDFDIR=\"\\\"$$PDFDIR\\\"\" \
-    PSDIR=\"\\\"$$PSDIR\\\"\" \
-    LIBDIR=\"\\\"$$LIBDIR\\\"\" \
-    LOCALEDIR=\"\\\"$$LOCALEDIR\\\"\" \
-    MANDIR=\"\\\"$$MANDIR\\\"\" \
-    LICENSEDIR=\"\\\"$$LICENSEDIR\\\"\" \
-    LOCALDIR=\"\\\"$$LOCALDIR\\\"\" \
-    LOCALLIBDIR=\"\\\"$$LOCALLIBDIR\\\"\" \
-    INSTALLQMLDIR=\"\\\"$$INSTALLQMLDIR\\\"\" \
-    INSTALLPLUGINSDIR=\"\\\"$$INSTALLPLUGINSDIR\\\"\"
+    PREFIX=\"\\\"$$PREFIX\\\"\"

 msvc {
    TARGET_ARCH = $${QMAKE_TARGET.arch}
@ -164,8 +70,6 @@ CONFIG(debug, debug|release) {
    COMMONS_BUILD_PATH = release/$$COMPILER/$${TARGET_ARCH}
 }

-android: COMMONS_BUILD_PATH = $${COMMONS_BUILD_PATH}/$${ANDROID_PLATFORM}
-
 BIN_DIR = $${COMMONS_BUILD_PATH}/bin
 MOC_DIR = $${COMMONS_BUILD_PATH}/moc
 OBJECTS_DIR = $${COMMONS_BUILD_PATH}/obj
--- a/dshow/Assistant/Assistant.pro
+++ b/dshow/Assistant/Assistant.pro
@ -34,8 +34,6 @@ CONFIG += console link_prl
 CONFIG -= app_bundle
 CONFIG -= qt

-DESTDIR = $${OUT_PWD}/$${BIN_DIR}
-
 TARGET = $${DSHOW_PLUGIN_ASSISTANT_NAME}

 SOURCES += \
@ -65,6 +63,9 @@ isEmpty(STATIC_BUILD) | isEqual(STATIC_BUILD, 0) {
    win32-g++: QMAKE_LFLAGS = -static -static-libgcc -static-libstdc++
 }

-QMAKE_POST_LINK = \
-    $$sprintf($$QMAKE_MKDIR_CMD, $$shell_path($${OUT_PWD}/../VirtualCamera/$${DSHOW_PLUGIN_NAME}.plugin/$$normalizedArch(TARGET_ARCH))) $${CMD_SEP} \
-    $(COPY) $$shell_path($${OUT_PWD}/$${BIN_DIR}/$${DSHOW_PLUGIN_ASSISTANT_NAME}.exe) $$shell_path($${OUT_PWD}/../VirtualCamera/$${DSHOW_PLUGIN_NAME}.plugin/$$normalizedArch(TARGET_ARCH))
+INSTALLPATH = $${DSHOW_PLUGIN_NAME}.plugin/$$normalizedArch(TARGET_ARCH)
+
+DESTDIR = $${OUT_PWD}/../../$${INSTALLPATH}
+
+INSTALLS += target
+target.path = $${PREFIX}/$${INSTALLPATH}
--- a/dshow/VirtualCamera/VirtualCamera.pro
+++ b/dshow/VirtualCamera/VirtualCamera.pro
@ -53,6 +53,7 @@ LIBS += \
    -lwinmm

 TARGET = $${DSHOW_PLUGIN_NAME}
+
 TEMPLATE = lib

 HEADERS += \
@ -107,8 +108,6 @@ SOURCES += \
    src/videocontrol.cpp \
    src/videoprocamp.cpp

-DESTDIR = $${OUT_PWD}/$${BIN_DIR}
-
 OTHER_FILES = \
    VirtualCamera.def

@ -118,13 +117,20 @@ isEmpty(STATIC_BUILD) | isEqual(STATIC_BUILD, 0) {
    win32-g++: QMAKE_LFLAGS = -static -static-libgcc -static-libstdc++
 }

-INSTALLS += vcam
-vcam.files = $${OUT_PWD}/$${TARGET}.plugin
-vcam.path = $${DATAROOTDIR}
-vcam.CONFIG += no_check_exist
+INSTALLPATH = $${DSHOW_PLUGIN_NAME}.plugin/$$normalizedArch(TARGET_ARCH)
+RESOURCESPATH = $${DSHOW_PLUGIN_NAME}.plugin/share
+
+DESTDIR = $${OUT_PWD}/../../$${INSTALLPATH}
+
+INSTALLS += \
+    target \
+    resources
+
+target.path = $${PREFIX}/$${INSTALLPATH}
+
+resources.files = $$shell_path($${PWD}/../../share/TestFrame/TestFrame.bmp)
+resources.path = $${PREFIX}/$${RESOURCESPATH}

 QMAKE_POST_LINK = \
-    $$sprintf($$QMAKE_MKDIR_CMD, $$shell_path($${OUT_PWD}/$${TARGET}.plugin/$$normalizedArch(TARGET_ARCH))) $${CMD_SEP} \
-    $$sprintf($$QMAKE_MKDIR_CMD, $$shell_path($${OUT_PWD}/$${TARGET}.plugin/share)) $${CMD_SEP} \
-    $(COPY) $$shell_path($${OUT_PWD}/$${BIN_DIR}/$${TARGET}.dll) $$shell_path($${OUT_PWD}/$${TARGET}.plugin/$$normalizedArch(TARGET_ARCH)) $${CMD_SEP} \
-    $(COPY) $$shell_path($${PWD}/../../share/TestFrame/TestFrame.bmp) $$shell_path($${OUT_PWD}/$${TARGET}.plugin/share)
+    $$sprintf($$QMAKE_MKDIR_CMD, $$shell_path($${OUT_PWD}/../../$${RESOURCESPATH})) $${CMD_SEP} \
+    $(COPY) $$shell_path($${PWD}/../../share/TestFrame/TestFrame.bmp) $$shell_path($${OUT_PWD}/../../$${RESOURCESPATH}/TestFrame.bmp)
--- a/dshow/pspec.json
+++ b/dshow/pspec.json
@ -1,4 +0,0 @@
-{
-    "pluginType": "Ak.SubModule",
-    "type": "output"
-}