Changeset 2670afc 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:

d27a505e

Parents:

43255da

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2019-07-01 19:28:37)

git-committer:

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

Message:

Remove some replaced stuff from Makefile

Files:

• Makefile (modified) (4 diffs)
• meson.build (modified) (1 diff)

Makefile

@@ -27 +27 @@
 #
 
-# Just for this Makefile. Sub-makes will run in parallel if requested.
-.NOTPARALLEL:
-
 CCHECK = tools/sycek/ccheck
 CSCOPE = cscope
 FORMAT = clang-format
 CHECK = tools/check.sh
-CONFIG = $(abspath tools/config.py)
-MESON = meson
 
-BUILD_DIR=$(abspath build)
-
-CONFIG_RULES = HelenOS.config
-
-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)
--include $(COMMON_MAKEFILE)
+.PHONY: all cscope cscope_parts format ccheck ccheck-fix space doxy check check_errno releasefile release
 
-CROSS_TARGET ?= $(UARCH)
-
-ifeq ($(MACHINE),bmalta)
-        CROSS_TARGET = mips32eb
-endif
-
-.PHONY: all precheck cscope cscope_parts config_default config distclean clean check releasefile release meson space
-
-all: meson
-
-$(BUILD_DIR)/build.ninja: $(CONFIG_MAKEFILE) $(VERSION_FILE)
-        meson . $(BUILD_DIR) --cross-file meson/cross/$(CROSS_TARGET)
-
-meson: $(COMMON_MAKEFILE) $(CONFIG_MAKEFILE) $(CONFIG_HEADER) $(ERRNO_HEADER) $(BUILD_DIR)/build.ninja
-        ninja -C $(BUILD_DIR)
-
-test-xcw: meson
-ifeq ($(CONFIG_DEVEL_FILES),y)
-        export PATH=$$PATH:$(abspath tools/xcw/bin) && $(MAKE) -r -C tools/xcw/demo
-endif
-
-precheck: clean
-        $(MAKE) -r all PRECHECK=y
+all:
 
 cscope:
@@ -93 +58 @@
         cd tools && ./build-ccheck.sh
         tools/ccheck.sh --fix
-
-$(CCHECK):
-        cd tools && ./build-ccheck.sh
 
 space:
@@ -118 +80 @@
         git grep -n -f - -- ':(exclude)abi' ':(exclude)uspace/lib/posix'
 
-# Build-time configuration
-
-config_default $(CONFIG_MAKEFILE) $(CONFIG_HEADER): $(CONFIG_RULES)
-        mkdir -p $(BUILD_DIR)
-ifeq ($(HANDS_OFF),y)
-        cd $(BUILD_DIR) && $(CONFIG) $(abspath $<) $(abspath defaults) hands-off $(PROFILE)
-else
-        cd $(BUILD_DIR) && $(CONFIG) $(abspath $<) $(abspath defaults) default $(PROFILE)
-endif
-
-config: $(CONFIG_RULES)
-        mkdir -p $(BUILD_DIR)
-        cd $(BUILD_DIR) && $(CONFIG) $(abspath $<) $(abspath defaults)
-
-random-config: $(CONFIG_RULES)
-        mkdir -p $(BUILD_DIR)
-        cd $(BUILD_DIR) && $(CONFIG) $(abspath $<) $(abspath defaults) random
-
 # Release files
 
@@ -144 +88 @@
         $(MAKE) -r -C release release
 
-# Cleaning
-
-distclean: clean
-        rm -f $(CSCOPE).out $(COMMON_MAKEFILE) $(CONFIG_MAKEFILE) $(CONFIG_HEADER) tools/*.pyc tools/checkers/*.pyc release/HelenOS-*
-
-clean:
-        $(MAKE) -r -C tools/xcw/demo clean
-
 $(ERRNO_HEADER): $(ERRNO_INPUT)
         echo '/* Generated file. Edit errno.in instead. */' > $@.new
         sed 's/__errno_entry(\([^,]*\),\([^,]*\),.*/#define \1 __errno_t(\2)/' < $< >> $@.new
         mv $@.new $@
-
--include Makefile.local

meson.build

@@ -553 +553 @@
 
 # TODO: Check when cross target has changed, since it won't work.
+
+if false
+        # TODO: doesn't work because it changes cross target
+        run_target('random-config',
+                command: [
+                        sh,
+                        '-c', 'cd $1 && $2 $3 $4 random',
+                        '--',
+                        meson.build_root(),
+                        config_py.path(),
+                        meson.source_root() / 'HelenOS.config',
+                        meson.source_root() / 'defaults',
+                ]
+        )
+endif
+
+
+# TODO text-xcw
+#ifeq ($(CONFIG_DEVEL_FILES),y)
+#       export PATH=$$PATH:$(abspath tools/xcw/bin) && $(MAKE) -r -C tools/xcw/demo
+#endif
+