From a765a7b7bc89d1a8623e2b88c72ffd736e936536 Mon Sep 17 00:00:00 2001
From: Emery Hemingway <ehmry@posteo.net>
Date: Wed, 10 Jul 2019 15:50:35 +0200
Subject: [PATCH] Collect <bin>, <pkg>, and <raw> groups at the depot

---
 Tupfile      | 8 ++++----
 Tuprules.tup | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Tupfile b/Tupfile
index 450bb80..69d6779 100644
--- a/Tupfile
+++ b/Tupfile
@@ -28,8 +28,8 @@ SHORT_SUM = b2sum -l24
 |> $(BIN_LISTING)
 	# Generate a listing of all binary archives
 
-: $(DEPOT_DIR)/<packages> |> ^ generate package version sed script^ \
-	for d in `dirname %<packages> | tr ' ' '\n' | sort -u`; do \
+: $(DEPOT_DIR)/<pkg> |> ^ generate package version sed script^ \
+	for d in `dirname %<pkg> | tr ' ' '\n' | sort -u`; do \
 		echo $d/`cat $d/.ARCHIVES $d/runtime | $(SHORT_SUM)` | awk -F '/' \
 			'{print "s|local/pkg/"$3"/current|@(PUBLIC_USER)/pkg/"$3"/"substr($5,0,6)"|"}' >> %o; \
 	done \
@@ -63,8 +63,8 @@ SHORT_SUM = b2sum -l24
 AWK_RUNTIME_PATH = awk -v RS=' ' -F '/' \
 	'/runtime/ {print "	<pkg path=\"local/pkg/"$3"/current\"/>"}'
 
-: $(DEPOT_DIR)/<packages> |> ^ generate local index^ \
+: $(DEPOT_DIR)/<pkg> |> ^ generate local index^ \
 	echo '<index>' > %o; \
-	echo %<packages> | $(AWK_RUNTIME_PATH) | sort >> %o; \
+	echo %<pkg> | $(AWK_RUNTIME_PATH) | sort >> %o; \
 	echo '</index>' >> %o |> $(DEPOT_DIR)/index/@(SCULPT_VERSION)
 	# Generate the depot index file
diff --git a/Tuprules.tup b/Tuprules.tup
index 0ee1037..7058f62 100644
--- a/Tuprules.tup
+++ b/Tuprules.tup
@@ -105,11 +105,11 @@ AWK_LOCAL_ARCHIVES = awk -F '/' \
 
 !collect_raw = |> ^ COLLECT %b^ \
 	cp %f %o \
-|> $(RAW_DIR)/%b
+|> $(RAW_DIR)/%b $(DEPOT_DIR)/<raw>
 
 !collect_bin = |> ^ COLLECT %b^ \
 	@(TOOL_CHAIN_PREFIX)strip -o %o %f \
-|> $(DEPOT_BIN_DIR)/$(BIN_NAME)/current/%b
+|> $(DEPOT_BIN_DIR)/$(BIN_NAME)/current/%b $(DEPOT_DIR)/<bin>
 
 !collect_pkg_runtime = | $(VERSIONS_SED_FILE) |> ^ package %f^ \
 	xmllint --noout -schema $(ERRATA_DIR)/runtime.xsd %f; \
@@ -123,11 +123,11 @@ AWK_LOCAL_ARCHIVES = awk -F '/' \
 	$(DEPOT_PKG_DIR)/$(PKG_NAME)/current/runtime \
 	$(DEPOT_PKG_DIR)/$(PKG_NAME)/current/archives \
 	$(DEPOT_PKG_DIR)/$(PKG_NAME)/current/.ARCHIVES \
-	$(DEPOT_DIR)/<packages>
+	$(DEPOT_DIR)/<pkg>
 
 !collect_pkg = |> ^ COLLECT %b^ cp %f %o \
 	|> $(DEPOT_PKG_DIR)/$(PKG_NAME)/current/%b \
-		$(DEPOT_DIR)/<packages>
+		$(DEPOT_DIR)/<pkg>
 
 VERSIONS_SED_FILE = $(TUP_CWD)/versions.sed
 PKG_SED_FILE = $(TUP_CWD)/pkg.sed