Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add installation paths for docs and font directories, and depbinpath for QT6 #369

Closed
wants to merge 3 commits into from
Closed

Add installation paths for docs and font directories, and depbinpath for QT6 #369

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a961780
Update gtqtc.hbp to include depbinpath for QT6 and add ChangeLog entry
Dec 26, 2024
3b7ff3e
Installation paths for the docs and font directories.
Dec 29, 2024
2aed4ed
Merge remote-tracking branch 'upstream/master'
Dec 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions ChangeLog.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,16 @@
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

2024-12-29 00:28 UTC+0100 Aleksander Czajczynski (hb fki.pl)
* src/rtl/hbproces.c
! in process creating functions like hb_processRun(), *Open(),
Expand Down
1 change: 1 addition & 0 deletions contrib/gtqtc/gtqtc.hbp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 5 additions & 1 deletion utils/hbmk2/pkg_inst.hbm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
# -----------------------------------------
Expand All @@ -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/