Changeset 1783f75 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:

e503cea9

Parents:

b3ff685

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2019-06-29 14:08:34)

git-committer:

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

Message:

Remove autotool.py

Meson does everything that it was used for.

Files:

• Makefile (modified) (7 diffs)
• meson.build (modified) (1 diff)
• tools/autotool.py (deleted)
• tools/ew.py (modified) (2 diffs)
• uspace/lib/pcut/update-from-master.sh (modified) (1 diff)

Makefile

@@ -35 +35 @@
 CHECK = tools/check.sh
 CONFIG = tools/config.py
-AUTOTOOL = tools/autotool.py
-SANDBOX = autotool
 MESON = meson
 
@@ -42 +40 @@
 
 CONFIG_RULES = HelenOS.config
-
-COMMON_MAKEFILE = Makefile.common
 
 CONFIG_MAKEFILE = Makefile.config
@@ -61 +57 @@
 endif
 
-CROSS_PATH = $(shell dirname "$(CC)")
+CROSS_PREFIX ?= /usr/local/cross
+CROSS_PATH = $(CROSS_PREFIX)/bin
 
 CROSS_TARGET ?= $(UARCH)
@@ -69 +66 @@
 endif
 
-.PHONY: all precheck cscope cscope_parts autotool config_default config distclean clean check releasefile release meson export-posix space
+.PHONY: all precheck cscope cscope_parts config_default config distclean clean check releasefile release meson export-posix space
 
-all: meson export-cross test-xcw
+all: meson
 
 $(BUILD_DIR)/build.ninja: Makefile.config version
@@ -79 +76 @@
         PATH="$(CROSS_PATH):$$PATH" ninja -C $(BUILD_DIR)
 
-test-xcw: meson export-cross
+test-xcw: meson
 ifeq ($(CONFIG_DEVEL_FILES),y)
         export PATH=$$PATH:$(abspath tools/xcw/bin) && $(MAKE) -r -C tools/xcw/demo
 endif
-
-export-posix: meson
-ifndef EXPORT_DIR
-        @echo ERROR: Variable EXPORT_DIR is not defined. && false
-else
-        mkdir -p $(EXPORT_DIR)
-        $(MAKE) -r -C uspace/lib/posix export EXPORT_DIR=$(abspath $(EXPORT_DIR)) UARCH=$(UARCH)
-endif
-
-export-cross: meson
-        mkdir -p uspace/export
-        $(MAKE) -r -C uspace export EXPORT_DIR=$(abspath uspace/export) UARCH=$(UARCH)
 
 precheck: clean
@@ -143 +128 @@
         git grep -n -f - -- ':(exclude)abi' ':(exclude)uspace/lib/posix'
 
-# Autotool (detects compiler features)
-
-autotool $(COMMON_MAKEFILE): $(CONFIG_MAKEFILE) $(AUTOTOOL)
-        $(AUTOTOOL)
-
 # Build-time configuration
 
@@ -177 +157 @@
 
 clean:
-        rm -fr $(SANDBOX)
-        $(MAKE) -r -C kernel clean
-        $(MAKE) -r -C uspace clean
-        $(MAKE) -r -C boot clean
         $(MAKE) -r -C doxygen clean
         $(MAKE) -r -C tools/xcw/demo clean

meson.build

@@ -437 +437 @@
 
 # TODO: remove
-install_files += [[ 'config', meson.current_source_dir() / 'Makefile.common', 'Makefile.common' ]]
-install_deps += files('Makefile.common')
 install_files += [[ 'config', meson.current_source_dir() / 'Makefile.config', 'Makefile.config' ]]
 install_deps += files('Makefile.config')

tools/ew.py

@@ -34 +34 @@
 
 import os
+import platform
+import re
+import subprocess
 import sys
-import subprocess
-import autotool
-import platform
 import thread
 import time
 
 overrides = {}
+
+CONFIG = 'Makefile.config'
+
+def read_config():
+        "Read HelenOS build configuration"
+
+        inf = open(CONFIG, 'r')
+        config = {}
+
+        for line in inf:
+                res = re.match(r'^(?:#!# )?([^#]\w*)\s*=\s*(.*?)\s*$', line)
+                if (res):
+                        config[res.group(1)] = res.group(2)
+
+        inf.close()
+        return config
 
 def is_override(str):
@@ -494 +510 @@
                         exit()
 
-        config = {}
-        autotool.read_config(autotool.CONFIG, config)
+        config = read_config()
 
         if 'PLATFORM' in config.keys():

uspace/lib/pcut/update-from-master.sh

@@ -28 +28 @@
 # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
+
+# FIXME: update for meson config
 
 run_echo() {