urbit/shrub
1
1
Fork 0
mirror of https://github.com/urbit/shrub.git synced 2025-01-06 13:14:01 +03:00
Code Issues Packages Projects Releases Wiki Activity

Trying to get collections working

Browse Source
This commit is contained in:
Elliot Glaysher 2018-08-09 14:59:33 -07:00
parent 89a0a91c57
commit 11cb648399
4 changed files with 35 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/hood/drum.hoon
View File

@ -82,14 +82,13 @@
:: ::
:: ?: ?=($pawn myr) :: ?: ?=($pawn myr)
:: [[%base %collections] [%base %hall] [%base %talk] [%base %dojo] ~] :: [[%base %collections] [%base %hall] [%base %talk] [%base %dojo] ~]
:: :~ [%home %collections] :~ :: [%home %collections]
:: [%home %acme] [%home %acme]
:: [%home %dns] [%home %dns]
:: [%home %dojo] [%home %dojo]
:: [%home %hall] :: [%home %hall]
:: [%home %talk] :: [%home %talk]
:: == ==
[[%home %dojo] ~]
:: ::
++ deft-fish :: default connects ++ deft-fish :: default connects
|= our/ship |= our/ship

11
lib/old-zuse.hoon
View File

@ -253,17 +253,6 @@
++ gram gram:eyre :: inter-ship message ++ gram gram:eyre :: inter-ship message
++ kiss-eyre task:able:eyre :: in request ->$ ++ kiss-eyre task:able:eyre :: in request ->$
++ gift-eyre gift:able:eyre :: out result <-$ ++ gift-eyre gift:able:eyre :: out result <-$
++ hood hood:ford :: assembly plan
++ hoof hoof:ford :: resource reference
++ hoop hoop:ford :: source in hood
++ hops hops:ford :: XX late-bound path
++ horn horn:ford :: resource tree
++ milk milk:ford :: sourced silk
++ silk silk:ford :: construction layer
++ bilk bilk:ford :: sourced request
++ gage gage:ford :: recursive cage+tang
++ kiss-ford task:able:ford :: in request ->$
++ gift-ford gift:able:ford :: out result <-$
++ club club:gall :: agent action ++ club club:gall :: agent action
++ cuft cuft:gall :: internal gift ++ cuft cuft:gall :: internal gift
++ culm culm:gall :: config action ++ culm culm:gall :: config action

33
sys/vane/ford.hoon
View File

@ -1706,7 +1706,7 @@
:: accessed-builds: builds accessed/depended on during this run. :: accessed-builds: builds accessed/depended on during this run.
:: ::
=| accessed-builds=(list ^build) =| accessed-builds=(list ^build)
~& [%turbo-make (build-to-tape build)] :: ~& [%turbo-make (build-to-tape build)]
:: dispatch based on the kind of +schematic in :build :: dispatch based on the kind of +schematic in :build
:: ::
:: ::
@ -1895,9 +1895,19 @@
[build [%blocks [toplevel-build]~ ~] accessed-builds] [build [%blocks [toplevel-build]~ ~] accessed-builds]
:: ::
?. ?=([~ %success %scry *] toplevel-result) ?. ?=([~ %success %scry *] toplevel-result)
:: TODO: include :errors in the output since both failed. ?~ errors
~& %no-renderer-errors1
(wrap-error toplevel-result)
:: ::
(wrap-error toplevel-result) ?> ?=([~ %error *] toplevel-result)
=/ braces [[' ' ' ' ~] ['{' ~] ['}' ~]]
%- return-error :~
[%leaf "ford: %bake {<renderer>} failed:"]
[%leaf "as-renderer"]
[%rose braces errors]
[%leaf "as-mark"]
[%rose braces message.u.toplevel-result]
==
:: ::
=/ toplevel-arch=arch ;;(arch q.q.cage.u.toplevel-result) =/ toplevel-arch=arch ;;(arch q.q.cage.u.toplevel-result)
:: find the :sub-path-segments that could be files :: find the :sub-path-segments that could be files
@ -1958,7 +1968,19 @@
[build [%blocks [alts-build]~ ~] accessed-builds] [build [%blocks [alts-build]~ ~] accessed-builds]
:: ::
?. ?=([~ %success %alts *] alts-result) ?. ?=([~ %success %alts *] alts-result)
(wrap-error alts-result) ?~ errors
~& %no-renderer-errors2
(wrap-error alts-result)
::
?> ?=([~ %error *] alts-result)
=/ braces [[' ' ' ' ~] ['{' ~] ['}' ~]]
%- return-error :~
[%leaf "ford: %bake {<renderer>} failed:"]
[%leaf "as-renderer"]
[%rose braces errors]
[%leaf "as-mark"]
[%rose braces message.u.alts-result]
==
:: ::
=/ =build-result =/ =build-result
[%success %bake (result-to-cage u.alts-result)] [%success %bake (result-to-cage u.alts-result)]
@ -3678,6 +3700,7 @@
++ run-fszy ++ run-fszy
|= =mark |= =mark
^- compose-cranes ^- compose-cranes
:: why does this not actually run the renderer in the collections.hoon case?
:: ::
=/ bake-build=^build =/ bake-build=^build
:- date.build :- date.build
@ -3686,7 +3709,7 @@
?~ bake-result ?~ bake-result
[[%block [bake-build]~] ..run-crane] [[%block [bake-build]~] ..run-crane]
?: ?=([~ %error *] bake-result) ?: ?=([~ %error *] bake-result)
[[%error [leaf+"/mark/ failed: " message.u.bake-result]] ..run-crane] [[%error [leaf+"/{<mark>}/ failed: " message.u.bake-result]] ..run-crane]
?> ?=([~ %success %bake *] bake-result) ?> ?=([~ %success %bake *] bake-result)
:: ::
[[%subject cage.u.bake-result] ..run-crane] [[%subject cage.u.bake-result] ..run-crane]

0
web/collections/readme.md → web/collections/readme.umd
View File