Follow premake renaming of gmake2 into gmake

Author: Jarod42

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

@@ -1,29 +1,29 @@
-name: premake5-qt-ubuntu-gmake2
+name: premake5-qt-ubuntu-gmake
 
 on:
   workflow_dispatch:
   push:
     paths:
       - 'projects-qt/project-*/**'
-      - '.github/workflows/premake5-qt-ubuntu-gmake2.yml'
+      - '.github/workflows/premake5-qt-ubuntu-gmake.yml'
       - '.github/actions/install-premake5/action.yml'
       - '!**/*.md'
       - '!projects-qt/**/unsupported_by_*'
       - '!**/premake4.lua'
-      - 'projects-qt/**/unsupported_by_gmake2'
-      - 'projects-qt/**/unsupported_by_premake5_gmake2'
+      - 'projects-qt/**/unsupported_by_gmake'
+      - 'projects-qt/**/unsupported_by_premake5_gmake'
       - 'submodules/premake-qt'
 
   pull_request:
     paths:
       - 'projects-qt/project-*/**'
-      - '.github/workflows/premake5-qt-ubuntu-gmake2.yml'
+      - '.github/workflows/premake5-qt-ubuntu-gmake.yml'
       - '.github/actions/install-premake5/action.yml'
       - '!**/*.md'
       - '!projects-qt/**/unsupported_by_*'
       - '!**/premake4.lua'
-      - 'projects-qt/**/unsupported_by_gmake2'
-      - 'projects-qt/**/unsupported_by_premake5_gmake2'
+      - 'projects-qt/**/unsupported_by_gmake'
+      - 'projects-qt/**/unsupported_by_premake5_gmake'
       - 'submodules/premake-qt'
 
 jobs:
@@ -69,4 +69,4 @@ jobs:
       run: | # fake X-server as Qt widget requires displays :/
         # Cannot use environment variable ($QT_ROOT_DIR ) in command line, so use environment variable (QT_DIR) or its hardcoded value
         #--qt-root=/home/runner/work/premake-sample-projects/Qt/5.15.0/gcc_64
-        xvfb-run -a python3 ./test_projects.py premake5 projects-qt gmake2 --scripts=`pwd` --qt-version=${{ matrix.qt-version }}
+        xvfb-run -a python3 ./test_projects.py premake5 projects-qt gmake --scripts=`pwd` --qt-version=${{ matrix.qt-version }}

.github/workflows/premake5-ubuntu-gmake2.yml renamed to .github/workflows/premake5-ubuntu-gmake.yml

@@ -1,28 +1,28 @@
-name: premake5-ubuntu-gmake2
+name: premake5-ubuntu-gmake
 
 on:
   workflow_dispatch:
   push:
     paths:
       - 'projects/project-*/**'
-      - '.github/workflows/premake5-ubuntu-gmake2.yml'
+      - '.github/workflows/premake5-ubuntu-gmake.yml'
       - '.github/actions/install-premake5/action.yml'
       - '!**/*.md'
       - '!projects/**/unsupported_by_*'
       - '!**/premake4.lua'
-      - 'projects/**/unsupported_by_gmake2'
-      - 'projects/**/unsupported_by_premake5_gmake2'
+      - 'projects/**/unsupported_by_gmake'
+      - 'projects/**/unsupported_by_premake5_gmake'
 
   pull_request:
     paths:
       - 'projects/project-*/**'
-      - '.github/workflows/premake5-ubuntu-gmake2.yml'
+      - '.github/workflows/premake5-ubuntu-gmake.yml'
       - '.github/actions/install-premake5/action.yml'
       - '!**/*.md'
       - '!projects/**/unsupported_by_*'
       - '!**/premake4.lua'
       - 'projects/**/unsupported_by_gmake2'
-      - 'projects/**/unsupported_by_premake5_gmake2'
+      - 'projects/**/unsupported_by_premake5_gmake'
 
 jobs:
   linux:
@@ -41,10 +41,10 @@ jobs:
       run: make --version
 
     - name: test projects default(gcc)
-      run: python3 ./test_projects.py premake5 projects gmake2
+      run: python3 ./test_projects.py premake5 projects gmake
 
     - name: test projects gcc
-      run: python3 ./test_projects.py premake5 projects gmake2 --cc=gcc
+      run: python3 ./test_projects.py premake5 projects gmake --cc=gcc
 
     - name: test projects clang
-      run: python3 ./test_projects.py premake5 projects gmake2 --cc=clang
+      run: python3 ./test_projects.py premake5 projects gmake --cc=clang

