From a96178045201d00daf8b0d64189e806a0092f6ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Jopek?= Date: Thu, 26 Dec 2024 18:12:38 +0100 Subject: [PATCH 1/2] Update gtqtc.hbp to include depbinpath for QT6 and add ChangeLog entry --- ChangeLog.txt | 10 +++++++--- contrib/gtqtc/gtqtc.hbp | 1 + 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index 021d94cb13..b6f96483ac 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -7,6 +7,10 @@ Entries may not always be in chronological/commit order. See license at the end of file. */ +2024-12-26 18:12 UTC+0100 Rafał Jopek (harbour.pl) + * contrib/gtqtc/gtqtc.hbp + + added depbinpath for QT6 on Linux to locate moc correctly + 2024-12-19 10:24 UTC+0100 Aleksander Czajczynski (hb fki.pl) * contrib/rddsql/sqlbase.c % cleanup unnecessary braces @@ -17,8 +21,8 @@ 2024-12-18 21:48 UTC-0800 Eric Lendvai (harbour.wiki) * contrib/rddsql/sqlbase.c * contrib/rddsql/sqlmix.c - + added support to timestamp field type. - You can now use "@" in DbCreate as the timestamp field type. + + added support to timestamp field type. + You can now use "@" in DbCreate as the timestamp field type. Thanks to Grigory Filatov for fixing crash! 2024-12-17 03:07 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl) @@ -1420,7 +1424,7 @@ 2021-04-01 15:55 UTC-0300 Marco Aurelio V (marcoprodata/at/gmail.com) * contrib/hbpgsql/tpostgre.prg ! corrected buggy in refresh method when execute commands to change - struct + struct [REVERTED] 2021-03-31 23:43 UTC+0200 Aleksander Czajczynski (hb fki.pl) diff --git a/contrib/gtqtc/gtqtc.hbp b/contrib/gtqtc/gtqtc.hbp index bf02e67d6d..cf72f5f32a 100644 --- a/contrib/gtqtc/gtqtc.hbp +++ b/contrib/gtqtc/gtqtc.hbp @@ -29,6 +29,7 @@ -depincpath=qt6:/usr/include/x86_64-linux-gnu/qt6{linux} -depincpath=qt6:/usr/local/opt/qt6/include{darwin} -depincpath=qt6:/usr/local/include/qt6{bsd} +-depbinpath=qt6:/usr/lib/qt6/libexec{linux} -depfinish=qt6 {!HBMK_HAS_QT6}-deppkgname=qt5:qt5 From 3b7ff3e549b2b9cab0f416751c9c6a6529b51ccc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Jopek?= Date: Sun, 29 Dec 2024 09:54:24 +0100 Subject: [PATCH 2/2] Installation paths for the docs and font directories. Added installation paths for docs and font directories in pkg_inst.hbm to support consistent handling of external projects and ensure proper placement of these directories within the addons folder. --- ChangeLog.txt | 6 ++++++ utils/hbmk2/pkg_inst.hbm | 6 +++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index b6f96483ac..de88e2733e 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -7,6 +7,12 @@ Entries may not always be in chronological/commit order. See license at the end of file. */ +2024-12-29 09:53 UTC+0100 Rafał Jopek (harbour.pl) + * utils/hbmk2/pkg_inst.hbm + + added instpath for `docs` and `font` directories to support external + projects. This ensures consistent placement of `docs` and `font` + directories within the `addons` folder structure. + 2024-12-26 18:12 UTC+0100 Rafał Jopek (harbour.pl) * contrib/gtqtc/gtqtc.hbp + added depbinpath for QT6 on Linux to locate moc correctly diff --git a/utils/hbmk2/pkg_inst.hbm b/utils/hbmk2/pkg_inst.hbm index 1f8a4fad5f..8c7bca1359 100644 --- a/utils/hbmk2/pkg_inst.hbm +++ b/utils/hbmk2/pkg_inst.hbm @@ -15,6 +15,8 @@ -instfile=inc_sub:include/*.ch -instfile=inc:*.hbx -instfile=tests:tests/*.* +-instfile=docs:docs/*.* +-instfile=font:font/*.* # setup target directories for installation # ----------------------------------------- @@ -38,8 +40,10 @@ # import libraries belonging to project dependencies {!(HB_INSTALL_IMPLIB='no')}-instpath=depimplib:${hb_addons}/${hb_name}/lib/${hb_plat}/${hb_comp}/ -# misc files, public headers, tests +# misc files, public headers, tests, docs, font -instpath=misc:${hb_addons}/${hb_name}/ -instpath=inc:${hb_addons}/${hb_name}/ -instpath=inc_sub:${hb_addons}/${hb_name}/include/ -instpath=tests:${hb_addons}/${hb_name}/tests/ +-instpath=docs:${hb_addons}/${hb_name}/docs/ +-instpath=font:${hb_addons}/${hb_name}/font/