Skip to content

Commit 9807309

Browse files
Jarod42Jarod42
committed
Follow premake renaming of gmake into gmakelegacy
1 parent 80913db commit 9807309

File tree

15 files changed

+25
-24
lines changed

15 files changed

+25
-24
lines changed

‎.github/workflows/premake5-qt-ubuntu-gmake.yml‎ renamed to ‎.github/workflows/premake5-qt-ubuntu-gmakelegacy.yml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,29 @@
1-
name: premake5-qt-ubuntu-gmake
1+
name: premake5-qt-ubuntu-gmakelegacy
22

33
on:
44
workflow_dispatch:
55
push:
66
paths:
77
- 'projects-qt/project-*/**'
8-
- '.github/workflows/premake5-qt-ubuntu-gmake.yml'
8+
- '.github/workflows/premake5-qt-ubuntu-gmakelegacy.yml'
99
- '.github/actions/install-premake5/action.yml'
1010
- '!**/*.md'
1111
- '!projects-qt/**/unsupported_by_*'
1212
- '!**/premake4.lua'
13-
- 'projects-qt/**/unsupported_by_gmake'
14-
- 'projects-qt/**/unsupported_by_premake5_gmake'
13+
- 'projects-qt/**/unsupported_by_gmakelegacy'
14+
- 'projects-qt/**/unsupported_by_premake5_gmakelegacy'
1515
- 'submodules/premake-qt'
1616

1717
pull_request:
1818
paths:
1919
- 'projects-qt/project-*/**'
20-
- '.github/workflows/premake5-qt-ubuntu-gmake.yml'
20+
- '.github/workflows/premake5-qt-ubuntu-gmakelegacy.yml'
2121
- '.github/actions/install-premake5/action.yml'
2222
- '!**/*.md'
2323
- '!projects-qt/**/unsupported_by_*'
2424
- '!**/premake4.lua'
25-
- 'projects-qt/**/unsupported_by_gmake'
26-
- 'projects-qt/**/unsupported_by_premake5_gmake'
25+
- 'projects-qt/**/unsupported_by_gmakelegacy'
26+
- 'projects-qt/**/unsupported_by_premake5_gmakelegacy'
2727
- 'submodules/premake-qt'
2828

2929
jobs:
@@ -69,4 +69,4 @@ jobs:
6969
run: | # fake X-server as Qt widget requires displays :/
7070
# Cannot use environment variable ($QT_ROOT_DIR ) in command line, so use environment variable (QT_DIR) or its hardcoded value
7171
#--qt-root=/home/runner/work/premake-sample-projects/Qt/5.15.0/gcc_64
72-
xvfb-run -a python3 ./test_projects.py premake5 projects-qt gmake --scripts=`pwd` --qt-version=${{ matrix.qt-version }}
72+
xvfb-run -a python3 ./test_projects.py premake5 projects-qt gmakelegacy --scripts=`pwd` --qt-version=${{ matrix.qt-version }}

‎.github/workflows/premake5-ubuntu-gmake.yml‎ renamed to ‎.github/workflows/premake5-ubuntu-gmakelegacy.yml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,28 @@
1-
name: premake5-ubuntu-gmake
1+
name: premake5-ubuntu-gmakelegacy
22

33
on:
44
workflow_dispatch:
55
push:
66
paths:
77
- 'projects/project-*/**'
8-
- '.github/workflows/premake5-ubuntu-gmake.yml'
8+
- '.github/workflows/premake5-ubuntu-gmakelegacy.yml'
99
- '.github/actions/install-premake5/action.yml'
1010
- '!**/*.md'
1111
- '!projects/**/unsupported_by_*'
1212
- '!**/premake4.lua'
13-
- 'projects/**/unsupported_by_gmake'
14-
- 'projects/**/unsupported_by_premake5_gmake'
13+
- 'projects/**/unsupported_by_gmakelegacy'
14+
- 'projects/**/unsupported_by_premake5_gmakelegacy'
1515

