fivedev/harbour-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2025-01-22 21:08 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)

Browse Source 
* utils/hbmk2/hbmk2.prg
    * do not interrupt whole build process when optional dependency package
      is disabled explicitly by -depcontrol=<optdeppkg>:no

  * contrib/gtqtc/gtqtc.hbc
  * contrib/gtqtc/gtqtc.hbp
    * respect QT_SELECT envvar looking for QT dependencies
This commit is contained in:
Przemysław Czerpak
2025-01-22 21:08:08 +01:00
parent 0ca7dbe6f2
commit 81bf9807b5
4 changed files with 24 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog.txt
View File

@@ -7,6 +7,15 @@
Entries may not always be in chronological/commit order.
See license at the end of file. */
2025-01-22 21:08 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
* utils/hbmk2/hbmk2.prg
* do not interrupt whole build process when optional dependency package
is disabled explicitly by -depcontrol=<optdeppkg>:no
* contrib/gtqtc/gtqtc.hbc
* contrib/gtqtc/gtqtc.hbp
* respect QT_SELECT envvar looking for QT dependencies
2025-01-21 09:45 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
* .github/workflows/windows-ci.yml
* install freeimage only in 64-bit environment,

12
contrib/gtqtc/gtqtc.hbc
View File

@@ -3,8 +3,9 @@ description=Multi-platform QT based GUI console (QTC)
gt=${_HB_DYNPREF}${hb_name}${_HB_DYNSUFF}
deppkgname=qt6:qt6
depcontrol=qt6:${HB_WITH_QT}
depkeyhead=qt6:QtCore/QAdoptSharedDataTag
depcontrol=qt6:${HB_WITH_QT}
{QT_SELECT&QT_SELECT<'6'}depcontrol=qt6:no
depoptional=qt6:yes
depincpath=qt6:/usr/include/x86_64-linux-gnu/qt6{linux}
depincpath=qt6:/usr/local/opt/qt6/include{darwin}
@@ -12,8 +13,9 @@ depincpath=qt6:/usr/local/include/qt6{bsd}
depfinish=qt6
{!HBMK_HAS_QT6}deppkgname=qt5:qt5
{!HBMK_HAS_QT6}depcontrol=qt5:${HB_WITH_QT}
{!HBMK_HAS_QT6}depkeyhead=qt5:QtCore/QJsonObject
{!HBMK_HAS_QT6}depcontrol=qt5:${HB_WITH_QT}
{!HBMK_HAS_QT6&QT_SELECT='4'}depcontrol=qt5:no
{!HBMK_HAS_QT6}depoptional=qt5:yes
{!HBMK_HAS_QT6&linux}depincpath=qt5:/usr/include/x86_64-linux-gnu/qt5
{!HBMK_HAS_QT6&darwin}depincpath=qt5:/usr/local/opt/qt5/include
@@ -22,8 +24,12 @@ depfinish=qt6
{!(HBMK_HAS_QT5|HBMK_HAS_QT6)&!darwin&!android}deppkgname=qt:QtCore
{!(HBMK_HAS_QT5|HBMK_HAS_QT6)}deppkgname=qt:qt4
{!(HBMK_HAS_QT5|HBMK_HAS_QT6)}depcontrol=qt:${HB_WITH_QT}
{!(HBMK_HAS_QT5|HBMK_HAS_QT6)}depkeyhead=qt:QtCore/qglobal.h
{!(HBMK_HAS_QT5|HBMK_HAS_QT6)}depcontrol=qt:${HB_WITH_QT}
{!(HBMK_HAS_QT5|HBMK_HAS_QT6)&QT_SELECT>'4'}depcontrol=qt:no
{!(HBMK_HAS_QT5|HBMK_HAS_QT6)&!darwin&!android}depincpath=qt:/usr/include/qt4
{!(HBMK_HAS_QT5|HBMK_HAS_QT6)&!darwin&!android}depincpath=qt:/usr/lib/qt4/include
{!(HBMK_HAS_QT5|HBMK_HAS_QT6)&!darwin&!android}depincpath=qt:/usr/include
{!(HBMK_HAS_QT5|HBMK_HAS_QT6)&bsd}depincpath=qt:/usr/local/include/qt4
{!(HBMK_HAS_QT5|HBMK_HAS_QT6)&beos}depincpath=qt:/boot/common/include
{!(HBMK_HAS_QT5|HBMK_HAS_QT6)&darwin}depincpath=qt:/Developer/qt/include

