Changeset 30934

Timestamp:

2008-08-22 19:26:14 (3 months ago)

Author:

res2002

Message:

Allow specification of subdirs for file lists put into an MSM.

Location:

CS/trunk

Files:

• bin/cs-genwix-msm.py (modified) (3 diffs)
• mk/jam/msi.jam (modified) (3 diffs)

CS/trunk/bin/cs-genwix-msm.py

@@ -13 +13 @@
 options.add_option("--id", dest="msmid",
                     help="Merge module ID (used to look up GUID)", metavar="ID")
+options.add_option("--subdirmap", dest="subdirmap",
+                    help="Subdirectory map to place files in. (Multiple allowed)", 
+                    action="append", metavar="LIST:DIR")
 options.add_option("--version", dest="version",
                     help="Package version", metavar="VERSION")
@@ -22 +25 @@
 if not parsed_options.msmid:
     options.error("missing --id")
+
+if parsed_options.subdirmap:
+    subdirmap = {}
+    for s in parsed_options.subdirmap:
+        (list, subdirs) = s.split (':', 1)
+        subdirmap[list] = subdirs
 
 (base, merge, dir) = generate_merge_module(id = parsed_options.msmid,
@@ -35 +44 @@
     id = parsed_options.msmid)
 
-ref = DirectoryRef(
+dirref = DirectoryRef(
     parent = f,
     id = parsed_options.msmid + '_dir')
 
 for list in args:
+    listid = os.path.splitext(os.path.basename(list))[0]
+    thisdir = dirref
+    if subdirmap and subdirmap.has_key(listid):
+        dirid = parsed_options.msmid
+        list_subdir = subdirmap[listid]
+        for subdir in list_subdir.split('/'):
+            dirid = dirid + '.' + subdir
+            thisdir = Directory(
+                parent = thisdir,
+                id = dirid + '_d',
+                name = subdir)
     generate_from_file_list_txt (list,
                                  parent = merge,
-                                 prefix = parsed_options.msmid,
-                                 dir = ref)
+                                 prefix = parsed_options.msmid + '.' + listid,
+                                 dir = thisdir)
         
 base.save()

CS/trunk/mk/jam/msi.jam

@@ -30 +30 @@
 LOCATE.MSI.TEMP ?= $(BUILDTOP)/out/msi/temp ;
 
-# MSIMergeModule id : filelist : version
+# MSIMergeModule id : filelist : version [: subdir]
 rule MSIMergeModule
 {
@@ -40 +40 @@
   VERSION on $(mod_src) = $(3) ;
   ID on $(mod_src) = $(target) ;
+  SUBDIR on $(mod_src) = $(4) ;
   Depends $(mod_src) : $(filelistfile) ;
   GenerateMSMSource $(mod_src) : $(filelistfile) ;
@@ -64 +65 @@
 actions together GenerateMSMSource 
 {
-  $(CMD.GENMSM) -o $(<) --id $(ID) --version $(VERSION) $(>)
+  $(CMD.GENMSM) -o $(<) --id $(ID) --version $(VERSION) \
+    --subdirmap=$(SUBDIR) \
+    $(>)
 }