From 0f1dc5a98217bfa29024dac51ea911c54d41b319 Mon Sep 17 00:00:00 2001
From: Bahadir Balban <bbalban@b-labs.co.uk>
Date: Wed, 16 Sep 2009 19:01:57 +0300
Subject: [PATCH] Added generation of ksyms.S to loader SConscript as a call to
 generate_break_virtual

File creation and cleanup works correctly.
	modified:   loader/SConscript
	modified:   scripts/loader/generate_break_virtual.py
---
 loader/SConscript                        | 18 ++++++++++++++++++
 scripts/loader/generate_break_virtual.py |  6 ++++--
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/loader/SConscript b/loader/SConscript
index dc57872..a8d72d4 100644
--- a/loader/SConscript
+++ b/loader/SConscript
@@ -9,7 +9,25 @@ from os.path import join
 
 Import('env')
 
+
+PROJRELROOT = '../../'
+sys.path.append(os.path.abspath(os.path.join(os.path.dirname(sys.modules['__main__'].__file__), PROJRELROOT)))
+
+from config import projpaths
+from scripts.loader.generate_break_virtual import *
+
+#loader_ksyms = generate_ksym_to_loader(join(PROJROOT, 'loader/ksyms.S'), \
+#                                       join(BUILDDIR, 'kernel.elf'))
+
+#loader_ksyms = Command([]'ksyms.S', 'kernel.elf', ksym_to_loader)
+
+def ksym_to_loader(target, source, env):
+    generate_ksym_to_loader(target[0].path, source[0].path)
+
+loader_ksyms = Command(join(PROJROOT, 'loader/ksyms.S'), join(BUILDDIR, 'kernel.elf'), ksym_to_loader)
+
 src = Glob('*.[cS]')
 objs = env.Object(src)
 
+Depends(src, loader_ksyms)
 Return('objs')
diff --git a/scripts/loader/generate_break_virtual.py b/scripts/loader/generate_break_virtual.py
index 8429907..b8743d3 100755
--- a/scripts/loader/generate_break_virtual.py
+++ b/scripts/loader/generate_break_virtual.py
@@ -10,8 +10,7 @@ from os.path import join
 
 PROJRELROOT = '../../'
 
-SCRIPTROOT = os.path.abspath(os.path.dirname("."))
-sys.path.append(os.path.abspath(PROJRELROOT))
+sys.path.append(os.path.abspath(os.path.join(os.path.dirname(__file__), PROJRELROOT)))
 
 from config.projpaths import *
 from config.configuration import *
@@ -44,6 +43,9 @@ assembler_symbol_definition = \
 '''
 
 def generate_ksym_to_loader(target_path, source_path):
+    print "Source: ", source_path
+    print "Target: ", target_path
+
     symbols = ['break_virtual']
     with open(target_path, 'w') as asm_file:
         asm_file.write(ksym_header % (target_path, source_path, sys.argv[0]))