[PR #174] [MERGED] UMK doesn't work for build method localized in relative paths #204

Closed
opened 2026-05-05 03:42:53 -06:00 by gitea-mirror · 0 comments
Owner

📋 Pull Request Information

Original PR: https://github.com/ultimatepp/ultimatepp/pull/174
Author: @klugier
Created: 11/27/2023
Status: Merged
Merged: 12/2/2023
Merged by: @mirek-fidler

Base: masterHead: klugier/umk-build-method-fix


📝 Commits (1)

📊 Changes

1 file changed (+1 additions, -1 deletions)

View changed files

📝 uppsrc/umk/umake.cpp (+1 -1)

📄 Description

It looks like UMK ignores the code responsible for normalization of build method localizes in line 260 and use raw parameter. It looks like it was done by omission.

When I ran following command:

klugier@X470Pro:Dokumenty/SimpleTerminal ‹main*›$ 3p/umk/umk app/,3p/uppsrc SimpleTerminal 3p/umk/CLANG.bm -brv +GUI,SHARED build/SimpleTerminal  
Config directory: /home/klugier/.config/u++
Inline assembly: /home/klugier/Dokumenty/SimpleTerminal/app;/home/klugier/Dokumenty/SimpleTerminal/3p/uppsrc
Output directory: /home/klugier/.cache/upp.out
Main package: /home/klugier/Dokumenty/SimpleTerminal/app/SimpleTerminal/SimpleTerminal.upp
Build flags: GUI SHARED
Build method: /home/klugier/Dokumenty/SimpleTerminal/3p/umk/CLANG.bm
Target override: /home/klugier/Dokumenty/SimpleTerminal/build/SimpleTerminal
Saving 

----- CtrlLib ( GUI SHARED GCC BLITZ POSIX LINUX ) (1 / 10)
cd /home/klugier/Dokumenty/SimpleTerminal/3p/uppsrc/CtrlLib
Invalid build method 3p/umk/CLANG.bm ().

I have invalid build method. After fix it is:

klugier@X470Pro:Dokumenty/SimpleTerminal ‹main*›$ 3p/umk/umk app/,3p/uppsrc SimpleTerminal 3p/umk/CLANG.bm -brv +GUI,SHARED build/SimpleTerminal
Config directory: /home/klugier/.config/u++
Inline assembly: /home/klugier/Dokumenty/SimpleTerminal/app;/home/klugier/Dokumenty/SimpleTerminal/3p/uppsrc
Output directory: /home/klugier/.cache/upp.out
Main package: /home/klugier/Dokumenty/SimpleTerminal/app/SimpleTerminal/SimpleTerminal.upp
Build flags: GUI SHARED
Build method: /home/klugier/Dokumenty/SimpleTerminal/3p/umk/CLANG.bm
Target override: /home/klugier/Dokumenty/SimpleTerminal/build/SimpleTerminal
Saving 

----- CtrlLib ( GUI SHARED GCC BLITZ POSIX LINUX ) (1 / 10)
cd /home/klugier/Dokumenty/SimpleTerminal/3p/uppsrc/CtrlLib
----- CtrlCore ( GUI SHARED GCC BLITZ POSIX LINUX ) (2 / 10)
cd /home/klugier/Dokumenty/SimpleTerminal/3p/uppsrc/CtrlCore
----- PdfDraw ( GUI SHARED GCC BLITZ POSIX LINUX ) (3 / 10)
cd /home/klugier/Dokumenty/SimpleTerminal/3p/uppsrc/PdfDraw
----- Draw ( GUI SHARED GCC BLITZ POSIX LINUX ) (4 / 10)
cd /home/klugier/Dokumenty/SimpleTerminal/3p/uppsrc/Draw
----- plugin/bmp ( GUI SHARED GCC BLITZ POSIX LINUX ) (5 / 10)
cd /home/klugier/Dokumenty/SimpleTerminal/3p/uppsrc/plugin/bmp
----- RichText ( GUI SHARED GCC BLITZ POSIX LINUX ) (6 / 10)
cd /home/klugier/Dokumenty/SimpleTerminal/3p/uppsrc/RichText
----- Painter ( GUI SHARED GCC BLITZ POSIX LINUX ) (7 / 10)
cd /home/klugier/Dokumenty/SimpleTerminal/3p/uppsrc/Painter
----- Core ( GUI SHARED GCC BLITZ POSIX LINUX ) (8 / 10)
cd /home/klugier/Dokumenty/SimpleTerminal/3p/uppsrc/Core
----- plugin/png ( GUI SHARED GCC BLITZ POSIX LINUX ) (9 / 10)
cd /home/klugier/Dokumenty/SimpleTerminal/3p/uppsrc/plugin/png
----- SimpleTerminal ( GUI SHARED MAIN GCC BLITZ POSIX LINUX ) (10 / 10)
cd /home/klugier/Dokumenty/SimpleTerminal/app/SimpleTerminal
/home/klugier/Dokumenty/SimpleTerminal/build/SimpleTerminal (2670808 B) is up to date.

OK. (0:00.18)

🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.

## 📋 Pull Request Information **Original PR:** https://github.com/ultimatepp/ultimatepp/pull/174 **Author:** [@klugier](https://github.com/klugier) **Created:** 11/27/2023 **Status:** ✅ Merged **Merged:** 12/2/2023 **Merged by:** [@mirek-fidler](https://github.com/mirek-fidler) **Base:** `master` ← **Head:** `klugier/umk-build-method-fix` --- ### 📝 Commits (1) - [`17daee7`](https://github.com/ultimatepp/ultimatepp/commit/17daee7f171b0f5296ed5240a1c8528e66c75776) Update umake.cpp ### 📊 Changes **1 file changed** (+1 additions, -1 deletions) <details> <summary>View changed files</summary> 📝 `uppsrc/umk/umake.cpp` (+1 -1) </details> ### 📄 Description It looks like UMK ignores the code responsible for normalization of build method localizes in line 260 and use raw parameter. It looks like it was done by omission. When I ran following command: ``` klugier@X470Pro:Dokumenty/SimpleTerminal ‹main*›$ 3p/umk/umk app/,3p/uppsrc SimpleTerminal 3p/umk/CLANG.bm -brv +GUI,SHARED build/SimpleTerminal Config directory: /home/klugier/.config/u++ Inline assembly: /home/klugier/Dokumenty/SimpleTerminal/app;/home/klugier/Dokumenty/SimpleTerminal/3p/uppsrc Output directory: /home/klugier/.cache/upp.out Main package: /home/klugier/Dokumenty/SimpleTerminal/app/SimpleTerminal/SimpleTerminal.upp Build flags: GUI SHARED Build method: /home/klugier/Dokumenty/SimpleTerminal/3p/umk/CLANG.bm Target override: /home/klugier/Dokumenty/SimpleTerminal/build/SimpleTerminal Saving ----- CtrlLib ( GUI SHARED GCC BLITZ POSIX LINUX ) (1 / 10) cd /home/klugier/Dokumenty/SimpleTerminal/3p/uppsrc/CtrlLib Invalid build method 3p/umk/CLANG.bm (). ``` I have invalid build method. After fix it is: ``` klugier@X470Pro:Dokumenty/SimpleTerminal ‹main*›$ 3p/umk/umk app/,3p/uppsrc SimpleTerminal 3p/umk/CLANG.bm -brv +GUI,SHARED build/SimpleTerminal Config directory: /home/klugier/.config/u++ Inline assembly: /home/klugier/Dokumenty/SimpleTerminal/app;/home/klugier/Dokumenty/SimpleTerminal/3p/uppsrc Output directory: /home/klugier/.cache/upp.out Main package: /home/klugier/Dokumenty/SimpleTerminal/app/SimpleTerminal/SimpleTerminal.upp Build flags: GUI SHARED Build method: /home/klugier/Dokumenty/SimpleTerminal/3p/umk/CLANG.bm Target override: /home/klugier/Dokumenty/SimpleTerminal/build/SimpleTerminal Saving ----- CtrlLib ( GUI SHARED GCC BLITZ POSIX LINUX ) (1 / 10) cd /home/klugier/Dokumenty/SimpleTerminal/3p/uppsrc/CtrlLib ----- CtrlCore ( GUI SHARED GCC BLITZ POSIX LINUX ) (2 / 10) cd /home/klugier/Dokumenty/SimpleTerminal/3p/uppsrc/CtrlCore ----- PdfDraw ( GUI SHARED GCC BLITZ POSIX LINUX ) (3 / 10) cd /home/klugier/Dokumenty/SimpleTerminal/3p/uppsrc/PdfDraw ----- Draw ( GUI SHARED GCC BLITZ POSIX LINUX ) (4 / 10) cd /home/klugier/Dokumenty/SimpleTerminal/3p/uppsrc/Draw ----- plugin/bmp ( GUI SHARED GCC BLITZ POSIX LINUX ) (5 / 10) cd /home/klugier/Dokumenty/SimpleTerminal/3p/uppsrc/plugin/bmp ----- RichText ( GUI SHARED GCC BLITZ POSIX LINUX ) (6 / 10) cd /home/klugier/Dokumenty/SimpleTerminal/3p/uppsrc/RichText ----- Painter ( GUI SHARED GCC BLITZ POSIX LINUX ) (7 / 10) cd /home/klugier/Dokumenty/SimpleTerminal/3p/uppsrc/Painter ----- Core ( GUI SHARED GCC BLITZ POSIX LINUX ) (8 / 10) cd /home/klugier/Dokumenty/SimpleTerminal/3p/uppsrc/Core ----- plugin/png ( GUI SHARED GCC BLITZ POSIX LINUX ) (9 / 10) cd /home/klugier/Dokumenty/SimpleTerminal/3p/uppsrc/plugin/png ----- SimpleTerminal ( GUI SHARED MAIN GCC BLITZ POSIX LINUX ) (10 / 10) cd /home/klugier/Dokumenty/SimpleTerminal/app/SimpleTerminal /home/klugier/Dokumenty/SimpleTerminal/build/SimpleTerminal (2670808 B) is up to date. OK. (0:00.18) ``` --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>
gitea-mirror 2026-05-05 03:42:53 -06:00
Sign in to join this conversation.
No labels
pull-request
No milestone
No project
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference: github-starred/ultimatepp#204
No description provided.