Rename _ARCHIVES to .ARCHIVES, process public archive files twice

This commit is contained in:
Ehmry - 2019-04-04 14:15:08 +02:00
parent 42e2f41f85
commit 51100efa1d
5 changed files with 9 additions and 9 deletions

View File

@ -24,7 +24,7 @@ SHORT_SUM = b2sum -l24
: $(DEPOT_DIR)/<packages> |> ^ generate package version sed script^ \ : $(DEPOT_DIR)/<packages> |> ^ generate package version sed script^ \
for d in `dirname %<packages> | tr ' ' '\n' | sort -u`; do \ for d in `dirname %<packages> | tr ' ' '\n' | sort -u`; do \
echo $d/`cat $d/_ARCHIVES $d/runtime | $(SHORT_SUM)` | awk -F '/' \ echo $d/`cat $d/.ARCHIVES $d/runtime | $(SHORT_SUM)` | awk -F '/' \
'{print "s|local/pkg/"$4"/current|@(PUBLIC_USER)/pkg/"$4"/"substr($6,0,6)"|"}' >> %o; \ '{print "s|local/pkg/"$4"/current|@(PUBLIC_USER)/pkg/"$4"/"substr($6,0,6)"|"}' >> %o; \
done \ done \
|> $(PKG_SED_FILE) |> $(PKG_SED_FILE)

View File

@ -13,11 +13,11 @@ endif
!raw = |> ^ COLLECT %o^ \ !raw = |> ^ COLLECT %o^ \
echo $(RAW_DEPENDS) local/raw/$(RAW_NAME)/$(RAW_VERSION) | tr ' ' '\n' > %o; \ echo $(RAW_DEPENDS) local/raw/$(RAW_NAME)/$(RAW_VERSION) | tr ' ' '\n' > %o; \
echo local/raw/$(RAW_NAME)/$(RAW_VERSION) > %o \ echo local/raw/$(RAW_NAME)/$(RAW_VERSION) > %o \
|> $(DEPOT_RAW_DIR)/$(RAW_NAME)/current/_ARCHIVES $(DEPOT_DIR)/<raw-archives> |> $(DEPOT_RAW_DIR)/$(RAW_NAME)/current/.ARCHIVES $(DEPOT_DIR)/<raw-archives>
!bin = |> ^ COLLECT %o^ \ !bin = |> ^ COLLECT %o^ \
echo $(BIN_DEPENDS) local/src/$(BIN_NAME)/$(BIN_VERSION) | tr ' ' '\n' > %o; \ echo $(BIN_DEPENDS) local/src/$(BIN_NAME)/$(BIN_VERSION) | tr ' ' '\n' > %o; \
|> $(DEPOT_BIN_DIR)/$(BIN_NAME)/current/_ARCHIVES $(DEPOT_DIR)/<bin-archives> |> $(DEPOT_BIN_DIR)/$(BIN_NAME)/current/.ARCHIVES $(DEPOT_DIR)/<bin-archives>
AWK_LOCAL_ARCHIVES = awk -F '/' \ AWK_LOCAL_ARCHIVES = awk -F '/' \
'{if ($1 != "local") {print $0} \ '{if ($1 != "local") {print $0} \
@ -40,10 +40,10 @@ AWK_LOCAL_ARCHIVES = awk -F '/' \
-e 's|_/\(.*\)/\(.*\)$|local/\1/\2/current|' \ -e 's|_/\(.*\)/\(.*\)$|local/\1/\2/current|' \
> $(DEPOT_PKG_DIR)/$(PKG_NAME)/current/archives; \ > $(DEPOT_PKG_DIR)/$(PKG_NAME)/current/archives; \
sed -f $(VERSIONS_SED_FILE) $(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/.ARCHIVES; \
|> \ |> \
$(DEPOT_PKG_DIR)/$(PKG_NAME)/current/archives \ $(DEPOT_PKG_DIR)/$(PKG_NAME)/current/archives \
$(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/runtime \
$(DEPOT_DIR)/<packages> $(DEPOT_DIR)/<packages>

View File

@ -7,6 +7,6 @@
{ print tar": "FILENAME } { print tar": "FILENAME }
{ print " @echo tar $@" } { print " @echo tar $@" }
{ print " @mkdir -p $(dir $@)" } { print " @mkdir -p $(dir $@)" }
{ print " @tar cfJ $@ --exclude=_ARCHIVES --transform=\"s|^\\.|"$4"|\" -C $(dir $<) ." } { print " @tar cfJ $@ --exclude=.ARCHIVES --transform=\"s|^\\.|"$4"|\" -C $(dir $<) ." }
}} }}

View File

@ -4,10 +4,10 @@
{ print "all: " tar ".sig" } { print "all: " tar ".sig" }
{ print tar": depot/local/pkg/"$6"/current/_ARCHIVES pkg.sed" } { print tar": depot/local/pkg/"$6"/current/.ARCHIVES pkg.sed" }
{ print " @echo tar $@" } { print " @echo tar $@" }
{ print " @mkdir -p $(dir $@) "ver } { print " @mkdir -p $(dir $@) "ver }
{ print " @cp $< "ver"/archives" } { print " @sed -f pkg.sed $< > "ver"/archives" }
{ print " @cp $(dir $<)/runtime "ver } { print " @cp $(dir $<)/runtime "ver }
{ print " @tar cfJ $@ "ver } { print " @tar cfJ $@ "ver }
{ print " @rm -r "ver } { print " @rm -r "ver }

View File

@ -5,4 +5,4 @@
{ print tar": "FILENAME } { print tar": "FILENAME }
{ print " @echo tar $@" } { print " @echo tar $@" }
{ print " @mkdir -p $(dir $@)" } { print " @mkdir -p $(dir $@)" }
{ print " @tar cfJ $@ --exclude=_ARCHIVES --transform=\"s|^\\.|"$4"|\" -C $(dir $<) ." } { print " @tar cfJ $@ --exclude=.ARCHIVES --transform=\"s|^\\.|"$4"|\" -C $(dir $<) ." }