Skip to content

Commit a73d125

Browse files
nickclark2016nickclark2016
committed
Merge remote-tracking branch 'origin/master' into feature/ninja-exporter
2 parents 753c49c + e38ef3f commit a73d125

File tree

19 files changed

+184
-60
lines changed

19 files changed

+184
-60
lines changed

‎.github/workflows/ci-workflow.yml‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
timeout-minutes: 15
1515
steps:
1616
- name: Checkout
17-
uses: actions/checkout@v5
17+
uses: actions/checkout@v6
1818
- name: Install booststrap's dependencies
1919
run: |
2020
sudo apt-get update
@@ -32,7 +32,7 @@ jobs:
3232
run: bin/${{ matrix.config }}/premake5 docs-check
3333
- name: Upload Artifacts
3434
if: matrix.config == 'release' && matrix.depsrc == 'contrib' && matrix.cc == 'gcc'
35-
uses: actions/upload-artifact@v4
35+
uses: actions/upload-artifact@v5
3636
with:
3737
name: premake-linux-${{ matrix.platform }}
3838
path: bin/${{ matrix.config }}/
@@ -45,7 +45,7 @@ jobs:
4545
timeout-minutes: 15
4646
steps:
4747
- name: Checkout
48-
uses: actions/checkout@v5
48+
uses: actions/checkout@v6
4949
- name: Build
5050
run: PLATFORM=${{ matrix.platform }} CONFIG=${{ matrix.config }} ./Bootstrap.sh
5151
- name: Test
@@ -54,7 +54,7 @@ jobs:
5454
run: bin/${{ matrix.config }}/premake5 docs-check
5555
- name: Upload Artifacts
5656
if: matrix.config == 'release'
57-
uses: actions/upload-artifact@v4
57+
uses: actions/upload-artifact@v5
5858
with:
5959
name: premake-macosx-${{ matrix.platform }}
6060
path: bin/${{ matrix.config }}/
@@ -68,7 +68,7 @@ jobs:
6868
timeout-minutes: 15
6969
steps:
7070
- name: Checkout
71-
uses: actions/checkout@v5
71+
uses: actions/checkout@v6
7272
- name: Build
7373
shell: cmd
7474
env:
@@ -83,7 +83,7 @@ jobs:
8383
shell: cmd
8484
- name: Upload Artifacts
8585
if: matrix.config == 'release'
86-
uses: actions/upload-artifact@v4
86+
uses: actions/upload-artifact@v5
8787
with:
8888
name: premake-windows-${{ matrix.platform }}
8989
path: bin\${{ matrix.config }}\
@@ -106,7 +106,7 @@ jobs:
106106
shell: msys2 {0}
107107
steps:
108108
- name: Checkout
109-
uses: actions/checkout@v5
109+
uses: actions/checkout@v6
110110
- name: 'Setup MSYS2'
111111
uses: msys2/setup-msys2@v2
112112
with:
@@ -133,7 +133,7 @@ jobs:
133133
run: bin/${{ matrix.config }}/premake5.exe docs-check
134134
- name: Upload Artifacts
135135
if: matrix.config == 'release' && matrix.depsrc == 'contrib' && matrix.cc == 'mingw'
136-
uses: actions/upload-artifact@v4
136+
uses: actions/upload-artifact@v5
137137
with:
138138
name: premake-${{ matrix.msystem }}-${{ matrix.platform }}
139139
path: bin\${{ matrix.config }}\
@@ -146,7 +146,7 @@ jobs:
146146
timeout-minutes: 15
147147
steps:
148148
- name: Checkout
149-
uses: actions/checkout@v5
149+
uses: actions/checkout@v6
150150
- uses: tritao/[email protected]
151151
with:
152152
version: '3.9.2'
@@ -158,7 +158,7 @@ jobs:
158158
run: bin/${{ matrix.config }}/premake5 docs-check
159159
- name: Upload Artifacts
160160
if: matrix.config == 'release'
161-
uses: actions/upload-artifact@v4
161+
uses: actions/upload-artifact@v5
162162
with:
163163
name: premake-cosmopolitan-universal
164164
path: bin/${{ matrix.config }}/premake5
@@ -175,9 +175,9 @@ jobs:
175175
shell: freebsd {0}
176176
steps:
177177
- name: Checkout
178-
uses: actions/checkout@v5
178+
uses: actions/checkout@v6
179179
- name: Start FreeBSD VM
180-
uses: vmactions/[email protected].4
180+
uses: vmactions/[email protected].7
181181
with:
182182
usesh: true
183183
sync: sshfs
@@ -197,7 +197,7 @@ jobs:
197197
bin/${{ matrix.config }}/premake5 docs-check
198198
- name: Upload Artifacts
199199
if: matrix.config == 'release' && matrix.cc == 'clang'
200-
uses: actions/upload-artifact@v4
200+
uses: actions/upload-artifact@v5
201201
with:
202202
name: premake-freebsd-${{ matrix.platform }}
203203
path: bin/${{ matrix.config }}/
@@ -214,9 +214,9 @@ jobs:
214214
shell: openbsd {0}
215215
steps:
216216
- name: Checkout
217-
uses: actions/checkout@v5
217+
uses: actions/checkout@v6
218218
- name: Start OpenBSD VM
219-
uses: vmactions/[email protected].0
219+
uses: vmactions/[email protected].3
220220
with:
221221
usesh: true
222222
sync: sshfs
@@ -236,7 +236,7 @@ jobs:
236236
bin/${{ matrix.config }}/premake5 docs-check
237237
- name: Upload Artifacts
238238
if: matrix.config == 'release' && matrix.cc == 'clang'
239-
uses: actions/upload-artifact@v4
239+
uses: actions/upload-artifact@v5
240240
with:
241241
name: premake-openbsd-${{ matrix.platform }}
242242
path: bin/${{ matrix.config }}/
@@ -253,9 +253,9 @@ jobs:
253253
shell: netbsd {0}
254254
steps:
255255
- name: Checkout
256-
uses: actions/checkout@v5
256+
uses: actions/checkout@v6
257257
- name: Build on NetBSD VM
258-
uses: vmactions/[email protected].0
258+
uses: vmactions/[email protected].1
259259
with:
260260
usesh: true
261261
prepare: |
@@ -269,7 +269,7 @@ jobs:
269269
bin/${{ matrix.config }}/premake5 docs-check
270270
- name: Upload Artifacts
271271
if: matrix.config == 'release'
272-
uses: actions/upload-artifact@v4
272+
uses: actions/upload-artifact@v5
273273
with:
274274
name: premake-netbsd-${{ matrix.platform }}
275275
path: bin/${{ matrix.config }}/
@@ -286,9 +286,9 @@ jobs:
286286
shell: dragonflybsd {0}
287287
steps:
288288
- name: Checkout
289-
uses: actions/checkout@v5
289+
uses: actions/checkout@v6
290290
- name: Build on DragonflyBSD VM
291-
uses: vmactions/[email protected].1
291+
uses: vmactions/[email protected].2
292292
with:
293293
usesh: true
294294
prepare: |
@@ -300,7 +300,7 @@ jobs:
300300
bin/${{ matrix.config }}/premake5 docs-check
301301
- name: Upload Artifacts
302302
if: matrix.config == 'release' && matrix.cc == 'gcc'
303-
uses: actions/upload-artifact@v4
303+
uses: actions/upload-artifact@v5
304304
with:
305305
name: premake-dragonflybsd-${{ matrix.platform }}
306306
path: bin/${{ matrix.config }}/
@@ -317,9 +317,9 @@ jobs:
317317
shell: solaris {0}
318318
steps:
319319
- name: Checkout
320-
uses: actions/checkout@v5
320+
uses: actions/checkout@v6
321321
- name: Build on Solaris VM
322-
uses: vmactions/[email protected].5
322+
uses: vmactions/[email protected].6
323323
with:
324324
usesh: true
325325
cpu: 4
@@ -332,7 +332,7 @@ jobs:
332332
bin/${{ matrix.config }}/premake5 docs-check
333333
- name: Upload Artifacts
334334
if: matrix.config == 'release' && matrix.cc == 'gcc'
335-
uses: actions/upload-artifact@v4
335+
uses: actions/upload-artifact@v5
336336
with:
337337
name: premake-solaris-${{ matrix.platform }}
338338
path: bin/${{ matrix.config }}/
@@ -349,9 +349,9 @@ jobs:
349349
shell: omnios {0}
350350
steps:
351351
- name: Checkout
352-
uses: actions/checkout@v5
352+
uses: actions/checkout@v6
353353
- name: Build on OmniOS VM
354-
uses: vmactions/[email protected].1
354+
uses: vmactions/[email protected].2
355355
with:
356356
usesh: true
357357
prepare: |
@@ -363,7 +363,7 @@ jobs:
363363
bin/${{ matrix.config }}/premake5 docs-check
364364
- name: Upload Artifacts
365365
if: matrix.config == 'release' && matrix.cc == 'gcc'
366-
uses: actions/upload-artifact@v4
366+
uses: actions/upload-artifact@v5
367367
with:
368368
name: premake-omnios-${{ matrix.platform }}
369369
path: bin/${{ matrix.config }}/

