|
@@ -229,25 +229,10 @@ int main(int argc, char *argv[]) {
|
|
|
step("Compiling Swift system binaries (splash, arkrt, display daemon)");
|
|
step("Compiling Swift system binaries (splash, arkrt, display daemon)");
|
|
|
{
|
|
{
|
|
|
/* Check each binary individually for incremental builds */
|
|
/* Check each binary individually for incremental builds */
|
|
|
- char splash_out[512], arkrt_out[512], daemon_out[512];
|
|
|
|
|
- snprintf(splash_out, sizeof(splash_out), "%s/swift_splash", staging);
|
|
|
|
|
|
|
+ char arkrt_out[512], daemon_out[512];
|
|
|
snprintf(arkrt_out, sizeof(arkrt_out), "%s/arkrt", staging);
|
|
snprintf(arkrt_out, sizeof(arkrt_out), "%s/arkrt", staging);
|
|
|
snprintf(daemon_out, sizeof(daemon_out), "%s/system/ui_daemon", staging);
|
|
snprintf(daemon_out, sizeof(daemon_out), "%s/system/ui_daemon", staging);
|
|
|
|
|
|
|
|
- /* swift_splash sources */
|
|
|
|
|
- char splash_src[512];
|
|
|
|
|
- snprintf(splash_src, sizeof(splash_src), "%s/system/swift_splash.swift", base);
|
|
|
|
|
- const char *splash_sources[] = {splash_src};
|
|
|
|
|
-
|
|
|
|
|
- if (is_up_to_date(splash_out, splash_sources, 1)) {
|
|
|
|
|
- printf(" \033[0;32m✓\033[0m swift_splash is up-to-date (skipping)\n");
|
|
|
|
|
- } else {
|
|
|
|
|
- char cmd[1024];
|
|
|
|
|
- snprintf(cmd, sizeof(cmd),
|
|
|
|
|
- "make -C %s out_staging/swift_splash", base);
|
|
|
|
|
- run(cmd);
|
|
|
|
|
- }
|
|
|
|
|
-
|
|
|
|
|
/* arkrt sources */
|
|
/* arkrt sources */
|
|
|
char a1[512], a2[512], a3[512], a4[512], a5[512], a6[512];
|
|
char a1[512], a2[512], a3[512], a4[512], a5[512], a6[512];
|
|
|
snprintf(a1, sizeof(a1), "%s/arkrt/main.swift", base);
|
|
snprintf(a1, sizeof(a1), "%s/arkrt/main.swift", base);
|
|
@@ -388,11 +373,6 @@ int main(int argc, char *argv[]) {
|
|
|
staging, initramfs_ext, initramfs_ext);
|
|
staging, initramfs_ext, initramfs_ext);
|
|
|
run(cmd);
|
|
run(cmd);
|
|
|
|
|
|
|
|
- snprintf(cmd, sizeof(cmd),
|
|
|
|
|
- "cp %s/swift_splash %s/swift_splash && chmod +x %s/swift_splash",
|
|
|
|
|
- staging, initramfs_ext, initramfs_ext);
|
|
|
|
|
- run(cmd);
|
|
|
|
|
-
|
|
|
|
|
snprintf(cmd, sizeof(cmd), "cp %s/arkrt %s/arkrt && chmod +x %s/arkrt",
|
|
snprintf(cmd, sizeof(cmd), "cp %s/arkrt %s/arkrt && chmod +x %s/arkrt",
|
|
|
staging, initramfs_ext, initramfs_ext);
|
|
staging, initramfs_ext, initramfs_ext);
|
|
|
run(cmd);
|
|
run(cmd);
|