Changeset 32b4302 in mainline for tools/ew.py

Timestamp:

2019-08-18T19:06:02Z (7 years ago)

Author:

GitHub <noreply@…>

Branches:

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

Children:

1c39d33b

Parents:

fa70134 (diff), 6c2fac18 (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:

Jiří Zárevúcky <zarevucky.jiri@…> (2019-08-18 19:06:02)

git-committer:

GitHub <noreply@…> (2019-08-18 19:06:02)

Message:

Merge pull request #174 from le-jzr/meson3

Convert HelenOS build system to Meson

File:

• tools/ew.py (modified) (4 diffs)

tools/ew.py

@@ -33 +33 @@
 """
 
+import inspect
 import os
+import platform
+import re
+import subprocess
 import sys
-import subprocess
-import autotool
-import platform
 import thread
 import time
 
 overrides = {}
+
+CONFIG = 'Makefile.config'
+
+TOOLS_DIR = os.path.dirname(inspect.getabsfile(inspect.currentframe()))
+
+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):
@@ -164 +183 @@
 def hdisk_mk():
         if not os.path.exists('hdisk.img'):
-                subprocess.call('tools/mkfat.py 1048576 uspace/dist/data hdisk.img', shell = True)
+                subprocess.call(TOOLS_DIR + '/mkfat.py 1048576 dist/data hdisk.img', shell = True)
 
 def qemu_bd_options():
@@ -298 +317 @@
 
 def ski_run(platform, machine, processor):
-        run_in_console('ski -i tools/conf/ski.conf', 'HelenOS/ia64 on ski')
+        run_in_console('ski -i ' + TOOLS_DIR + '/conf/ski.conf', 'HelenOS/ia64 on ski')
 
 def msim_run(platform, machine, processor):
         hdisk_mk()
-        run_in_console('msim -c tools/conf/msim.conf', 'HelenOS/mips32 on msim')
+        run_in_console('msim -c ' + TOOLS_DIR + '/conf/msim.conf', 'HelenOS/mips32 on msim')
 
 def spike_run(platform, machine, processor):
@@ -495 +514 @@
                         exit()
 
-        config = {}
-        autotool.read_config(autotool.CONFIG, config)
+        config = read_config()
 
         if 'PLATFORM' in config.keys():