ariadne
/
pkgconf
3
6
Fork 4
Code Issues 6 Pull Requests 2 Projects Releases 2 Wiki Activity

Fix Windows build #246

Closed
pal1000 wants to merge 3 commits from pal1000/pkgconf:fix-win-build-tests-feature into master
pull from: pal1000/pkgconf:fix-win-build-tests-feature
merge into: ariadne:master
Conversation 3 Commits 3 Files Changed 2
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/test.yml vendored
View File

@ -35,7 +35,7 @@ jobs:
# the code assumes msvc style printf atm # the code assumes msvc style printf atm
export CFLAGS=-D__USE_MINGW_ANSI_STDIO=0 export CFLAGS=-D__USE_MINGW_ANSI_STDIO=0
meson -Dtests=false _build meson _build
meson compile -C _build meson compile -C _build
debian-meson: debian-meson:

2
tests/meson.build
View File

@ -19,5 +19,5 @@ tests = [
# yuck # yuck
foreach test : tests foreach test : tests
test_file = configure_file(input: test + '.sh', output: test, copy: true) test_file = configure_file(input: test + '.sh', output: test, copy: true)
psykose commented 2022-08-24 22:55:58 +00:00
Review

curious- the configure_file here can take a install_mode: 'rwxr-xr-x' argument, perhaps that works on windows too?

curious- the configure_file here can take a `install_mode: 'rwxr-xr-x'` [argument](https://mesonbuild.com/Reference-manual_functions.html#configure_file), perhaps that works on windows too?
dcbaker commented 2022-08-26 17:10:45 +00:00
Review

install_mode is set at install time by meson install. I'm going to add a build_mode to the fs.copyfile() function, which is the replacement for configure_file(copy : true) (its a lot of historical baggage that configure_file() is used to copy files.

`install_mode` is set at install time by `meson install`. I'm going to add a `build_mode` to the `fs.copyfile()` function, which is the replacement for `configure_file(copy : true)` (its a lot of historical baggage that `configure_file()` is used to copy files.
dcbaker commented 2022-08-26 17:59:52 +00:00
Review

As promised: https://github.com/mesonbuild/meson/pull/10744

As promised: https://github.com/mesonbuild/meson/pull/10744
psykose commented 2022-08-27 06:45:55 +00:00
Review

aha, thanks for the information! that looks much better once that lands in

aha, thanks for the information! that looks much better once that lands in
run_command('chmod', '755', test_file, check : true) run_command(find_program('chmod', required : false, disabler : true), '755', test_file, check : true)
dcbaker commented 2022-08-26 17:07:54 +00:00
Outdated
Review

that's the wrong fix, that will break building on msys, which reports windows but very much has chmod

something like:

run_command(find_program('chmod', required : false, disabler : true), '755', test_file, check : true)

Is a more robust solution.

that's the wrong fix, that will break building on msys, which reports windows but very much has chmod something like: ```meson run_command(find_program('chmod', required : false, disabler : true), '755', test_file, check : true) ``` Is a more robust solution.
endforeach endforeach