Changeset 123cd6d in mainline for meson.build

Timestamp:

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

2d75831

Parents:

b2695b9

git-author:

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

git-committer:

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

Message:

Move more of build_dist

File:

• meson.build (modified) (4 diffs)

meson.build

@@ -385 +385 @@
 )
 
-custom_target('config.sh',
+config_sh = custom_target('config.sh',
         input: config_mk,
         output: 'config.sh',
@@ -393 +393 @@
 
 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 ]
 
 # TODO: remove
 install_files += [[ 'config', meson.current_source_dir() / 'Makefile.common', 'Makefile.common' ]]
+install_deps += files('Makefile.common')
 install_files += [[ 'config', meson.current_source_dir() / 'Makefile.config', 'Makefile.config' ]]
-
-
-# Emit and register the install script.
+install_deps += files('Makefile.config')
+
+if CONFIG_DEVEL_FILES
+        # Also install libgcc
+        libgcc = run_command(
+                cc.cmd_array(), arch_uspace_c_args, '-print-libgcc-file-name',
+                check: true,
+        ).stdout().strip()
+
+        install_files += [[ 'lib', libgcc, 'libgcc.a' ]]
+        install_deps += [ files(libgcc) ]
+endif
+
+
+# Emit the install script.
 
 install_script_text = []
+
+# Copy uspace/dist.
+_uspace = meson.current_source_dir() / 'uspace'
+install_script_text += 'cp -r -L -T -u "@0@/dist" "${DESTDIR}"'.format(_uspace)
 
 foreach f : install_files
@@ -411 +430 @@
 install_script_text += uspace_lib_install_script_text
 
-install_script_name = meson.current_build_dir() / 'install.sh'
-
 install_script = configure_file(
         configuration: { 'text' : '\n'.join(install_script_text) },
@@ -419 +436 @@
 )
 
-meson.add_install_script(install_script_name)
-
-custom_target('DIST',
-        output: 'dist.log',
+# Build up dist
+
+dist = custom_target('DIST',
+        output: 'dist.tag',
         input: [ install_script, install_deps ],
-        command: [ sh, '@INPUT0@', meson.current_build_dir()/'dist/' ],
-        capture: true,
+        command: [ sh, '-x', '-u', '-e', '@INPUT0@', '@OUTPUT@', meson.current_build_dir()/'dist/' ],
         build_by_default: true,
 )
 
+#initrd_img = custom_target('initrd.img',
+#       output: 'initrd.img',
+#       input: dist,
+
+