Changeset b2695b9 in mainline

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:

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

Files:

• Makefile (modified) (1 diff)
• install.sh.in (modified) (1 diff)
• kernel/meson.build (modified) (3 diffs)
• meson.build (modified) (6 diffs)
• uspace/lib/c/meson.build (modified) (1 diff)
• uspace/lib/meson.build (modified) (2 diffs)

Makefile

@@ -79 +79 @@
 meson: $(COMMON_MAKEFILE) $(CONFIG_MAKEFILE) $(CONFIG_HEADER) $(ERRNO_HEADER) $(BUILD_DIR)/build.ninja
         PATH="$(CROSS_PATH):$$PATH" ninja -C $(BUILD_DIR)
-        PATH="$(CROSS_PATH):$$PATH" DESTDIR="$(BUILD_DIR)/dist" meson install --no-rebuild --only-changed -C $(BUILD_DIR)
 
 test-xcw: meson export-cross

install.sh.in

@@ -1 +1 @@
 #!/bin/sh
 
+if [ "$#" -ge 1 ]; then
+        DESTDIR="$1"
+else
+        DESTDIR="${MESON_INSTALL_DESTDIR_PREFIX}"
+fi
+
 @text@

kernel/meson.build

@@ -127 +127 @@
 foreach iter : iterations
         is_last = (iter == iterations.length())
-        kernel_name = is_last ? 'kernel' : 'kernel.@0@'.format(iter)
+        kernel_name = 'kernel.@0@.elf'.format(iter)
         kernel_map_name = kernel_name + '.map'
         kernel_map_path = meson.current_build_dir() / kernel_map_name
 
-        kernel_elf = executable(kernel_name + '.elf', kernel_map_S,
+        kernel_elf = executable(kernel_name, kernel_map_S,
                 include_directories: kernel_include_dirs,
                 implicit_include_directories: false,
@@ -167 +167 @@
 
 install_files += [[ 'boot', kernel_elf.full_path(), 'kernel.elf' ]]
+install_deps += [ kernel_elf ]
 
-kernel_disasm = custom_target(kernel_name + '.disasm',
+kernel_disasm = custom_target('kernel.elf.disasm',
         command: [ objdump, '-S', '@INPUT@' ],
         input: kernel_elf,
-        output: kernel_name + '.disasm',
+        output: 'kernel.elf.disasm',
         capture: true,
         build_by_default: true,
@@ -179 +180 @@
 if false
         install_files += [[ 'boot', kernel_disasm.full_path(), 'kernel.elf.disasm' ]]
+        install_deps += [ kernel_disasm ]
 endif

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,
+)
+

uspace/lib/c/meson.build

@@ -22 +22 @@
 
 if CONFIG_DEVEL_FILES
-        uspace_lib_install_script_text += 'mkdir -p "${MESON_INSTALL_DESTDIR_PREFIX}include/libc"'
+        uspace_lib_install_script_text += 'mkdir -p "${DESTDIR}include/libc"'
 
         foreach idir : incdirs
                 _sdir = meson.current_source_dir() / idir
-                uspace_lib_install_script_text += 'cp -R -L -T "@0@" "${MESON_INSTALL_DESTDIR_PREFIX}include/libc"'.format(_sdir)
+                uspace_lib_install_script_text += 'cp -R -L -T "@0@" "${DESTDIR}include/libc"'.format(_sdir)
         endforeach
 endif

uspace/lib/meson.build

@@ -123 +123 @@
                         if CONFIG_DEVEL_FILES and installed_libs.contains(l)
                                 _sdir = meson.current_source_dir() / l / 'include'
-                                uspace_lib_install_script_text += 'cp -R -L -T "@0@" "${MESON_INSTALL_DESTDIR_PREFIX}include/lib@1@"'.format(_sdir, l)
+                                uspace_lib_install_script_text += 'cp -R -L -T "@0@" "${DESTDIR}include/lib@1@"'.format(_sdir, l)
                         endif
                 else
@@ -130 +130 @@
                         if CONFIG_DEVEL_FILES and installed_libs.contains(l)
                                 _sdir = meson.current_source_dir() / l
-                                uspace_lib_install_script_text += 'mkdir -p "${MESON_INSTALL_DESTDIR_PREFIX}include/lib@0@"'.format(l)
-                                uspace_lib_install_script_text += 'cp -L -t "${MESON_INSTALL_DESTDIR_PREFIX}include/lib@0@" "@1@"/*.h'.format(l, _sdir)
+                                uspace_lib_install_script_text += 'mkdir -p "${DESTDIR}include/lib@0@"'.format(l)
+                                uspace_lib_install_script_text += 'cp -L -t "${DESTDIR}include/lib@0@" "@1@"/*.h'.format(l, _sdir)
                         endif
                 endif