Changeset b2695b9 in mainline for meson.build

Timestamp:

2019-08-17T12:49:43Z (6 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

123cd6d

Parents:

740e952

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2019-06-27 16:44:01)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2019-08-17 12:49:43)

Message:

More tweaks and switch to building the dist directory during the build stage, not install stage

File:

• meson.build (modified) (6 diffs)

meson.build

@@ -22 +22 @@
 unzip = find_program('unzip')
 which = find_program('which')
+sh = find_program('sh')
 
 autocheck = generator(find_program('tools/autocheck.awk'),
@@ -382 +383 @@
         output: 'config.mk',
         configuration: conf_data,
-        install: true,
-        install_dir: 'config',
 )
 
@@ -391 +390 @@
         command: [ sed, 's:$(HELENOS_EXPORT_ROOT):${HELENOS_EXPORT_ROOT}:g', '@INPUT@' ],
         capture: true,
-        install: true,
-        install_dir: 'config',
-)
-
-install_data('Makefile.common', 'Makefile.config', install_dir: 'config')
+)
+
+install_files += [[ 'config', meson.current_build_dir() / 'config.mk', 'config.mk' ]]
+install_files += [[ 'config', meson.current_build_dir() / 'config.sh', 'config.sh' ]]
+
+# TODO: remove
+install_files += [[ 'config', meson.current_source_dir() / 'Makefile.common', 'Makefile.common' ]]
+install_files += [[ 'config', meson.current_source_dir() / 'Makefile.config', 'Makefile.config' ]]
 
 
@@ -403 +405 @@
 
 foreach f : install_files
-        _cmd = 'mkdir -p "${MESON_INSTALL_DESTDIR_PREFIX}@0@" && cp -L -T "@1@" "${MESON_INSTALL_DESTDIR_PREFIX}@0@/@2@"'
+        _cmd = 'mkdir -p "${DESTDIR}@0@" && cp -L -T "@1@" "${DESTDIR}@0@/@2@"'
         install_script_text += _cmd.format(f[0], f[1], f[2])
 endforeach
@@ -409 +411 @@
 install_script_text += uspace_lib_install_script_text
 
-configure_file(
+install_script_name = meson.current_build_dir() / 'install.sh'
+
+install_script = configure_file(
         configuration: { 'text' : '\n'.join(install_script_text) },
         input: 'install.sh.in',
@@ -415 +419 @@
 )
 
-meson.add_install_script(meson.current_build_dir() / 'install.sh')
+meson.add_install_script(install_script_name)
+
+custom_target('DIST',
+        output: 'dist.log',
+        input: [ install_script, install_deps ],
+        command: [ sh, '@INPUT0@', meson.current_build_dir()/'dist/' ],
+        capture: true,
+        build_by_default: true,
+)
+