version bump for builds, updated a submodule

mrRay · May 22, 2019 · 86bd33f · 86bd33f
1 parent ff11909
commit 86bd33f
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 10 deletions.
diff --git a/examples/ISF-files b/examples/ISF-files
diff --git 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/...s/Qt/ISFEditor/ISFEditor_installer_mac/packages/com.vidvox.ISFEditor.mac/meta/package.xml b/...s/Qt/ISFEditor/ISFEditor_installer_mac/packages/com.vidvox.ISFEditor.mac/meta/package.xml
@@ -2,8 +2,8 @@
 <Package>
     <DisplayName>The ISF Editor app</DisplayName>
     <Description>Install the ISF Editor application.</Description>
-	<Version>2.9.8</Version>
-    <ReleaseDate>2018-12-31</ReleaseDate>
+	<Version>2.9.9</Version>
+    <ReleaseDate>2019-05-22</ReleaseDate>
     <Default>true</Default>
     <SortingPriority>10</SortingPriority>
 </Package>
diff --git a/...es/Qt/ISFEditor/ISFEditor_installer_mac/packages/com.vidvox.ISFFiles.mac/meta/package.xml b/...es/Qt/ISFEditor/ISFEditor_installer_mac/packages/com.vidvox.ISFFiles.mac/meta/package.xml
@@ -2,8 +2,8 @@
 <Package>
     <DisplayName>ISF Sample Files</DisplayName>
     <Description>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.</Description>
-    <Version>1.0.0-0</Version>
-    <ReleaseDate>2018-12-31</ReleaseDate>
+    <Version>1.0.1</Version>
+    <ReleaseDate>2019-05-22</ReleaseDate>
     <RequiresAdminRights>true</RequiresAdminRights>
     <Script>installscript.js</Script>
     <Default>true</Default>

diff --git a/...s/Qt/ISFEditor/ISFEditor_installer_win/packages/com.vidvox.ISFEditor.win/meta/package.xml b/...s/Qt/ISFEditor/ISFEditor_installer_win/packages/com.vidvox.ISFEditor.win/meta/package.xml
@@ -2,8 +2,8 @@
 <Package>
     <DisplayName>The ISF Editor app</DisplayName>
     <Description>Install the ISF Editor application.</Description>
-	<Version>2.9.8</Version>
-    <ReleaseDate>2018-12-31</ReleaseDate>
+	<Version>2.9.9</Version>
+    <ReleaseDate>2019-05-22</ReleaseDate>
     <Default>true</Default>
     <SortingPriority>10</SortingPriority>
 	<Script>installscript.js</Script>

diff --git a/...es/Qt/ISFEditor/ISFEditor_installer_win/packages/com.vidvox.ISFFiles.win/meta/package.xml b/...es/Qt/ISFEditor/ISFEditor_installer_win/packages/com.vidvox.ISFFiles.win/meta/package.xml
@@ -2,8 +2,8 @@
 <Package>
     <DisplayName>ISF Sample Files</DisplayName>
 	<Description>Hundreds of ISF generators and filters.  These will be installed in the root "ProgramDirectory" on the target drive (usually C:\\ProgramData\\ISF).</Description>
-    <Version>1.0.0-0</Version>
-    <ReleaseDate>2018-12-31</ReleaseDate>
+    <Version>1.0.1</Version>
+    <ReleaseDate>2019-05-22</ReleaseDate>
     <RequiresAdminRights>true</RequiresAdminRights>
     <Script>installscript.js</Script>
     <Default>true</Default>