Some windows fixes.

pull/15/head
Jussi Pakkanen 11 years ago
parent f34be394b0
commit eeaa5d0684
  1. 5
      test cases/common/16 configure file/meson.build
  2. 5
      test cases/common/55 file grabber/grabber2.bat
  3. 2
      test cases/common/55 file grabber/meson.build

@ -15,13 +15,14 @@ e = executable('inctest', 'prog.c', include_dirs : include_directories('.'))
test('inctest', e)
# Now generate a header file with an external script.
genprog = find_program('generator.py')
genprog = find_program('python3')
scriptfile = '@0@/generator.py'.format(meson.current_source_dir())
ifile = '@0@/dummy.dat'.format(meson.current_source_dir())
ofile = '@0@/config2.h'.format(meson.current_build_dir())
configure_file(input : 'dummy.dat',
output : 'config2.h',
command : [genprog, ifile, ofile])
command : [genprog, scriptfile, ifile, ofile])
test('inctest2', executable('prog2', 'prog2.c',
include_dirs : include_directories('.')))

@ -0,0 +1,5 @@
@ECHO OFF
echo suba.c
echo subb.c
echo subc.c
echo subprog.c

@ -11,7 +11,7 @@ project('grabber', 'c')
if build.name() == 'windows'
c = run_command('grabber.bat')
grabber = find_program('grabber.bat')
grabber = find_program('grabber2.bat')
else
c = run_command('grabber.sh')
grabber = find_program('grabber.sh')

Loading…
Cancel
Save