1616
pull_request:
1717
paths:
1818
- 'projects/project-*/**'
19-
- '.github/workflows/premake5-ubuntu-gmake.yml'
19+
- '.github/workflows/premake5-ubuntu-gmakelegacy.yml'
2020
- '.github/actions/install-premake5/action.yml'
2121
- '!**/*.md'
2222
- '!projects/**/unsupported_by_*'
2323
- '!**/premake4.lua'
24-
- 'projects/**/unsupported_by_gmake'
25-
- 'projects/**/unsupported_by_premake5_gmake'
24+
- 'projects/**/unsupported_by_gmakelegacy'
25+
- 'projects/**/unsupported_by_premake5_gmakelegacy'
2626

2727
jobs:
2828
linux:
@@ -41,10 +41,10 @@ jobs:
4141
run: make --version
4242

4343
- name: test projects default(gcc)
44-
run: python3 ./test_projects.py premake5 projects gmake
44+
run: python3 ./test_projects.py premake5 projects gmakelegacy
4545

4646
- name: test projects gcc
47-
run: python3 ./test_projects.py premake5 projects gmake --cc=gcc
47+
run: python3 ./test_projects.py premake5 projects gmakelegacy --cc=gcc
4848

4949
- name: test projects clang
50-
run: python3 ./test_projects.py premake5 projects gmake --cc=clang
50+
run: python3 ./test_projects.py premake5 projects gmakelegacy --cc=clang