.github/workflows/premake5-windows-gmake2.yml renamed to .github/workflows/premake5-windows-gmake.yml

@@ -1,32 +1,30 @@
-name: premake5-windows-gmake2
+name: premake5-windows-gmake
 
 on:
   workflow_dispatch:
   push:
     paths:
       - 'projects/project-*/**'
-      - '.github/workflows/premake5-windows-gmake2.yml'
+      - '.github/workflows/premake5-windows-gmake.yml'
       - '.github/actions/install-premake5/action.yml'
       - '!**/*.md'
       - '!projects/**/unsupported_by_*'
       - '!**/premake4.lua'
-      - 'projects/**/unsupported_by_gmake2'
-      - 'projects/**/unsupported_by_gmake2_windows'
-      - 'projects/**/unsupported_by_premake5_gmake2'
-      - 'submodules/premake-gmake2'
+      - 'projects/**/unsupported_by_gmake'
+      - 'projects/**/unsupported_by_gmake_windows'
+      - 'projects/**/unsupported_by_premake5_gmake'
 
   pull_request:
     paths:
       - 'projects/project-*/**'
-      - '.github/workflows/premake5-windows-gmake2.yml'
+      - '.github/workflows/premake5-windows-gmake.yml'
       - '.github/actions/install-premake5/action.yml'
       - '!**/*.md'
       - '!projects/**/unsupported_by_*'
       - '!**/premake4.lua'
-      - 'projects/**/unsupported_by_gmake2'
-      - 'projects/**/unsupported_by_gmake2_windows'
-      - 'projects/**/unsupported_by_premake5_gmake2'
-      - 'submodules/premake-gmake2'
+      - 'projects/**/unsupported_by_gmake'
+      - 'projects/**/unsupported_by_gmake_windows'
+      - 'projects/**/unsupported_by_premake5_gmake'
 
 jobs:
   windows:
@@ -45,10 +43,10 @@ jobs:
 
     - name: test projects
       run: |
-        python3 ./test_projects.py premake5 projects gmake2 --shell=posix
+        python3 ./test_projects.py premake5 projects gmake --shell=posix
       shell: bash
 
 #    - name: test projects
 #      run: |
-#        python3 ./test_projects.py premake5 projects gmake2
+#        python3 ./test_projects.py premake5 projects gmake
 #      shell: cmd

Readme.md

