Skip to content

Commit 2438ed0

Browse files
committed
[Meta] Check in build scripts
1 parent a47ce07 commit 2438ed0

File tree

2 files changed

+17
-13
lines changed

2 files changed

+17
-13
lines changed

scripts/build_meson_projects.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ def build_meson_projects(only_build: Optional[List[str]] = None) -> None:
3232
run_and_check(["meson", "build", "--cross-file", cross_compile_config_path.as_posix()], cwd=programs_root)
3333

3434
run_and_check(["meson", "compile", "-C", "build"], cwd=programs_root)
35-
# run_and_check(["meson", "install", "-C", "build", "--only-changed"], cwd=programs_root)
35+
run_and_check(["meson", "install", "-C", "build", "--only-changed"], cwd=programs_root)
3636
run_and_check(["meson", "install", "-C", "build"], cwd=programs_root)
3737

3838

scripts/build_os_image.py

+16-12
Original file line numberDiff line numberDiff line change
@@ -165,10 +165,12 @@ def main():
165165
print(f"\tCopying arch-specific code {arch_specific_file} to {file}...")
166166
shutil.copy(arch_specific_file.as_posix(), file.as_posix())
167167

168-
# Build bootloader
169-
env = {"USE_GCC": "1", "SHELL": "sh -xv"}
170-
run_and_check(["make"], cwd=Path(__file__).parents[1] / "bootloader" / "uefi", env_additions=env)
171-
run_and_check(["make"], cwd=Path(__file__).parents[1] / "bootloader", env_additions=env)
168+
if True:
169+
# Build bootloader
170+
# env = {"USE_GCC": "1", "SHELL": "sh -xv"}
171+
env = {}
172+
#run_and_check(["make"], cwd=_REPO_ROOT / "bootloader" / "uefi", env_additions=env)
173+
run_and_check(["make"], cwd=_REPO_ROOT / "bootloader", env_additions=env)
172174

173175
# Build the Rust kernel libraries
174176
build_kernel_rust_libs()
@@ -180,17 +182,19 @@ def main():
180182
# Build the C and assembly portions of the kernel, and link with the Rust libraries
181183
run_and_check(["make"])
182184

183-
# Build Rust programs before C programs as the C programs might
184-
# need headers installed by Rust build scripts
185-
build_rust_programs()
185+
working_on_kernel_only = False
186+
if not working_on_kernel_only:
187+
# Build Rust programs before C programs as the C programs might
188+
# need headers installed by Rust build scripts
189+
build_rust_programs()
186190

187-
# Build user programs
188-
build_meson_projects()
191+
# Build user programs
192+
build_meson_projects()
189193

190-
build_dist_tree()
194+
build_dist_tree()
191195

192-
# Build ramdisk
193-
build_initrd()
196+
# Build ramdisk
197+
build_initrd()
194198

195199
# Build disk image
196200
image_name = build_iso()

0 commit comments

Comments
 (0)