fix: remaken#16 - add .pkginfo/.headers(or .lib, or .bin) folders in …

…install dir in install target for set dependeny properties. thes properties are used by remaken bundle/bundleXpcf
b-com-software-basis · Nov 16, 2022 · ffd5c6c · ffd5c6c
1 parent 13a0d29
commit ffd5c6c
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 3 deletions.
diff --git a/install_dependencies.pri b/install_dependencies.pri
@@ -130,7 +130,5 @@ contains(DEPENDENCIESCONFIG,install)|contains(DEPENDENCIESCONFIG,install_recurse
             install_xpcf_deps.depends = install
         }
     }
-
-    #defined(INSTALL_XPCF_XML_FILE,var) {
 }
 QMAKE_EXTRA_TARGETS  += install_deps install_xpcf_deps
diff --git a/remaken_install_target.pri b/remaken_install_target.pri
@@ -1,6 +1,42 @@
 # Author(s) : Loic Touraine, Stephane Leduc
 
-macx{
+REMAKEN_PKGINFO_OUTPUTDIR=$$_PRO_FILE_PWD_/$${REMAKEN_BUILD_RULES_FOLDER}/$${REMAKEN_FULL_PLATFORM}/.pkginfo
+# target install
+for (install, INSTALLS) {
+    equals(install,"target") {
+        contains(TEMPLATE, lib)|contains(TEMPLATE,vclib) {
+            #lib
+            !exists($${REMAKEN_PKGINFO_OUTPUTDIR}/.lib) {
+                mkpath($${REMAKEN_PKGINFO_OUTPUTDIR}/.lib)
+            }
+        }
+        contains(TEMPLATE, app)|contains(TEMPLATE,vcapp) {
+            !exists($${REMAKEN_PKGINFO_OUTPUTDIR}/.bin) {
+                mkpath($${REMAKEN_PKGINFO_OUTPUTDIR}/.bin)
+            }
+        }
+    } else {
+        for (install_files, $${install}.files) {
+            # include
+            !exists($${REMAKEN_PKGINFO_OUTPUTDIR}/.headers) {
+                mkpath($${REMAKEN_PKGINFO_OUTPUTDIR}/.headers)
+            }
+        }
+    }
+}
+
+defined(PROJECTDEPLOYDIR,var) {
+    exists($${REMAKEN_PKGINFO_OUTPUTDIR})
+    {
+        pkginfo_files.path = $${PROJECTDEPLOYDIR}
+        #Nb : empty folder can't be copied directly with target.files then use an extra command
+        win32 {
+            pkginfo_files.extra = "echo R | xcopy /Y /E $$shell_quote($$shell_path($${REMAKEN_PKGINFO_OUTPUTDIR})) $$shell_quote($$shell_path($${PROJECTDEPLOYDIR}/.pkginfo/))"
+        } else {
+            pkginfo_files.extra = cp -R $$shell_quote($$shell_path($${REMAKEN_PKGINFO_OUTPUTDIR})) $$shell_quote($$shell_path($${PROJECTDEPLOYDIR}/))
+        }
+        INSTALLS += pkginfo_files
+    }
 }
 
 win32 {

diff --git a/win32/qtvs_install_target.pri b/win32/qtvs_install_target.pri
@@ -59,6 +59,9 @@ contains(PROJECTCONFIG,QTVS) {
                     write_file($${INSTALL_PROJECT_FILE},BAT_INSTALLPROJECT_COMMAND, append)
                 }
             }
+            for (install_extra, $${install}.extra) {
+                write_file($${INSTALL_PROJECT_FILE},install_extra, append)
+            }
         }
     }
     exists($${INSTALL_PROJECT_FILE}) {