@@ -13,9 +13,9 @@ Sample projects for integration testing [premake4/premake5](https://premake.gith
 - [Module Ninja](https://github.com/jimon/premake-ninja)
 - [Module qmake](https://github.com/Jarod42/premake-qmake) (fixed fork)
 
-||gmakelegacy[^gmakelegacy]|gmake2|Codelite|Msvc vs2019|Msvc vs2022|xcode4|CodeBlocks|CMake|Ninja|qmake|
+||gmakelegacy:information_source:[^gmakelegacy]|gmake:information_source:[^game2]|Codelite|Msvc vs2019|Msvc vs2022|xcode4|CodeBlocks|CMake|Ninja|qmake|
 |:---|:---:|:---:|:---:|:---:|:---:|:---:|:---:|:---:|:---:|:---:|
-||![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]|
+||![Premake5 ubuntu gmake badge][1]|![Premake5 ubuntu gmake badge][2]![Premake5 windows gmake 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]|
 |[`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:|
 |[`targetdir`](https://premake.github.io/docs/targetdir)|: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:|
 |[`targetname`](https://premake.github.io/docs/targetname)|: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:|
@@ -59,7 +59,7 @@ Sample projects for integration testing [premake4/premake5](https://premake.gith
 - using [premake-qt module](https://github.com/dcourtois/premake-qt) for all generators but qmake :information_source:[^qmake_premake_qt_incompatible].
 - with [Module qmake](https://github.com/Jarod42/premake-qmake) (fixed fork)
 
-||gmakelegacy[^gmakelegacy]|gmake2|Codelite|Msvc vs2019|Msvc vs2022|xcode4|CodeBlocks|CMake|Ninja|qmake :information_source:[^qmake_premake_qt_incompatible]|
+||gmakelegacy:information_source:[^gmakelegacy]|gmake:information_source:[^game2]|Codelite|Msvc vs2019|Msvc vs2022|xcode4|CodeBlocks|CMake|Ninja|qmake :information_source:[^qmake_premake_qt_incompatible]|
 |:---|:---:|:---:|:---:|:---:|:---:|:---:|:---:|:---:|:---:|:---:|
 ||![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]|
 |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:|
@@ -69,8 +69,8 @@ Sample projects for integration testing [premake4/premake5](https://premake.gith
 |uic|: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:|
 
 [1]:https://github.com/Jarod42/premake-sample-projects/actions/workflows/premake5-ubuntu-gmakelegacy.yml/badge.svg
-[2]:https://github.com/Jarod42/premake-sample-projects/actions/workflows/premake5-ubuntu-gmake2.yml/badge.svg
-[3]:https://github.com/Jarod42/premake-sample-projects/actions/workflows/premake5-windows-gmake2.yml/badge.svg
+[2]:https://github.com/Jarod42/premake-sample-projects/actions/workflows/premake5-ubuntu-gmake.yml/badge.svg
+[3]:https://github.com/Jarod42/premake-sample-projects/actions/workflows/premake5-windows-gmake.yml/badge.svg
 [4]:https://github.com/Jarod42/premake-sample-projects/actions/workflows/premake5-ubuntu-codelite.yml/badge.svg
 [5]:https://github.com/Jarod42/premake-sample-projects/actions/workflows/premake5-windows-msvc-2019.yml/badge.svg
 [6]:https://github.com/Jarod42/premake-sample-projects/actions/workflows/premake5-windows-msvc-2022.yml/badge.svg
@@ -83,7 +83,7 @@ Sample projects for integration testing [premake4/premake5](https://premake.gith
 [13]:https://github.com/Jarod42/premake-sample-projects/actions/workflows/premake5-ubuntu-qmake.yml/badge.svg
 
 [20]:https://github.com/Jarod42/premake-sample-projects/actions/workflows/premake5-qt-ubuntu-gmakelegacy.yml/badge.svg
-[21]:https://github.com/Jarod42/premake-sample-projects/actions/workflows/premake5-qt-ubuntu-gmake2.yml/badge.svg
+[21]:https://github.com/Jarod42/premake-sample-projects/actions/workflows/premake5-qt-ubuntu-gmake.yml/badge.svg
 [22]:https://github.com/Jarod42/premake-sample-projects/actions/workflows/premake5-qt-ubuntu-codelite.yml/badge.svg
 [23]:https://github.com/Jarod42/premake-sample-projects/actions/workflows/premake5-qt-windows-msvc-2019.yml/badge.svg
 [24]:https://github.com/Jarod42/premake-sample-projects/actions/workflows/premake5-qt-windows-msvc-2022.yml/badge.svg
@@ -93,7 +93,8 @@ Sample projects for integration testing [premake4/premake5](https://premake.gith
 [28]:https://github.com/Jarod42/premake-sample-projects/actions/workflows/premake5-qt-ubuntu-ninja.yml/badge.svg
 [29]:https://github.com/Jarod42/premake-sample-projects/actions/workflows/premake5-qt-ubuntu-qmake.yml/badge.svg
 
-[^gmakelegacy]: :information_source: https://github.com/premake/premake-core/pull/2404 rename gmake into gmakelegacy
+[^gmakelegacy]: :information_source: https://github.com/premake/premake-core/pull/2404 renames gmake into gmakelegacy
+[^game2]: :information_source: https://github.com/premake/premake-core/pull/2408 renames gmake2 into gmake
 [^untested_by_ci]: :information_source: Not tested by the CI even if projects uses them.
 [^project_location]: :warning: project location != workspace/solution location unsupported though.
 [^objdir_extra]: :information_source: premake appends extra `$(configName)/$(AppName)`.

projects-qt/project-qt/premake5.lua

@@ -56,7 +56,7 @@ end
   qtlreleaseargs { "-nounfinished" }
 
   qtqmgenerateddir "%{cfg.targetdir}"
-  if _ACTION == "gmakelegacy" or _ACTION == "gmake2" or _ACTION == "codeblocks" then
+  if _ACTION == "gmakelegacy" or _ACTION == "gmake" or _ACTION == "codeblocks" then
     -- qrelease doesn't create intermediate directory
     -- and those actions don't create sub-directories neither for custombuild
     -- So do it as pre-build step

projects-qt/project-translation/premake5.lua

@@ -49,7 +49,7 @@ end
   qtlreleaseargs { "-nounfinished" }
 
   qtqmgenerateddir "%{cfg.targetdir}"
-  if _ACTION == "gmakelegacy" or _ACTION == "gmake2" or _ACTION == "codeblocks" then
+  if _ACTION == "gmakelegacy" or _ACTION == "gmake" or _ACTION == "codeblocks" then
     -- qrelease doesn't create intermediate directory
     -- and those actions don't create sub-directories neither for custombuild
     -- So do it as pre-build step