Modify the format of content_wxs_source.txt #172

Author: kaorut

setup/installer/copy_libimage_files.py

@@ -32,23 +32,25 @@ def _list_files(source_path: pathlib.Path) -> List[Tuple[pathlib.Path, pathlib.P
     with source_path.open(mode="r", encoding="UTF-8") as stream:
         for line in stream:
             matched: Optional[re.Match[str]] = re.match(
-                "^([^ ]+)[ ]+([^ ]+)[ ]+([^ ]+)[ ]+([^ ]+)[ ]+([^ ]+)", line
+                "^([^ ]+)[ ]+([^ ]+)[ ]+([^ ]+)[ ]+([^ ]+)[ ]+([^ ]+)[ ]+([^ ]+)", line
             )
             if not matched:
                 continue
-            feature: str = matched.group(1)
-            source_directory = pathlib.Path(matched.group(2))
-            source_path = pathlib.Path(matched.group(3))
-            destination = pathlib.Path(matched.group(4))
-            if (
-                feature != "include"
-                and feature != "lib.Release.Win32"
-                and feature != "lib.Release.x64"
-            ):
-                continue
-            files.append(
-                (source_directory / source_path, (destination / source_path).parent)
-            )
+            kind: str = matched.group(1)
+            if kind == "file":
+                feature: str = matched.group(2)
+                source_directory = pathlib.Path(matched.group(3))
+                source_path = pathlib.Path(matched.group(4))
+                destination = pathlib.Path(matched.group(5))
+                if (
+                    feature != "include"
+                    and feature != "lib.Release.Win32"
+                    and feature != "lib.Release.x64"
+                ):
+                    continue
+                files.append(
+                    (source_directory / source_path, (destination / source_path).parent)
+                )
     return files
 
 

setup/installer/generate_content_wxs.py

@@ -71,7 +71,7 @@ def __init__(self, id: str, name: str, level: int):
         self.children: Dict[str, _DestinationDirectory] = {}
         self.files = []
 
-    def add(
+    def add_file(
         self, path: pathlib.Path, feature: str, guid: str, source_path: pathlib.Path
     ) -> None:
         if len(path.parents) > 1:
@@ -83,7 +83,7 @@ def add(
                     child_id, child_name, self.level + 1
                 )
             grandchild_path = pathlib.Path(str(path)[len(child_name) + 1 :])
-            self.children[child_name].add(grandchild_path, feature, guid, source_path)
+            self.children[child_name].add_file(grandchild_path, feature, guid, source_path)
         else:
             file_name: str = str(path)
             file_id: str = self.id + "." + file_name
@@ -97,18 +97,22 @@ def _build_destination_tree(source_path: pathlib.Path) -> _DestinationDirectory:
         for line in stream:
             line = line.rstrip("\r\n")
             matched: Optional[re.Match[str]] = re.match(
-                "^([^ ]+)[ ]+([^ ]+)[ ]+([^ ]+)[ ]+([^ ]+)[ ]+([^ ]+)", line
+                "^([^ ]+)[ ]+([^ ]+)[ ]+([^ ]+)[ ]+([^ ]+)[ ]+([^ ]+)[ ]+([^ ]+)", line
             )
             if not matched:
                 continue
-            feature: str = matched.group(1)
-            source_directory = pathlib.Path(matched.group(2))
-            source_path = pathlib.Path(matched.group(3))
-            destination = pathlib.Path(matched.group(4))
-            guid = matched.group(5)
-            destination_tree.add(
-                destination / source_path, feature, guid, source_directory / source_path
-            )
+            kind: str = matched.group(1)
+            if kind == "file":
+                feature: str = matched.group(2)
+                source_directory = pathlib.Path(matched.group(3))
+                source_path = pathlib.Path(matched.group(4))
+                destination = pathlib.Path(matched.group(5))
+                guid = matched.group(6)
+                destination_tree.add_file(
+                    destination / source_path, feature, guid, source_directory / source_path
+                )
+            else:
+                raise "error: " + kind
     return destination_tree
 
 

setup/installer/generate_content_wxs_source.py

@@ -106,7 +106,7 @@ def _make_content_wxs_source(
                     continue
                 extended_file_name: str = extended[len(source_directory) + 1 :]
                 print(
-                    "{} {} {} {} {}".format(
+                    "file {} {} {} {} {}".format(
                         wildcard[0],
                         source_directory,
                         extended_file_name,
@@ -119,18 +119,5 @@ def _make_content_wxs_source(
                 )
 
 
-def _remove_solution_path(
-    path: pathlib.Path, solution_path: pathlib.Path
-) -> pathlib.Path:
-    path_str = str(path)
-    solution_path_str = str(solution_path)
-    if path_str.find(solution_path_str) != 0:
-        return path
-    removed = path_str[len(solution_path_str) :]
-    if len(solution_path_str) > 0 and removed[0] == "\\":
-        removed = removed[1:]
-    return pathlib.Path(removed)
-
-
 if __name__ == "__main__":
     main(sys.argv[1:])