|
9 | 9 | import logging |
10 | 10 | import argparse |
11 | 11 |
|
| 12 | +from builder.core import KernelBuilder, AssetsCollector |
12 | 13 | from builder.tools import Logger |
13 | 14 | from builder.managers import ResourceManager |
14 | 15 | from builder.commands import KernelCommand, AssetsCommand, BundleCommand |
@@ -99,38 +100,44 @@ def parse_args() -> argparse.Namespace: |
99 | 100 |
|
100 | 101 |
|
101 | 102 | def main(args: argparse.Namespace) -> None: |
| 103 | + kernel_builder = KernelBuilder( |
| 104 | + codename = args.codename, |
| 105 | + base = args.base, |
| 106 | + lkv = args.lkv, |
| 107 | + clean_kernel = args.clean_kernel, |
| 108 | + ksu = args.ksu, |
| 109 | + defconfig = args.defconfig, |
| 110 | + rmanager = ResourceManager( |
| 111 | + codename = args.codename, |
| 112 | + lkv = args.lkv, |
| 113 | + base = args.base |
| 114 | + ) |
| 115 | + ) |
| 116 | + assets_collector = AssetsCollector( |
| 117 | + codename = args.codename, |
| 118 | + base = args.base, |
| 119 | + chroot = args.chroot, |
| 120 | + clean_assets = args.clean_assets, |
| 121 | + rom_only = args.rom_only, |
| 122 | + ksu = args.ksu, |
| 123 | + ) |
| 124 | + |
102 | 125 | match args.command: |
103 | 126 |
|
104 | 127 | case "kernel": |
105 | | - kc = KernelCommand( |
106 | | - codename = args.codename, |
107 | | - base = args.base, |
108 | | - lkv = args.lkv, |
109 | | - clean_kernel = args.clean_kernel, |
110 | | - ksu = args.ksu, |
111 | | - defconfig = args.defconfig, |
112 | | - ) |
| 128 | + kc = KernelCommand(kernel_builder=kernel_builder) |
113 | 129 | kc.execute() |
114 | 130 |
|
115 | 131 | case "assets": |
116 | | - ac = AssetsCommand( |
117 | | - codename = args.codename, |
118 | | - base = args.base, |
119 | | - chroot = args.chroot, |
120 | | - clean_assets = args.clean_assets, |
121 | | - rom_only = args.rom_only, |
122 | | - ksu = args.ksu, |
123 | | - ) |
| 132 | + ac = AssetsCommand(assets_collector=assets_collector) |
124 | 133 | ac.execute() |
125 | 134 |
|
126 | 135 | case "bundle": |
127 | 136 | bc = BundleCommand( |
128 | | - codename = args.codename, |
129 | | - base = args.base, |
130 | | - lkv = args.lkv, |
| 137 | + kernel_builder = kernel_builder, |
| 138 | + assets_collector = assets_collector, |
131 | 139 | package_type = args.package_type, |
132 | | - ksu = args.ksu, |
133 | | - defconfig = args.defconfig, |
| 140 | + base = args.base |
134 | 141 | ) |
135 | 142 | bc.execute() |
136 | 143 |
|
|
0 commit comments