Changes in tools/ew.py [01552e3:dabaa83] in mainline

File:

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

tools/ew.py

@@ -33 +33 @@
 """
 
-import inspect
 import os
+import sys
+import subprocess
+import autotool
 import platform
-import re
-import subprocess
-import sys
 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):
@@ -76 +57 @@
 
 def termemu_detect():
-        emus = ['gnome-terminal', 'xfce4-terminal', 'xterm']
-        for termemu in emus:
+        for termemu in ['xfce4-terminal', 'xterm']:
                 try:
                         subprocess.check_output('which ' + termemu, shell = True)
@@ -84 +64 @@
                         pass
 
-        print('Could not find any of the terminal emulators %s.'%(emus))
-        sys.exit(1)
-
 def run_in_console(cmd, title):
-        temu = termemu_detect()
-        if temu == 'gnome-terminal':
-                cmdline = temu + ' -- ' + cmd
-        else:
-                ecmd = cmd.replace('"', '\\"')
-                cmdline = temu + ' -T ' + '"' + title + '"' + ' -e "' + ecmd + '"'
-
+        ecmd = cmd.replace('"', '\\"')
+        cmdline = termemu_detect() + ' -T ' + '"' + title + '"' + ' -e "' + ecmd + '"'
         print(cmdline)
         if not is_override('dryrun'):
@@ -183 +155 @@
 def hdisk_mk():
         if not os.path.exists('hdisk.img'):
-                subprocess.call(TOOLS_DIR + '/mkfat.py 1048576 dist/data hdisk.img', shell = True)
+                subprocess.call('tools/mkfat.py 1048576 uspace/dist/data hdisk.img', shell = True)
 
 def qemu_bd_options():
@@ -317 +289 @@
 
 def ski_run(platform, machine, processor):
-        run_in_console('ski -i ' + TOOLS_DIR + '/conf/ski.conf', 'HelenOS/ia64 on ski')
+        run_in_console('ski -i tools/conf/ski.conf', 'HelenOS/ia64 on ski')
 
 def msim_run(platform, machine, processor):
         hdisk_mk()
-        run_in_console('msim -c ' + TOOLS_DIR + '/conf/msim.conf', 'HelenOS/mips32 on msim')
+        run_in_console('msim -c tools/conf/msim.conf', 'HelenOS/mips32 on msim')
 
 def spike_run(platform, machine, processor):
@@ -514 +486 @@
                         exit()
 
-        config = read_config()
+        config = {}
+        autotool.read_config(autotool.CONFIG, config)
 
         if 'PLATFORM' in config.keys():