‎.github/workflows/website.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ jobs:
1010
checks:
1111
runs-on: ubuntu-latest
1212
steps:
13-
- uses: actions/checkout@v5
14-
- uses: actions/setup-node@v5
13+
- uses: actions/checkout@v6
14+
- uses: actions/setup-node@v6
1515
with:
1616
node-version: '18'
1717
- name: Test Build
@@ -23,10 +23,10 @@ jobs:
2323
if: github.repository_owner == 'premake' && github.event_name == 'push' && github.ref == 'refs/heads/master'
2424
runs-on: ubuntu-latest
2525
steps:
26-
- uses: actions/checkout@v5
26+
- uses: actions/checkout@v6
2727
with:
2828
fetch-depth: 0
29-
- uses: actions/setup-node@v5
29+
- uses: actions/setup-node@v6
3030
with:
3131
node-version: '18'
3232
- name: Add key to allow access to repository

‎Bootstrap.bat‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,9 @@ IF "%vsversion%" == "vs2010" (
4747
) ELSE IF "%vsversion%" == "vs2022" (
4848
CALL :VsWhereVisualBootstrap "%vsversion%" "17.0" "18.0"
4949

50+
) ELSE IF "%vsversion%" == "vs18" (
51+
CALL :VsWhereVisualBootstrap "vs2026" "18.0" "19.0"
52+
5053
) ELSE (
5154
ECHO Unrecognized Visual Studio version %vsversion%
5255
EXIT /B 2

‎Bootstrap.mak‎

Lines changed: 22 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,25 @@ SRC = src/host/*.c \
4040
$(LUA_DIR)/lvm.c \
4141
$(LUA_DIR)/lzio.c \
4242

43+
ifdef MAKEDIR:
44+
!ifdef MAKEDIR
45+
46+
# NMAKE
47+
48+
!if "$(MSDEV)" == "vs2010" || "$(MSDEV)" == "vs2012" || "$(MSDEV)" == "vs2013" || "$(MSDEV)" == "vs2015" || "$(MSDEV)" == "vs2017" || "$(MSDEV)" == "vs2019" || "$(MSDEV)" == "vs2022"
49+
SLN_EXT = sln
50+
!else
51+
SLN_EXT = slnx
52+
!endif
53+
54+
!else
55+
else
56+
57+
# make
58+
59+
endif
60+
!endif : # !endif has to be last to work in make
61+
4362
HOST_PLATFORM= none
4463

4564
.PHONY: default none clean nix-clean windows-clean \
@@ -148,11 +167,11 @@ windows-base: windows-clean
148167
.\build\bootstrap\premake_bootstrap --arch=$(PLATFORM) --to=build/bootstrap $(PREMAKE_OPTS) $(MSDEV)
149168

150169
windows: windows-base
151-
devenv .\build\bootstrap\Premake5.sln /Upgrade
152-
devenv .\build\bootstrap\Premake5.sln /Build "$(CONFIG)|$(PLATFORM:x86=win32)"
170+
devenv .\build\bootstrap\Premake5.$(SLN_EXT) /Upgrade
171+
devenv .\build\bootstrap\Premake5.$(SLN_EXT) /Build "$(CONFIG)|$(PLATFORM:x86=win32)"
153172

154173
windows-msbuild: windows-base
155-
msbuild /p:Configuration=$(CONFIG) /p:Platform=$(PLATFORM:x86=win32) .\build\bootstrap\Premake5.sln
174+
msbuild /p:Configuration=$(CONFIG) /p:Platform=$(PLATFORM:x86=win32) .\build\bootstrap\Premake5.$(SLN_EXT)
156175

157176
cosmo-clean: nix-clean
158177

‎modules/vstudio/tests/_tests.lua‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,7 @@ return {
114114
"vc2022/test_toolset_settings.lua",
115115

116116
-- Android projects
117+
"android/test_android_build_settings.lua",
117118
"android/test_android_files.lua",
118119
"android/test_android_project.lua",
119120

‎modules/vstudio/tests/android/test_android_build_settings.lua‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
local p = premake
2+
local suite = test.declare("vstudio_vs2010_android_compile_settings")
3+
local vc2010 = p.vstudio.vc2010
4+
local project = p.project
5+
6+
--
7+
-- Setup
8+
--
9+
10+
local wks, prj
11+
12+
function suite.setup()
13+
p.action.set("vs2015")
14+
system "android"
15+
wks, prj = test.createWorkspace()
16+
end
17+
18+
local function prepare(platform)
19+
local cfg = test.getconfig(prj, "Debug", platform)
20+
vc2010.clCompile(cfg)
21+
end
22+
23+
--
24+
-- Visibility settings should go into AdditionalOptions
25+
--
26+
27+
function suite.additionalOptions_onVisibility()
28+
visibility "Default"
29+
prepare()
30+
test.capture [[
31+
<ClCompile>
32+
<PrecompiledHeader>NotUsing</PrecompiledHeader>
33+
<Optimization>Disabled</Optimization>
34+
<AdditionalOptions>-fvisibility=default %(AdditionalOptions)</AdditionalOptions>
35+
]]
36+
end

0 commit comments

Comments
 (0)