From e34ccce28de7ffcba4bc74e2eb099b53cea14493 Mon Sep 17 00:00:00 2001 From: Leandro Lucarella Date: Fri, 2 Oct 2009 15:09:40 -0300 Subject: [PATCH] Fix source tree replication in build directory Sub-projects build directories were not excluded from the replication. Git directories were not excluded either, resulting in a long time spent creating unused directories. --- Makeit.mak | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/Makeit.mak b/Makeit.mak index a4b6dfb..a687ccd 100644 --- a/Makeit.mak +++ b/Makeit.mak @@ -66,6 +66,12 @@ SPHINX_FORMAT ?= html # Paper size for Sphinx LaTeX output (a4, letter, etc.) SPHINX_PAPERSIZE ?= a4 +# Name of the build directory (to use when excluding some paths) +BUILD_DIR_NAME ?= build + +# Directories to exclude from the build directory tree replication +BUILD_DIR_EXCLUDE ?= $(BUILD_DIR_NAME) .git .hg .bzr _darcs .svn CVS + # Directories ############## @@ -85,7 +91,7 @@ T := $(abspath $T) R := $(subst $T,,$(patsubst $T/%,%,$(CURDIR))) # Base directory where to put variants (Variants Directory) -VD ?= $T/build +VD ?= $T/$(BUILD_DIR_NAME) # Generated files top directory G ?= $(VD)/$F @@ -445,9 +451,9 @@ test: $$(test) # subdirectories, that's why the current directory "." is included, so it # won't show an error message in case of no subdirectories. setup_build_dir__ := $(shell \ - mkdir -p $O $B $L $D $(INCLUDE_DIR); \ - mkdir -p . $(addprefix $O,$(patsubst $T%,%,\ - $(shell find $T -type d -not -path '$(VD)*'))); \ + mkdir -p $O $B $L $D $(INCLUDE_DIR) $(addprefix $O,$(patsubst $T%,%,\ + $(shell find $T -type d $(foreach d,$(BUILD_DIR_EXCLUDE), \ + -not -path '*/$d' -not -path '*/$d/*')))); \ test -L $(VD)/last || ln -s $F $(VD)/last ) -- 2.43.0