diff options
| author | eschnett <eschnett@83718e91-0e4f-0410-abf4-91180603181f> | 2010-12-19 06:05:04 +0000 |
|---|---|---|
| committer | eschnett <eschnett@83718e91-0e4f-0410-abf4-91180603181f> | 2010-12-19 06:05:04 +0000 |
| commit | 773dc87d12d98ca8125debda6145ea40e26e5d42 (patch) | |
| tree | 0e076c0f0c2e05f6a4ab1ae4830d1e4911cb0d44 | |
| parent | 53fe4ed088b03f1788739a065965977394907dbc (diff) | |
Handle GNU tar correctly.
Store new SimFactory script files as well.
Do not store repositories.
git-svn-id: http://svn.cactuscode.org/arrangements/CactusUtils/Formaline/trunk@198 83718e91-0e4f-0410-abf4-91180603181f
| -rw-r--r-- | src/make.configuration.deps | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/src/make.configuration.deps b/src/make.configuration.deps index d44f030..db56e64 100644 --- a/src/make.configuration.deps +++ b/src/make.configuration.deps @@ -11,7 +11,7 @@ TAR := $(shell gtar --help > /dev/null 2> /dev/null && echo gtar || echo tar) # indicates that files changed while reading, which can happen if the # atime changed. (An atime change means that another program read the # file, which is inconsequential.) -GNUTAR := $(shell $(TAR) --version 2>/dev/null | grep -q 'GNU tar' && echo "1" || echo "0") +IS_GNUTAR := $(shell $(TAR) --version 2>/dev/null | grep -q 'GNU tar' && echo "1" || echo "0") # Does tr support -C, or should we use -c instead? TR_C := $(shell tr -C 'a' 'b' < /dev/null > /dev/null 2> /dev/null && echo 'tr -C' || echo 'tr -c') @@ -128,7 +128,7 @@ $(TARBALL_DIR)/flesh-Cactus.c: $(TARBALL_DIR)/flesh-Cactus.tar.gz $(CCTK_HOME)/a $(TARBALL_DIR)/flesh-Cactus.tar.gz: $(TARBALL_DIR)/flesh-Cactus.files cd $(CCTK_HOME) && \ - $(TAR) czf $@ -T $< || [ $[ $?/\($(GNUTAR)+1\) ] -eq 0 ] + $(TAR) czf $@ -T $< || [ $$[ $$? / \($(IS_GNUTAR)+1\) ] -eq 0 ] # This dependency means that the tarball for a thorn is only updated # if the thorn is actually recompiled. This does not catch changes to @@ -137,11 +137,18 @@ $(TARBALL_DIR)/flesh-Cactus.files: $(CCTK_LIBDIR)/$(LIBNAME_PREFIX)$(CCTK_LIBNAM cd $(CCTK_HOME) && \ find CONTRIBUTORS COPYRIGHT Makefile lib src \ `ls configs/$(notdir $(TOP))/OptionList 2> /dev/null` \ + `ls configs/$(notdir $(TOP))/properties.ini 2> /dev/null` \ + `ls configs/$(notdir $(TOP))/RunScript 2> /dev/null` \ `ls configs/$(notdir $(TOP))/ScriptFile 2> /dev/null` \ + `ls configs/$(notdir $(TOP))/SubmitScript 2> /dev/null` \ configs/$(notdir $(TOP))/ThornList \ configs/$(notdir $(TOP))/config-data \ configs/$(notdir $(TOP))/config-info \ -name 'CVS' -prune -o \ + -name '_darcs' -prune -o \ + -name '.git' -prune -o \ + -name '.hg' -prune -o \ + -name '.svn' -prune -o \ -name '*.log' -prune -o \ -name '*.log.gz' -prune -o \ -name '.?*' -prune -o \ @@ -180,7 +187,7 @@ $(TARBALL_DIR)/thorn-%.c: $(TARBALL_DIR)/thorn-%.tar.gz $(CCTK_HOME)/arrangement $(TARBALL_DIR)/thorn-%.tar.gz: $(TARBALL_DIR)/thorn-%.files cd $(CCTK_HOME) && \ - $(TAR) czf $@ -T $< || [ $[ $?/\($(GNUTAR)+1\) ] -eq 0 ] + $(TAR) czf $@ -T $< || [ $$[ $$? / \($(IS_GNUTAR)+1\) ] -eq 0 ] # This dependency means that the tarball for a thorn is only updated # if the thorn is actually recompiled. This does not catch changes to |