Changeset d3357e9 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:

f69d5a8

Parents:

56440a5

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2019-06-30 15:23:58)

git-committer:

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

Message:

Make building bootable images optional

Files:

• boot/meson.build (modified) (5 diffs)
• build_all.sh (modified) (2 diffs)
• kernel/meson.build (modified) (1 diff)
• meson.build (modified) (1 diff)

boot/meson.build

@@ -81 +81 @@
         endif
 
+        boot_files = static_library('bootfiles', boot_src,
+                include_directories: boot_include_dirs,
+                implicit_include_directories: false,
+                c_args: boot_c_args,
+                pic: false,
+                build_by_default: true,
+        )
+
         # Preprocess linker script using C preprocessor.
         boot_ldscript = custom_target('_link.ld',
@@ -97 +105 @@
                 ],
                 capture: true,
+                build_by_default: true
         )
 
@@ -133 +142 @@
         boot_image_map_path = meson.current_build_dir()/boot_image_name + '.map'
 
-        boot_elf = executable(boot_image_name + '.elf', boot_src, boot_comps_o,
+        boot_elf = executable(boot_image_name + '.elf', boot_comps_o,
                 include_directories: boot_include_dirs,
-                implicit_include_directories: false,
                 c_args: boot_c_args,
                 link_args: boot_c_args + boot_link_args + [
@@ -141 +149 @@
                 ],
                 link_depends: boot_ldscript,
-                install: true,
-                install_dir: 'boot',
+                link_whole: boot_files,
                 pie: false,
+                build_by_default: false,
         )
 
@@ -160 +168 @@
 endif
 
-if POSTBUILD == 'none'
-        POST_INPUT = disabler()
-endif
-
 if POSTBUILD == 'raw'
         POST_INPUT = boot_image

build_all.sh

@@ -22 +22 @@
 
 
-echo "Configuring all profiles."
+echo
+echo "###################### Configuring all profiles ######################"
 
 for profile in $PROFILES; do
         if [ -f ${profile}/build.ninja ]; then
-                echo "Profile ${profile} already configured."
+                ninja -C ${profile} build.ninja || exit 1
                 continue
         fi
@@ -51 +52 @@
 done
 
-
-echo "Building all profiles."
+echo
+echo "###################### Building all profiles ######################"
 
 for profile in $PROFILES; do
-        ninja -C ${profile}
+        ninja -C ${profile} || exit 1
 done
+
+
+if [ "$#" -eq 1 ] && [ "$1" = 'images' ]; then
+        echo "###################### Building all images ######################"
+
+        for profile in $PROFILES; do
+                ninja -C ${profile} image_path || exit 1
+        done
+else
+        echo
+        echo "Bootable images not built."
+        echo "Run '$0 images' to build them as well."
+fi

kernel/meson.build

@@ -54 +54 @@
         ],
         capture: true,
+        build_by_default: true,
 )
 

meson.build

@@ -518 +518 @@
 subdir('boot')
 
-custom_target(POST_OUTPUT,
-        output: POST_OUTPUT,
-        input: POST_INPUT,
-        command: [ cp, '@INPUT@', '@OUTPUT@' ],
-        build_by_default: true,
-)
+if is_variable('POST_INPUT')
+        image = custom_target(POST_OUTPUT,
+                output: POST_OUTPUT,
+                input: POST_INPUT,
+                command: [ cp, '@INPUT@', '@OUTPUT@' ],
+        )
+
+        custom_target('image_path',
+                output: 'image_path',
+                input: image,
+                command: [ 'echo', '@INPUT@' ],
+                capture: true,
+        )
+else
+        custom_target('image_path',
+                output: 'image_path',
+                command: [ 'echo' ],
+                capture: true,
+        )
+endif