Fix Windows build #246

pal1000 · 2022-08-21T16:23:43Z

pal1000 commented

2022-08-21 16:23:43 +00:00

Regression from #244.

pal1000 added 2 commits 2022-08-21 16:23:44 +00:00

96fab656b2 ci: Fix syntac error in build setup command

Fixes: fa803c7e

ci/woodpecker/pr/woodpecker Pipeline was successful Details

6a59466e1b Don't try running tests on Windows

Fixes: fa803c7e

psykose reviewed 2022-08-24 22:55:58 +00:00

tests/meson.build

													
				@ -19,5 +19,7 @@ tests = [

				# yuck

				foreach test : tests

				  test_file = configure_file(input: test + '.sh', output: test, copy: true)

psykose commented

2022-08-24 22:55:58 +00:00

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

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

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

psykose commented

2022-08-27 06:45:55 +00:00

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

psykose commented

2022-08-24 22:56:58 +00:00

the ci: Fix syntac error title also has a typo in it (syntax)

the `ci: Fix syntac error` title also has a typo in it (`syntax`)

pal1000 force-pushed fix-win-build-tests-feature from 6a59466e1b to ad1fe45f4e

2022-08-25 09:05:59 +00:00

Compare

dcbaker reviewed 2022-08-26 17:07:54 +00:00

tests/meson.build Outdated

													
				@ -20,3 +20,3 @@

				foreach test : tests

				  test_file = configure_file(input: test + '.sh', output: test, copy: true)

				  run_command('chmod', '755', test_file, check : true)

				  if host_machine.system() != 'windows'

dcbaker commented

2022-08-26 17:07:54 +00:00

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.