6
contrib/gtqtc/gtqtc.hbp
View File

@@ -24,7 +24,7 @@
-deppkgname=qt6:qt6
-depkeyhead=qt6:QtCore/QAdoptSharedDataTag
-depcontrol=qt6:${HB_WITH_QT}
{HB_BUILD_3RDEXT='no'}-depoptional=qt6:no
{HB_BUILD_3RDEXT='no'|(QT_SELECT&QT_SELECT<'6')}-depcontrol=qt6:no
-depoptional=qt6:yes
-depincpath=qt6:/usr/include/x86_64-linux-gnu/qt6{linux}
-depincpath=qt6:/usr/local/opt/qt6/include{darwin}
@@ -34,7 +34,7 @@
{!HBMK_HAS_QT6}-deppkgname=qt5:qt5
{!HBMK_HAS_QT6}-depkeyhead=qt5:QtCore/QJsonObject
{!HBMK_HAS_QT6}-depcontrol=qt5:${HB_WITH_QT}
{!HBMK_HAS_QT6&HB_BUILD_3RDEXT='no'}-depoptional=qt5:no
{!HBMK_HAS_QT6&(HB_BUILD_3RDEXT='no'|QT_SELECT='4')}-depcontrol=qt5:no
{!HBMK_HAS_QT6}-depoptional=qt5:yes
{!HBMK_HAS_QT6&linux}-depincpath=qt5:/usr/include/x86_64-linux-gnu/qt5
{!HBMK_HAS_QT6&darwin}-depincpath=qt5:/usr/local/opt/qt5/include
@@ -45,7 +45,7 @@
{!(HBMK_HAS_QT5|HBMK_HAS_QT6)}-deppkgname=qt:qt4
{!(HBMK_HAS_QT5|HBMK_HAS_QT6)}-depkeyhead=qt:QtCore/qglobal.h
{!(HBMK_HAS_QT5|HBMK_HAS_QT6)}-depcontrol=qt:${HB_WITH_QT}
{!(HBMK_HAS_QT5|HBMK_HAS_QT6)&HB_BUILD_3RDEXT='no'}-depcontrol=qt:no
{!(HBMK_HAS_QT5|HBMK_HAS_QT6)&(HB_BUILD_3RDEXT='no'|QT_SELECT>'4')}-depcontrol=qt:no
{!(HBMK_HAS_QT5|HBMK_HAS_QT6)&!darwin&!android}-depincpath=qt:/usr/include/qt4
{!(HBMK_HAS_QT5|HBMK_HAS_QT6)&!darwin&!android}-depincpath=qt:/usr/lib/qt4/include
{!(HBMK_HAS_QT5|HBMK_HAS_QT6)&!darwin&!android}-depincpath=qt:/usr/include

4
utils/hbmk2/hbmk2.prg
View File

@@ -9120,7 +9120,9 @@ STATIC FUNCTION dep_evaluate( hbmk )
IF hbmk[ _HBMK_lInfo ]
_hbmk_OutStd( hbmk, hb_StrFormat( I_( "Dependency '%1$s' forcibly disabled" ), dep[ _HBMKDEP_cName ] ) )
ENDIF
lAnyForcedOut := .T.
IF ! dep[ _HBMKDEP_lOptional ]
lAnyForcedOut := .T.
ENDIF
LOOP
ELSE
IF hbmk[ _HBMK_lDEBUGDEPD ]