Changeset 18b1643 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:

43255da

Parents:

8183b35

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2019-07-01 11:48:09)

git-committer:

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

Message:

Add standalone configure.sh script

Files:

• build_all.sh (modified) (3 diffs)
• configure.sh (added)
• meson.build (modified) (1 diff)

build_all.sh

@@ -29 +29 @@
 for profile in $PROFILES; do
         # echo "Configuring profile ${profile}"
-        if [ -f ${profile}/build.ninja ]; then
-                script -q -e /dev/null -c "ninja -C '${profile}' build.ninja" </dev/null >"${profile}/configure_output.log" 2>&1  &
-                echo "$!" >"${profile}/configure.pid"
-                continue
-        fi
 
-        # Let HelenOS config tool write out Makefile.config and config.h.
         mkdir -p ${profile} || exit 1
-        cd ${profile} || exit 1
-        "${SOURCE_DIR}/tools/config.py" "${CONFIG_RULES}" "${CONFIG_DEFAULTS}" hands-off "${profile}" || exit 1
-        cd -
-
-
-        if [ "$profile" = 'special/abs32le' ]; then
-                cross_target='ia32'
-        else
-                cross_target=`dirname $profile`
-                if [ "$cross_target" = '.' ]; then
-                        cross_target=$profile
-                fi
-        fi
-
-        script -q -e /dev/null -c "meson '${SOURCE_DIR}' '${profile}' --cross-file '${SOURCE_DIR}/meson/cross/${cross_target}'" </dev/null >"${profile}/configure_output.log" 2>&1 &
+        script -q -e /dev/null -c "cd '${profile}' && '${SOURCE_DIR}/configure.sh' '${profile}' && ninja build.ninja" </dev/null >"${profile}/configure_output.log" 2>&1  &
         echo "$!" >"${profile}/configure.pid"
 done
@@ -79 +59 @@
 
 for profile in $PROFILES; do
+        echo
         ninja -C ${profile} || exit 1
 done
@@ -88 +69 @@
 
         for profile in $PROFILES; do
+                echo
                 ninja -C ${profile} image_path || exit 1
+        done
+
+        echo
+        for profile in $PROFILES; do
+                path=`cat ${profile}/image_path`
+
+                if [ ! -z "$path" ]; then
+                        echo "built ${profile}/${path}"
+                fi
         done
 else

meson.build

@@ -538 +538 @@
         )
 endif
+
+
+# TODO: ninja config