RAW_DIR optimization
This commit is contained in:
parent
20082eda74
commit
cba0f9dc6c
39
Tuprules.tup
39
Tuprules.tup
|
@ -10,10 +10,30 @@ ifeq ($(PKG_NAME),)
|
||||||
PKG_NAME = $(TARGET_NAME)
|
PKG_NAME = $(TARGET_NAME)
|
||||||
endif
|
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^ \
|
!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>
|
|> $(RAW_DIR)/.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; \
|
||||||
|
@ -27,7 +47,7 @@ AWK_LOCAL_ARCHIVES = awk -F '/' \
|
||||||
|
|
||||||
!collect_raw = |> ^ COLLECT %o^ \
|
!collect_raw = |> ^ COLLECT %o^ \
|
||||||
cp %f %o \
|
cp %f %o \
|
||||||
|> $(DEPOT_RAW_DIR)/$(RAW_NAME)/current/%b
|
|> $(RAW_DIR)/%b
|
||||||
|
|
||||||
!collect_bin = |> ^ COLLECT %o^ \
|
!collect_bin = |> ^ COLLECT %o^ \
|
||||||
strip -o %o %f \
|
strip -o %o %f \
|
||||||
|
@ -60,16 +80,6 @@ PKG_LISTING = $(TUP_CWD)/pkg-list
|
||||||
|
|
||||||
SDK_INCLUDE = $(TUP_CWD)/sdk.tup
|
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
|
ERRATA_DIR = $(TUP_CWD)/errata
|
||||||
|
|
||||||
CC = @(CC_WRAPPER) `pkg-config genode-base --variable cc`
|
CC = @(CC_WRAPPER) `pkg-config genode-base --variable cc`
|
||||||
|
@ -82,8 +92,3 @@ AR = `pkg-config genode-base --variable ar`
|
||||||
|
|
||||||
export PKG_CONFIG_PATH
|
export PKG_CONFIG_PATH
|
||||||
PKG_CONFIG = PKG_CONFIG_PATH=$PKG_CONFIG_PATH:$(SDK_DIR)/pkgconfig pkg-config
|
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)
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user