Changeset 4b65f9a in mainline

Timestamp:

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

5139663

Parents:

971849b1

git-author:

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

git-committer:

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

Message:

Make tools/ew.py runnable from the build directory

Files:

• meson.build (modified) (1 diff)
• tools/conf/msim.conf (modified) (1 diff)
• tools/conf/ski.conf (modified) (1 diff)
• tools/ew.py (modified) (7 diffs)

meson.build

@@ -1 +1 @@
 # TODO: Use vcs_tag() to generate version string
 # TODO: jobfile
-# TODO: lto
+# TODO: lto in uspace
 # TODO: fix clang build
 

tools/conf/msim.conf

@@ -12 +12 @@
 add rom bootmem 0x1fc00000
 bootmem generic 4096k
-bootmem load "build/image.boot"
+bootmem load "image.boot"
 
 add dprinter printer 0x10000000

tools/conf/ski.conf

@@ -1 @@
-load build/image.boot
+load image.boot
 c

tools/ew.py

@@ -33 +33 @@
 """
 
+import inspect
 import os
 import platform
@@ -44 +45 @@
 
 CONFIG = 'Makefile.config'
+
+TOOLS_DIR = os.path.dirname(inspect.getabsfile(inspect.currentframe()))
 
 def read_config():
@@ -180 +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():
@@ -286 +289 @@
 
         if cfg['image'] == 'image.iso':
-                cmdline += ' -boot d -cdrom build/image.iso'
+                cmdline += ' -boot d -cdrom image.iso'
         elif cfg['image'] == 'image.iso@arm64':
                 # Define image.iso cdrom backend.
-                cmdline += ' -drive if=none,file=build/image.iso,id=cdrom,media=cdrom'
+                cmdline += ' -drive if=none,file=image.iso,id=cdrom,media=cdrom'
                 # Define scsi bus.
                 cmdline += ' -device virtio-scsi-device'
@@ -295 +298 @@
                 cmdline += ' -device scsi-cd,drive=cdrom'
         elif cfg['image'] == 'image.boot':
-                cmdline += ' -kernel build/image.boot'
+                cmdline += ' -kernel image.boot'
         else:
                 cmdline += ' ' + cfg['image']
@@ -314 +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):
-        run_in_console('spike -m1073741824:1073741824 build/image.boot', 'HelenOS/risvc64 on Spike')
+        run_in_console('spike -m1073741824:1073741824 image.boot', 'HelenOS/risvc64 on Spike')
 
 emulators = {
@@ -397 +400 @@
                         'sun4v' : {
                                 'run' : qemu_run,
-                                'image' : '-drive if=pflash,readonly=on,file=build/image.iso',
+                                'image' : '-drive if=pflash,readonly=on,file=image.iso',
                                 'audio' : False,
                                 'console' : True,