Changeset 5fd05862 in mainline for Makefile

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:

ecf56f80

Parents:

32355bc

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2019-06-15 13:55:37)

git-committer:

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

Message:

Convert uspace to meson

File:

• Makefile (modified) (5 diffs)

Makefile

@@ -37 +37 @@
 AUTOTOOL = tools/autotool.py
 SANDBOX = autotool
+MESON = meson
 
 CONFIG_RULES = HelenOS.config
@@ -47 +48 @@
 ERRNO_INPUT = abi/include/abi/errno.in
 
+-include $(CONFIG_MAKEFILE)
+-include $(COMMON_MAKEFILE)
+
+# TODO: make meson reconfigure correctly when library build changes
+
+ifeq ($(CONFIG_BUILD_SHARED_LIBS),y)
+        MESON_ARGS = -Ddefault_library=shared
+else
+        MESON_ARGS = -Ddefault_library=static
+endif
+
+CROSS_PATH = $(shell dirname "$(CC)")
+
 .PHONY: all precheck cscope cscope_parts autotool config_auto config_default config distclean clean check releasefile release common boot kernel uspace export-posix space
 
@@ -52 +66 @@
         $(MAKE) -r -C boot PRECHECK=$(PRECHECK)
 
-common: $(COMMON_MAKEFILE) $(CONFIG_MAKEFILE) $(CONFIG_HEADER) $(ERRNO_HEADER)
+build/build.ninja: Makefile.config version
+        PATH="$(CROSS_PATH):$$PATH" meson . build --cross-file meson/cross/$(UARCH) $(MESON_ARGS)
+
+common: $(COMMON_MAKEFILE) $(CONFIG_MAKEFILE) $(CONFIG_HEADER) $(ERRNO_HEADER) build/build.ninja
 
 kernel: common
@@ -58 +75 @@
 
 uspace: common
-        $(MAKE) -r -C uspace PRECHECK=$(PRECHECK)
+        PATH="$(CROSS_PATH):$$PATH" ninja -C build
+        PATH="$(CROSS_PATH):$$PATH" DESTDIR="$$PWD/dist" meson install --no-rebuild --only-changed -C build > build/install.log
 
 test-xcw: uspace export-cross
+ifeq ($(CONFIG_DEVEL_FILES),y)
         export PATH=$$PATH:$(abspath tools/xcw/bin) && $(MAKE) -r -C tools/xcw/demo
+endif
 
 export-posix: common
@@ -67 +87 @@
         @echo ERROR: Variable EXPORT_DIR is not defined. && false
 else
-        $(MAKE) -r -C uspace export EXPORT_DIR=$(abspath $(EXPORT_DIR))
+        mkdir -p $(EXPORT_DIR)
+        $(MAKE) -r -C uspace/lib/posix export EXPORT_DIR=$(abspath $(EXPORT_DIR)) UARCH=$(UARCH)
 endif
 
 export-cross: common
-        $(MAKE) -r -C uspace export EXPORT_DIR=$(abspath uspace/export)
+        mkdir -p uspace/export
+        $(MAKE) -r -C uspace export EXPORT_DIR=$(abspath uspace/export) UARCH=$(UARCH)
 
 precheck: clean