Changeset 3e828ea in mainline for tools/mkarray_for_meson.sh

Timestamp:

2019-09-23T12:49:29Z (6 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

9be2358

Parents:

9259d20 (diff), 1a4ec93f (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Jiri Svoboda <jiri@…> (2019-09-22 12:49:07)

git-committer:

Jiri Svoboda <jiri@…> (2019-09-23 12:49:29)

Message:

Merge changes from master, especially Meson build

File:

• tools/mkarray_for_meson.sh (moved) (moved from boot/Makefile.uboot ) (2 diffs, 1 prop)

tools/mkarray_for_meson.sh

@@ +1 @@
+#!/bin/sh
+
 #
-# Copyright (c) 2010 Jiri Svoboda
+# Copyright (c) 2019 Jiří Zárevúcky
 # All rights reserved.
 #
@@ -27 +29 @@
 #
 
-.PHONY: all clean
+TOOLS_DIR=`which -- "$0" 2>/dev/null`
+if [ -z "$TOOLS_DIR" ]; then
+        TOOLS_DIR=`which -- "$BASH_SOURCE" 2>/dev/null`
+fi
+TOOLS_DIR=`dirname $TOOLS_DIR`
+TOOLS_DIR=`cd $TOOLS_DIR && echo $PWD`
 
-include Makefile.common
 
-IMAGE_NAME = HelenOS-$(RELEASE)
-BIN_OUTPUT = image.bin
+_outdir="$1"
+_arg1="$2"
+_arg2="$3"
+_arg3="$4"
+_arg4="$5"
+_inputs=""
 
-all: $(POST_OUTPUT)
+shift 5
 
-$(BIN_OUTPUT): $(BOOT_OUTPUT)
-        $(OBJCOPY) -O binary $< $@
+for file in "$@"; do
+        _inputs="$_inputs $PWD/${file}"
+done
 
-$(POST_OUTPUT): $(BIN_OUTPUT)
-        $(MKUIMAGE) -name "$(IMAGE_NAME)" -laddr $(LADDR) -saddr $(SADDR) -ostype $(UIMAGE_OS) $< $@
-
-clean:
-        rm -f $(BIN_OUTPUT)
+cd $_outdir
+$TOOLS_DIR/mkarray.py "$_arg1" "$_arg2" "$_arg3" "$_arg4" $_inputs > /dev/null