Changeset 7749646 in mainline for meson

Timestamp:

2019-08-17T12:49:44Z (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:

6068476

Parents:

e3737eda

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2019-07-16 17:44:58)

git-committer:

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

Message:

Add tools/export.sh to replace make export

Location:

meson/part

Files:

• exports/meson.build (modified) (2 diffs)
• initrd/install_devel.sh.in (added)
• initrd/meson.build (modified) (2 diffs)

meson/part/exports/meson.build

@@ -9 +9 @@
 
 export_cppflags = [
-        '-isystem', '$(HELENOS_EXPORT_ROOT)/include/posix',
+        '-isystem', '$(HELENOS_EXPORT_ROOT)/include/libposix',
         '-isystem', '$(HELENOS_EXPORT_ROOT)/include/libc',
         '-idirafter', '$(HELENOS_EXPORT_ROOT)/include',
@@ -56 +56 @@
         capture: true,
 )
-
-install_files += [[ 'config', meson.current_build_dir() / 'config.mk', 'config.mk' ]]
-install_deps += [ config_mk ]
-install_files += [[ 'config', meson.current_build_dir() / 'config.sh', 'config.sh' ]]
-install_deps += [ config_sh ]

meson/part/initrd/meson.build

@@ -31 +31 @@
 endforeach
 
+if CONFIG_DEVEL_FILES
+        install_script_text += uspace_lib_devel_install_script_text
+endif
+
+install_devel_script = configure_file(
+        configuration: { 'text' : '\n'.join(uspace_lib_devel_install_script_text) },
+        input: 'install_devel.sh.in',
+        output: 'install_devel.sh',
+)
+
 install_script_text += uspace_lib_install_script_text
 
@@ -42 +52 @@
 
 dist_dir = meson.build_root() / 'dist/'
+
+run_target('devel-headers',
+        command: [ sh, install_devel_script, dist_dir ],
+)
 
 dist = custom_target('DIST',