Changeset 22299ed in mainline

Timestamp:

2017-06-07T15:11:10Z (7 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

4646710

Parents:

5f53428a

Message:

add support for custom sections

Files:

• tools/mkarray.py (modified) (4 diffs)
• uspace/app/barber/Makefile (modified) (1 diff)
• uspace/app/vlaunch/Makefile (modified) (1 diff)

tools/mkarray.py

@@ -39 +39 @@
 def usage(prname):
         "Print usage syntax"
-        print("%s [--deflate] <DESTINATION> <LABEL> <AS_PROLOG> [SOURCE ...]" % prname)
+        print("%s [--deflate] <DESTINATION> <LABEL> <AS_PROLOG> <SECTION> [SOURCE ...]" % prname)
 
 def arg_check():
-        if (len(sys.argv) < 4):
+        if (len(sys.argv) < 5):
                 usage(sys.argv[0])
                 sys.exit()
@@ -68 +68 @@
         label = sys.argv[2]
         as_prolog = sys.argv[3]
+        section = sys.argv[4]
         
         header_ctx = []
@@ -76 +77 @@
         src_cnt = 0
         
-        for src in sys.argv[4:]:
+        for src in sys.argv[5:]:
                 basename = os.path.basename(src)
                 plainname = os.path.splitext(basename)[0]
@@ -150 +151 @@
         data += ' ***************************************/\n\n'
         data += as_prolog
-        data += '.data\n\n'
+        data += "%s\n\n" % section
         data += "\n".join(data_ctx)
         data += "\n"

uspace/app/barber/Makefile

@@ -99 +99 @@
 
 $(IMGS).zip: $(IMAGES)
-        $(ROOT_PATH)/tools/mkarray.py $(IMGS) $(IMG) "$(AS_PROLOG)" $^
+        $(ROOT_PATH)/tools/mkarray.py $(IMGS) $(IMG) "$(AS_PROLOG)" .data $^

uspace/app/vlaunch/Makefile

@@ -69 +69 @@
 
 $(IMGS).zip: $(IMAGES)
-        $(ROOT_PATH)/tools/mkarray.py $(IMGS) $(IMG) "$(AS_PROLOG)" $^
+        $(ROOT_PATH)/tools/mkarray.py $(IMGS) $(IMG) "$(AS_PROLOG)" .data $^