From 86bd33fd9c6d8023cc8163b86c5f2e9646cb4a92 Mon Sep 17 00:00:00 2001 From: ray cutler Date: Wed, 22 May 2019 15:26:12 -0400 Subject: [PATCH] version bump for builds, updated a submodule --- examples/ISF-files | 2 +- examples/Qt/ISFEditor/ISFEditor_app/ISFEditor_app.pro | 10 +++++++++- .../packages/com.vidvox.ISFEditor.mac/meta/package.xml | 4 ++-- .../packages/com.vidvox.ISFFiles.mac/meta/package.xml | 4 ++-- .../packages/com.vidvox.ISFEditor.win/meta/package.xml | 4 ++-- .../packages/com.vidvox.ISFFiles.win/meta/package.xml | 4 ++-- 6 files changed, 18 insertions(+), 10 deletions(-) diff --git a/examples/ISF-files b/examples/ISF-files index 3b14be6..6c45bd5 160000 --- a/examples/ISF-files +++ b/examples/ISF-files @@ -1 +1 @@ -Subproject commit 3b14be665801cec037ce30f349cac45e30fcd503 +Subproject commit 6c45bd55a90f1cd45ca8d0f053df2b1b1d5bcfc3 diff --git a/examples/Qt/ISFEditor/ISFEditor_app/ISFEditor_app.pro b/examples/Qt/ISFEditor/ISFEditor_app/ISFEditor_app.pro index 5c392e4..e25f697 100644 --- a/examples/Qt/ISFEditor/ISFEditor_app/ISFEditor_app.pro +++ b/examples/Qt/ISFEditor/ISFEditor_app/ISFEditor_app.pro @@ -22,7 +22,7 @@ DEFINES += QT_DEPRECATED_WARNINGS CONFIG += c++14 -VERSION = 2.9.8 +VERSION = 2.9.9 mac { ICON = ISFEditorAppIcon.icns } @@ -548,8 +548,14 @@ mac { PACKAGES_SRC = "$$_PRO_FILE_PWD_/../ISFEditor_installer_mac/packages" PACKAGES_DST = "$$OUT_PWD/../ISFEditor_installer_mac/packages" PACKAGES_DST_PARENT = "$$OUT_PWD/../ISFEditor_installer_mac" + + QMAKE_POST_LINK += echo "PACKAGES_SRC is $$PACKAGES_SRC"; + QMAKE_POST_LINK += echo "PACKAGES_DST is $$PACKAGES_DST"; + QMAKE_POST_LINK += echo "PACKAGES_DST_PARENT is $$PACKAGES_DST_PARENT"; + # make sure the dst parent dir exists, delete the 'packages' folder from the build directory QMAKE_POST_LINK += rm -Rf $$PACKAGES_DST_PARENT; + QMAKE_POST_LINK += $$QMAKE_MKDIR $$PACKAGES_DST_PARENT; QMAKE_POST_LINK += $$QMAKE_MKDIR $$PACKAGES_DST; QMAKE_POST_LINK += rm -Rf $$PACKAGES_DST; # copy the 'packages' folder from the source tree to the build directory @@ -558,12 +564,14 @@ mac { # first process the isf editor # copy the compiled app into the 'data' folder in the build directory's 'packages' EDITOR_DST_DIR = "$$OUT_PWD/../ISFEditor_installer_mac/packages/com.vidvox.ISFEditor.mac/data" + QMAKE_POST_LINK += $$QMAKE_MKDIR $$EDITOR_DST_DIR; QMAKE_POST_LINK += cp -vaRf "$$OUT_PWD/$${TARGET}.app" "$${EDITOR_DST_DIR}/$${TARGET}.app"; # now process the isf files we're installing # copy the files from the source tree into the 'data' folder in the build directory's 'packages' FILES_DST_DIR = "$$OUT_PWD/../ISFEditor_installer_mac/packages/com.vidvox.ISFFiles.mac/data" FILES_SRC_DIR = "$$_PRO_FILE_PWD_/../../../ISF-files/ISF" + QMAKE_POST_LINK += $$QMAKE_MKDIR $$FILES_DST_DIR; QMAKE_POST_LINK += cp -vaRf "$${FILES_SRC_DIR}/*" "$${FILES_DST_DIR}"; diff --git a/examples/Qt/ISFEditor/ISFEditor_installer_mac/packages/com.vidvox.ISFEditor.mac/meta/package.xml b/examples/Qt/ISFEditor/ISFEditor_installer_mac/packages/com.vidvox.ISFEditor.mac/meta/package.xml index e8699bc..2e121e2 100644 --- a/examples/Qt/ISFEditor/ISFEditor_installer_mac/packages/com.vidvox.ISFEditor.mac/meta/package.xml +++ b/examples/Qt/ISFEditor/ISFEditor_installer_mac/packages/com.vidvox.ISFEditor.mac/meta/package.xml @@ -2,8 +2,8 @@ The ISF Editor app Install the ISF Editor application. - 2.9.8 - 2018-12-31 + 2.9.9 + 2019-05-22 true 10 diff --git a/examples/Qt/ISFEditor/ISFEditor_installer_mac/packages/com.vidvox.ISFFiles.mac/meta/package.xml b/examples/Qt/ISFEditor/ISFEditor_installer_mac/packages/com.vidvox.ISFFiles.mac/meta/package.xml index 7d41368..d7ed184 100644 --- a/examples/Qt/ISFEditor/ISFEditor_installer_mac/packages/com.vidvox.ISFFiles.mac/meta/package.xml +++ b/examples/Qt/ISFEditor/ISFEditor_installer_mac/packages/com.vidvox.ISFFiles.mac/meta/package.xml @@ -2,8 +2,8 @@ ISF Sample Files Hundreds of sample ISF generators and filters. These will be installed in /Library/Graphics/ISF, where they can be accessed by all users and applications on this machine. - 1.0.0-0 - 2018-12-31 + 1.0.1 + 2019-05-22 true true diff --git a/examples/Qt/ISFEditor/ISFEditor_installer_win/packages/com.vidvox.ISFEditor.win/meta/package.xml b/examples/Qt/ISFEditor/ISFEditor_installer_win/packages/com.vidvox.ISFEditor.win/meta/package.xml index 1a2c221..dc4c2de 100644 --- a/examples/Qt/ISFEditor/ISFEditor_installer_win/packages/com.vidvox.ISFEditor.win/meta/package.xml +++ b/examples/Qt/ISFEditor/ISFEditor_installer_win/packages/com.vidvox.ISFEditor.win/meta/package.xml @@ -2,8 +2,8 @@ The ISF Editor app Install the ISF Editor application. - 2.9.8 - 2018-12-31 + 2.9.9 + 2019-05-22 true 10 diff --git a/examples/Qt/ISFEditor/ISFEditor_installer_win/packages/com.vidvox.ISFFiles.win/meta/package.xml b/examples/Qt/ISFEditor/ISFEditor_installer_win/packages/com.vidvox.ISFFiles.win/meta/package.xml index b6e6c02..820747e 100644 --- a/examples/Qt/ISFEditor/ISFEditor_installer_win/packages/com.vidvox.ISFFiles.win/meta/package.xml +++ b/examples/Qt/ISFEditor/ISFEditor_installer_win/packages/com.vidvox.ISFFiles.win/meta/package.xml @@ -2,8 +2,8 @@ ISF Sample Files Hundreds of ISF generators and filters. These will be installed in the root "ProgramDirectory" on the target drive (usually C:\\ProgramData\\ISF). - 1.0.0-0 - 2018-12-31 + 1.0.1 + 2019-05-22 true true