Changeset 2e2cefdb in mainline

Timestamp:

2019-08-17T12:49:43Z (6 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:

d4b30cf

Parents:

45b26114

git-author:

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

git-committer:

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

Message:

Put configuration in build directory instead of source root

Files:

• Makefile (modified) (4 diffs)
• boot/meson.build (modified) (1 diff)
• kernel/meson.build (modified) (1 diff)
• meson.build (modified) (3 diffs)

Makefile

@@ -34 +34 @@
 FORMAT = clang-format
 CHECK = tools/check.sh
-CONFIG = tools/config.py
+CONFIG = $(abspath tools/config.py)
 MESON = meson
 
@@ -41 +41 @@
 CONFIG_RULES = HelenOS.config
 
-CONFIG_MAKEFILE = Makefile.config
-CONFIG_HEADER = config.h
+CONFIG_MAKEFILE = $(BUILD_DIR)/Makefile.config
+CONFIG_HEADER = $(BUILD_DIR)/config.h
 ERRNO_HEADER = abi/include/abi/errno.h
 ERRNO_INPUT = abi/include/abi/errno.in
+VERSION_FILE = version
 
 -include $(CONFIG_MAKEFILE)
@@ -70 +71 @@
 all: meson
 
-$(BUILD_DIR)/build.ninja: Makefile.config version
+$(BUILD_DIR)/build.ninja: $(CONFIG_MAKEFILE) $(VERSION_FILE)
         PATH="$(CROSS_PATH):$$PATH" meson . $(BUILD_DIR) --cross-file meson/cross/$(CROSS_TARGET) $(MESON_ARGS)
 
@@ -131 +132 @@
 
 config_default $(CONFIG_MAKEFILE) $(CONFIG_HEADER): $(CONFIG_RULES)
+        mkdir -p $(BUILD_DIR)
 ifeq ($(HANDS_OFF),y)
-        $(CONFIG) $< defaults hands-off $(PROFILE)
+        cd $(BUILD_DIR) && $(CONFIG) $(abspath $<) $(abspath defaults) hands-off $(PROFILE)
 else
-        $(CONFIG) $< defaults default $(PROFILE)
+        cd $(BUILD_DIR) && $(CONFIG) $(abspath $<) $(abspath defaults) default $(PROFILE)
 endif
 
 config: $(CONFIG_RULES)
-        $(CONFIG) $< defaults
+        mkdir -p $(BUILD_DIR)
+        cd $(BUILD_DIR) && $(CONFIG) $(abspath $<) $(abspath defaults)
 
 random-config: $(CONFIG_RULES)
-        $(CONFIG) $< defaults random
+        mkdir -p $(BUILD_DIR)
+        cd $(BUILD_DIR) && $(CONFIG) $(abspath $<) $(abspath defaults) random
 
 # Release files

boot/meson.build

@@ -53 +53 @@
 
         boot_defs = [
-                '-imacros', meson.source_root() / 'config.h',
+                '-imacros', meson.build_root() / 'config.h',
                 '-D_HELENOS_SOURCE',
                 '-DBOOT',

kernel/meson.build

@@ -28 +28 @@
 
 kernel_defs = [
-        '-imacros', meson.source_root() / 'config.h',
+        '-imacros', meson.build_root() / 'config.h',
         '-D_HELENOS_SOURCE',
         '-DKERNEL',

meson.build

@@ -176 +176 @@
 ]
 
+CONFIG_MAKEFILE = files(meson.build_root() / 'Makefile.config')
+
 foreach varname : config_variables
-        result = run_command(grep, '^' + varname + '\\b', meson.source_root() / 'Makefile.config')
+        result = run_command(grep, '^' + varname + '\\b', CONFIG_MAKEFILE)
         if result.returncode() != 0
                 # TODO: Output negative/inapplicable variables too in config, so that we can check for typos here.
@@ -220 +222 @@
 add_project_arguments(
         # TODO: Remove from project arguments and only use where needed.
-        '-imacros', join_paths(meson.source_root(), 'config.h'),
+        '-imacros', meson.build_root() / 'config.h',
         language : [ 'c' ],
 )
@@ -442 +444 @@
 
 # TODO: remove
-install_files += [[ 'config', meson.current_source_dir() / 'Makefile.config', 'Makefile.config' ]]
-install_deps += files('Makefile.config')
+install_files += [[ 'config', meson.build_root() / 'Makefile.config', 'Makefile.config' ]]
+install_deps += CONFIG_MAKEFILE
 
 if CONFIG_DEVEL_FILES