‎Readme.md‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ Sample projects for integration testing [premake4/premake5](https://premake.gith
1313
- [Module Ninja](https://github.com/jimon/premake-ninja)
1414
- [Module qmake](https://github.com/Jarod42/premake-qmake) (fixed fork)
1515

16-
||gmake|gmake2|Codelite|Msvc vs2019|Msvc vs2022|xcode4|CodeBlocks|CMake|Ninja|qmake|
16+
||gmakelegacy[^gmakelegacy]|gmake2|Codelite|Msvc vs2019|Msvc vs2022|xcode4|CodeBlocks|CMake|Ninja|qmake|
1717
|:---|:---:|:---:|:---:|:---:|:---:|:---:|:---:|:---:|:---:|:---:|
1818
||![Premake5 ubuntu gmake badge][1]|![Premake5 ubuntu gmake2 badge][2]![Premake5 windows gmake2 badge][3]|![Premake5 ubuntu codelite badge][4]|![Premake5 windows msvc 2019 badge][5]|![Premake5 windows msvc 2022 badge][6]|![Premake5 mac_xcode4 badge][7]|![Premake5 ubuntu codeblocks badge][8]|![Premake5 ubuntu cmake badge][9]![Premake5 ubuntu cmake badge][10]|![Premake5 ubuntu ninja badge][11]![Premake5 window ninja badge][12]|![Premake5 ubuntu qmake badge][13]|
1919
|[`location`](https://premake.github.io/docs/location)|:heavy_check_mark:|:heavy_check_mark:|:heavy_check_mark:|:heavy_check_mark:|:heavy_check_mark:|:heavy_check_mark::warning:[^project_location]|:heavy_check_mark:|:heavy_check_mark:|:heavy_check_mark:|:grey_question:|
@@ -59,7 +59,7 @@ Sample projects for integration testing [premake4/premake5](https://premake.gith
5959
- using [premake-qt module](https://github.com/dcourtois/premake-qt) for all generators but qmake :information_source:[^qmake_premake_qt_incompatible].
6060
- with [Module qmake](https://github.com/Jarod42/premake-qmake) (fixed fork)
6161

62-
||gmake|gmake2|Codelite|Msvc vs2019|Msvc vs2022|xcode4|CodeBlocks|CMake|Ninja|qmake :information_source:[^qmake_premake_qt_incompatible]|
62+
||gmakelegacy[^gmakelegacy]|gmake2|Codelite|Msvc vs2019|Msvc vs2022|xcode4|CodeBlocks|CMake|Ninja|qmake :information_source:[^qmake_premake_qt_incompatible]|
6363
|:---|:---:|:---:|:---:|:---:|:---:|:---:|:---:|:---:|:---:|:---:|
6464
||![qt gmake badge][20]|![qt gmake2 badge][21]|![qt Codelite badge][22]|![qt msvc badge][23]|![qt msvc badge][24]|![qt xcode badge][25]|![qt codeblocks badge][26]|![qt cmake badge][27]|![qt ninja badge][28]|![qt qmake badge][29]|
6565
|basic|:heavy_check_mark:|:heavy_check_mark:|:heavy_check_mark:|:heavy_check_mark:|:heavy_check_mark:|:heavy_check_mark:|:heavy_check_mark:|:heavy_check_mark:|:heavy_check_mark:|:heavy_check_mark:|
@@ -93,6 +93,7 @@ Sample projects for integration testing [premake4/premake5](https://premake.gith
9393
[28]:https://github.com/Jarod42/premake-sample-projects/actions/workflows/premake5-qt-ubuntu-ninja.yml/badge.svg
9494
[29]:https://github.com/Jarod42/premake-sample-projects/actions/workflows/premake5-qt-ubuntu-qmake.yml/badge.svg
9595

96+
[^gmakelegacy]: :information_source: https://github.com/premake/premake-core/pull/2404 rename gmake into gmakelegacy
9697
[^untested_by_ci]: :information_source: Not tested by the CI even if projects uses them.
9798
[^project_location]: :warning: project location != workspace/solution location unsupported though.
9899
[^objdir_extra]: :information_source: premake appends extra `$(configName)/$(AppName)`.

‎projects-qt/project-qt/premake5.lua‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ end
5656
qtlreleaseargs { "-nounfinished" }
5757

5858
qtqmgenerateddir "%{cfg.targetdir}"
59-
if _ACTION == "gmake" or _ACTION == "gmake2" or _ACTION == "codeblocks" then
59+
if _ACTION == "gmakelegacy" or _ACTION == "gmake2" or _ACTION == "codeblocks" then
6060
-- qrelease doesn't create intermediate directory
6161
-- and those actions don't create sub-directories neither for custombuild
6262
-- So do it as pre-build step

‎projects-qt/project-translation/premake5.lua‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ end
4949
qtlreleaseargs { "-nounfinished" }
5050

5151
qtqmgenerateddir "%{cfg.targetdir}"
52-
if _ACTION == "gmake" or _ACTION == "gmake2" or _ACTION == "codeblocks" then
52+
if _ACTION == "gmakelegacy" or _ACTION == "gmake2" or _ACTION == "codeblocks" then
5353
-- qrelease doesn't create intermediate directory
5454
-- and those actions don't create sub-directories neither for custombuild
5555
-- So do it as pre-build step

‎projects-qt/project-without-premake-qt/premake5.lua‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ else
143143
premake.error("Not supported QtVersion " .. _OPTIONS["qt-version"])
144144
end
145145

146-
if _ACTION == "gmake" then
146+
if _ACTION == "gmakelegacy" then
147147
filter "files:**.ts"
148148
lrelease_command()
149149

‎projects/project-06-custom-rule/unsupported_by_gmake‎ renamed to ‎projects/project-06-custom-rule/unsupported_by_gmakelegacy‎

File renamed without changes.

‎projects/project-C++20-module/unsupported_by_gmake‎ renamed to ‎projects/project-C++20-module/unsupported_by_gmakelegacy‎

File renamed without changes.

‎projects/project-buildaction_copy/unsupported_by_gmake‎ renamed to ‎projects/project-buildaction_copy/unsupported_by_gmakelegacy‎

File renamed without changes.

‎projects/project-compileas/unsupported_by_gmake‎ renamed to ‎projects/project-compileas/unsupported_by_gmakelegacy‎

File renamed without changes.

0 commit comments

Comments
 (0)