From cba0f9dc6c316144211d22b4d6a1906f46b0f0e5 Mon Sep 17 00:00:00 2001
From: Emery Hemingway <ehmry@posteo.net>
Date: Fri, 5 Apr 2019 17:19:02 +0200
Subject: [PATCH] RAW_DIR optimization

---
 Tuprules.tup | 39 ++++++++++++++++++++++-----------------
 1 file changed, 22 insertions(+), 17 deletions(-)

diff --git a/Tuprules.tup b/Tuprules.tup
index 6f768a6..42569cb 100644
--- a/Tuprules.tup
+++ b/Tuprules.tup
@@ -10,10 +10,30 @@ ifeq ($(PKG_NAME),)
 PKG_NAME = $(TARGET_NAME)
 endif
 
+GIT_VERSION=`git describe --always`
+BIN_VERSION=$(GIT_VERSION)
+PKG_VERSION=$(GIT_VERSION)
+
+ifeq ($(RAW_VERSION),)
+RAW_VERSION=$(GIT_VERSION)
+endif
+
+DEPOT_DIR  = $(TUP_CWD)/depot/local
+DEPOT_RAW_DIR = $(DEPOT_DIR)/raw
+DEPOT_BIN_DIR = $(DEPOT_DIR)/bin/@(TUP_ARCH)
+DEPOT_PKG_DIR = $(DEPOT_DIR)/pkg
+
+PUBLIC_DIR = $(TUP_CWD)/public/@(PUBLIC_USER)
+PUBLIC_RAW_DIR = $(PUBLIC_DIR)/raw
+PUBLIC_BIN_DIR = $(PUBLIC_DIR)/bin
+PUBLIC_PKG_DIR = $(PUBLIC_DIR)/pkg
+
+RAW_DIR = $(DEPOT_RAW_DIR)/$(RAW_NAME)/current
+
 !raw = |> ^ COLLECT %o^ \
 	echo $(RAW_DEPENDS) local/raw/$(RAW_NAME)/$(RAW_VERSION) | tr ' ' '\n' > %o; \
 	echo local/raw/$(RAW_NAME)/$(RAW_VERSION) > %o \
-|> $(DEPOT_RAW_DIR)/$(RAW_NAME)/current/.ARCHIVES $(DEPOT_DIR)/<raw-archives>
+|> $(RAW_DIR)/.ARCHIVES $(DEPOT_DIR)/<raw-archives>
 
 !bin = |> ^ COLLECT %o^ \
 	echo $(BIN_DEPENDS) local/src/$(BIN_NAME)/$(BIN_VERSION) | tr ' ' '\n' > %o; \
@@ -27,7 +47,7 @@ AWK_LOCAL_ARCHIVES = awk -F '/' \
 
 !collect_raw = |> ^ COLLECT %o^ \
 	cp %f %o \
-|> $(DEPOT_RAW_DIR)/$(RAW_NAME)/current/%b
+|> $(RAW_DIR)/%b
 
 !collect_bin = |> ^ COLLECT %o^ \
 	strip -o %o %f \
@@ -60,16 +80,6 @@ PKG_LISTING = $(TUP_CWD)/pkg-list
 
 SDK_INCLUDE = $(TUP_CWD)/sdk.tup
 
-DEPOT_DIR  = $(TUP_CWD)/depot/local
-DEPOT_RAW_DIR = $(DEPOT_DIR)/raw
-DEPOT_BIN_DIR = $(DEPOT_DIR)/bin/@(TUP_ARCH)
-DEPOT_PKG_DIR = $(DEPOT_DIR)/pkg
-
-PUBLIC_DIR = $(TUP_CWD)/public/@(PUBLIC_USER)
-PUBLIC_RAW_DIR = $(PUBLIC_DIR)/raw
-PUBLIC_BIN_DIR = $(PUBLIC_DIR)/bin
-PUBLIC_PKG_DIR = $(PUBLIC_DIR)/pkg
-
 ERRATA_DIR = $(TUP_CWD)/errata
 
 CC  = @(CC_WRAPPER) `pkg-config genode-base --variable cc`
@@ -82,8 +92,3 @@ AR  = `pkg-config genode-base --variable ar`
 
 export PKG_CONFIG_PATH
 PKG_CONFIG = PKG_CONFIG_PATH=$PKG_CONFIG_PATH:$(SDK_DIR)/pkgconfig pkg-config
-
-GIT_VERSION=`git describe --always`
-BIN_VERSION=$(GIT_VERSION)
-PKG_VERSION=$(GIT_VERSION)
-RAW_VERSION=$(GIT_VERSION)