Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Added (and in one case, reordered) some dependencies in the new os8-run based media build system so that all callers to os8-run from the Makefile now declare which media they require to exist before the script will run. Without this change, parallel makes are likely to fail because make is given the freedom to run targets before the things they're dependent upon exist. This is a branch rather than on the os8-v3f-extensions branch directly because I can't test it here against the tip of that branch due to a missing file. Also, it should be checked by Bill Cattey before being merged into that branch. |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | v3f-parallel-make-fix |
| Files: | files | file ages | folders |
| SHA3-256: |
5a84eb18d909f19dd456e9e31b52f861 |
| User & Date: | tangent 2018-10-28 08:24:31 |
References
|
2018-10-28
| ||
| 08:35 | • Reply: So what DOES remain before we merge os8-v3f-extensions into trunk? artifact: ff1022c3c3 user: tangent | |
Context
|
2018-10-29
| ||
| 00:40 | Merged in v3f-parallel-make-fix. It behaves the same for me as previous versions, but no sense in forking. check-in: f3b2941356 user: poetnerd tags: os8-v3f-extensions | |
|
2018-10-28
| ||
| 08:24 | Added (and in one case, reordered) some dependencies in the new os8-run based media build system so that all callers to os8-run from the Makefile now declare which media they require to exist before the script will run. Without this change, parallel makes are likely to fail because make is given the freedom to run targets before the things they're dependent upon exist. This is a branch rather than on the os8-v3f-extensions branch directly because I can't test it here against the tip of that branch due to a missing file. Also, it should be checked by Bill Cattey before being merged into that branch. Closed-Leaf check-in: 5a84eb18d9 user: tangent tags: v3f-parallel-make-fix | |
|
2018-10-21
| ||
| 21:04 | Found another typoed dependency that should have pointed at v3d.rk05, but instead pointed at nothing. check-in: c01b3a17db user: poetnerd tags: os8-v3f-extensions | |
Changes
Changes to Makefile.in.
| ︙ | ︙ | |||
466 467 468 469 470 471 472 |
\) -exec @INSTALL@ -D -m 664 -o @INSTUSR@ -g @INSTGRP@ {} @ABSPREFIX@/share/{} \;
@@INSTALL@ -m 644 -o @INSTUSR@ -g @INSTGRP@ bin/v3d-*.rk05 @ABSPREFIX@/share/media/os8
@@INSTALL@ -m 664 -o @INSTUSR@ -g @INSTGRP@ boot/*.script @BOOTDIR@
# No-dependencies versions of the bin/v3d-*.rk05 targets used by
# tools/test-mkos8, because there's no point rebuilding the simulator
# on each iteration. XXX This needs revision now that the packs are moved. XXX
| | | | 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 |
\) -exec @INSTALL@ -D -m 664 -o @INSTUSR@ -g @INSTGRP@ {} @ABSPREFIX@/share/{} \;
@@INSTALL@ -m 644 -o @INSTUSR@ -g @INSTGRP@ bin/v3d-*.rk05 @ABSPREFIX@/share/media/os8
@@INSTALL@ -m 664 -o @INSTUSR@ -g @INSTGRP@ boot/*.script @BOOTDIR@
# No-dependencies versions of the bin/v3d-*.rk05 targets used by
# tools/test-mkos8, because there's no point rebuilding the simulator
# on each iteration. XXX This needs revision now that the packs are moved. XXX
os8-bin: $(OS8_BOOT_DISK)
$(OS8RUN)@OS8_OPTS@ $(V3D_DIST_SCRIPT)
os8-patched: $(OS8_BOOT_DISK) $(OS8_DIST_RK05)
$(OS8RUN)@OS8_OPTS@ $(V3D_RK05_SCRIPT)
reconfig:
@AUTOREMAKE@
release: all
@srcdir@/tools/mkrel
|
| ︙ | ︙ | |||
530 531 532 533 534 535 536 | @srcdir@/src/os8/v3f/*.MA \ @srcdir@/src/os8/v3f/*.BI $(OS8_DIST_RK05): $(V3D_DIST_SRCS) | $(SIM) $(OS8RUN_OUTFILES) $(OS8RUN)@OS8_OPTS@ $(V3D_DIST_SCRIPT) | | | | | | | | | 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 | @srcdir@/src/os8/v3f/*.MA \ @srcdir@/src/os8/v3f/*.BI $(OS8_DIST_RK05): $(V3D_DIST_SRCS) | $(SIM) $(OS8RUN_OUTFILES) $(OS8RUN)@OS8_OPTS@ $(V3D_DIST_SCRIPT) $(OS8_BOOT_DISK): $(V3D_RK05_SCRIPT) $(OS8_DIST_RK05) $(V3D_PATCHES) | $(SIM) $(OS8RUN_OUTFILES) $(OS8RUN)@OS8_OPTS@ $(V3D_RK05_SCRIPT) # Also build an OS/8 source disk, as a convenience to avoid the # need to mount up the 7 source tapes in succession. # # Using an order-only dependency for the simulator and the bin disk: we # only need *a* version of each, they don't have to be recent! OS8_SRC_SRCS = \ $(OS8RUN) $(PIDP8I_DIN) \ lib/pidp8i/dirs.py \ $(V3D_SRC_SCRIPT) \ @srcdir@/media/os8/al-*-sa-*.tu56 $(OS8_SRC_RK05): $(OS8_DIST_RK05) $(OS8_SRC_SRCS) | $(SIM) $(OS8_BOOT_DISK) $(OS8RUN)@OS8_OPTS@ $(V3D_SRC_SCRIPT) # Build the source disk for OS/8 V3F bin/$(V3F_BUILD_RK05): $(V3F_SRCDIR)/$(V3F_MANIFEST) $(V3F_SOURCES) $(OS8_BOOT_DISK) cd $(V3F_SRCDIR); @builddir@/$(OS8CP) -v --action-file $(V3F_MANIFEST) mv $(V3F_SRCDIR)/$(V3F_BUILD_RK05) bin # Make a disk with binaries assembled from the V3F source disk $(V3F_MADE_RK05): $(OS8_BOOT_DISK) bin/$(V3F_BUILD_RK05) $(V3F_MAKER) $(OS8RUN) $(V3F_MAKER) # Make a bootable OS/8 v3f TCO8 DECtape image $(V3F_TC08_TU56): $(OS8_BOOT_DISK) $(V3F_MADE_RK05) $(ALL_TU56_SCRIPT) $(CUSP_COPYIN_SCRIPT) $(OS8RUN) $(ALL_TU56_SCRIPT) --enable v3f # Make a bootable OS/8 v3f TD8E 12K DECtape image $(V3F_TD12K_TU56): $(OS8_BOOT_DISK) $(V3F_MADE_RK05) $(ALL_TU56_SCRIPT) $(CUSP_COPYIN_SCRIPT) $(OS8RUN) $(ALL_TU56_SCRIPT) --enable v3f --enable td12k # Make a bootable OS/8 v3d TCO8 DECtape image $(V3D_TC08_TU56): $(OS8_BOOT_DISK) $(ALL_TU56_SCRIPT) $(CUSP_COPYIN_SCRIPT) $(OS8RUN) $(ALL_TU56_SCRIPT) # Make a bootable OS/8 v3d TD8E 12K DECtape image $(V3D_TD12K_TU56): $(OS8_BOOT_DISK) $(ALL_TU56_SCRIPT) $(CUSP_COPYIN_SCRIPT) $(OS8RUN) $(ALL_TU56_SCRIPT) --enable td12k # Rule for building PAL assembly language programs in src/asm/*.pal. obj/%.lst bin/%-pal.pt: @srcdir@/src/asm/%.pal bin/palbart bin/palbart -lr $< || cat obj/$*.err mv @srcdir@/src/asm/$*.lst obj mv @srcdir@/src/asm/$*.rim bin/$*-pal.pt |
| ︙ | ︙ |