Dhall rendering update
This commit is contained in:
parent
5e00cf7ce2
commit
3c8e393368
11
Tuprules.tup
11
Tuprules.tup
|
@ -1,5 +1,3 @@
|
|||
.gitignore
|
||||
|
||||
ifndef TOOL_CHAIN_PREFIX
|
||||
error TOOL_CHAIN_PREFIX not configured, missing variant?
|
||||
endif
|
||||
|
@ -213,11 +211,18 @@ DEPOT_MANIFEST = $(PUBLIC_DIR)/manifest.dhall
|
|||
$(DHALL) <<< '{ info = (%f).indexInfo, name = "$(PKG_NAME)", version = ($(DEPOT_MANIFEST)).pkg.$(PKG_NAME).version }' > %o \
|
||||
|> $(PKG_DIR)/index.dhall $(DEPOT_DIR)/index/<entry>
|
||||
|
||||
!render_runtime = |> ^o render %o^ \
|
||||
!render_runtime = | $(VERSIONS_SED_FILE) |> ^o render %d runtime^ \
|
||||
$(DHALL) text <<< '$(ERRATA_DIR)/renderRuntime.dhall (%f).runtime' \
|
||||
> $(DEPOT_PKG_DIR)/$(PKG_NAME)/current/runtime; \
|
||||
xmllint --noout -schema $(ERRATA_DIR)/runtime.xsd - \
|
||||
< $(DEPOT_PKG_DIR)/$(PKG_NAME)/current/runtime; \
|
||||
echo $(PKG_DEPENDS) | tr ' ' '\n' | sed \
|
||||
-e 's|_/\(.*\)/\(.*\)$|local/\1/\2/current|' \
|
||||
> $(DEPOT_PKG_DIR)/$(PKG_NAME)/current/archives; \
|
||||
sed -f $(VERSIONS_SED_FILE) $(DEPOT_PKG_DIR)/$(PKG_NAME)/current/archives \
|
||||
> $(DEPOT_PKG_DIR)/$(PKG_NAME)/current/.ARCHIVES; \
|
||||
|> \
|
||||
$(DEPOT_PKG_DIR)/$(PKG_NAME)/current/runtime \
|
||||
$(DEPOT_PKG_DIR)/$(PKG_NAME)/current/archives \
|
||||
$(DEPOT_PKG_DIR)/$(PKG_NAME)/current/.ARCHIVES \
|
||||
$(DEPOT_DIR)/<pkg> \
|
||||
|
|
|
@ -9,12 +9,12 @@ endif
|
|||
include_rules
|
||||
|
||||
: $(DEPOT_DIR)/<raw-archives> |> \
|
||||
awk -F '/' 'BEGIN { print "{=}"} {print "//{"$3"={version=\""$4"\",owner=\"@(PUBLIC_USER)\"}}" }' $f \
|
||||
awk -F '/' 'BEGIN { print "{=}"} {print "∧{"$3"={version=\""$4"\",owner=\"@(PUBLIC_USER)\"}}" }' $f \
|
||||
<<< %<raw-archives> | dhall > %o\
|
||||
|> raw.dhall {records}
|
||||
|
||||
: $(DEPOT_DIR)/<bin-archives> |> \
|
||||
awk -F '/' 'BEGIN { print "{=}"} {print "//{"$3"={version=\""$4"\",owner=\"@(PUBLIC_USER)\"}}" }' $f <<< %<bin-archives> \
|
||||
awk -F '/' 'BEGIN { print "{=}"} {print "∧{"$3"={version=\""$4"\",owner=\"@(PUBLIC_USER)\"}}" }' $f <<< %<bin-archives> \
|
||||
| dhall > %o\
|
||||
|> bin.dhall {records}
|
||||
|
||||
|
@ -24,7 +24,7 @@ SHORT_SUM = b2sum -l24
|
|||
echo '{=}' > %o; \
|
||||
for d in `dirname %<pkg> | tr ' ' '\n' | sort -u`; do \
|
||||
echo $d/`cat $d/.ARCHIVES $d/runtime | $(SHORT_SUM)` | awk -F '/' \
|
||||
'{print "//{"$4"={version=\""substr($6,0,6)"\",owner=\"@(PUBLIC_USER)\"}}"}' >> %o; \
|
||||
'{print "∧{"$4"={version=\""substr($6,0,6)"\",owner=\"@(PUBLIC_USER)\"}}"}' >> %o; \
|
||||
done \
|
||||
|> pkg.dhall {records}
|
||||
|
||||
|
|
Loading…
Reference in New Issue