[llvm-commits] CVS: llvm/Makefile Makefile.rules

[Reid Spencer]

Changes in directory llvm:

Makefile updated: 1.47 -> 1.48
Makefile.rules updated: 1.313 -> 1.314
---
Log message:

Two dist-check related changes:

1. Allow DIST_CHECK_CONFIG_OPTION to specify a set of options to be passed
   to the configure script during the dist-check target. This allows things
   to be passed down on a project basis so the configure doesn't fail.

2. Use the tar | (cd ; tar ) idiom to copy files which is more flexible
   than using the cp command. THis allows us to exclude CVS .svn
   directories at source rather than stripping them out of the tar ball.


---
Diffs of the changes:  (+16 -5)

 Makefile       |    4 ++++
 Makefile.rules |   17 ++++++++++++-----
 2 files changed, 16 insertions(+), 5 deletions(-)


Index: llvm/Makefile
diff -u llvm/Makefile:1.47 llvm/Makefile:1.48
--- llvm/Makefile:1.47	Sun Dec  5 23:35:00 2004
+++ llvm/Makefile	Mon May 23 21:33:20 2005
@@ -18,6 +18,10 @@
 
 include $(LEVEL)/Makefile.common
 
+# Specify options to pass to configure script when we're
+# running the dist-check target
+DIST_CHECK_CONFIG_OPTIONS = --with-llvmgccdir=$(LLVMGCCDIR)
+
 .PHONY: debug-opt-prof
 debug-opt-prof:
 	$(Echo) Building Debug Version


Index: llvm/Makefile.rules
diff -u llvm/Makefile.rules:1.313 llvm/Makefile.rules:1.314
--- llvm/Makefile.rules:1.313	Thu May 19 15:59:12 2005
+++ llvm/Makefile.rules	Mon May 23 21:33:20 2005
@@ -1366,7 +1366,7 @@
 	  gunzip -c $(DistTarGZip) | $(TAR) xf - && \
 	  cd build && \
 	  ../$(DistName)/configure --prefix="$(DistCheckDir)/install" \
-	    --srcdir=../$(DistName) && \
+	    --srcdir=../$(DistName) $(DIST_CHECK_CONFIG_OPTIONS) && \
 	  $(MAKE) all && \
 	  $(MAKE) check && \
 	  $(MAKE) install && \
@@ -1432,9 +1432,16 @@
 	  if test -d "$$from_dir/$$file"; then \
 	    if test -d "$(PROJ_SRC_DIR)/$$file" && \
 	       test "$$from_dir" != "$(PROJ_SRC_DIR)" ; then \
-	      $(CP) -pR "$(PROJ_SRC_DIR)/$$file" "$$to_dir" || exit 1; \
+	       cd $(PROJ_SRC_DIR) ; \
+	       $(TAR) cf - $$file --exclude .svn --exclude CVS | \
+	         ( cd $$to_dir ; $(TAR) xf - ) ; \
+	       cd $(PROJ_OBJ_DIR) ; \
+	    else \
+	       cd $$from_dir ; \
+	       $(TAR) cf - $$file --exclude .svn --exclude CVS | \
+	         ( cd $$to_dir ; $(TAR) xf - ) ; \
+	       cd $(PROJ_OBJ_DIR) ; \
 	    fi; \
-	    $(CP) -pR $$from_dir/$$file $$to_dir || exit 1; \
 	  elif test -f "$$from_dir/$$file" ; then \
 	    $(CP) -p "$$from_dir/$$file" "$(DistDir)/$$file" || exit 1; \
 	  elif test -L "$$from_dir/$$file" ; then \
@@ -1455,8 +1462,8 @@
 	  fi; \
 	done
 	$(Verb) if test "$(DistDir)" = "$(TopDistDir)" ; then \
-	  $(EchoCmd) Eliminating CVS directories from distribution ; \
-	  $(RM) -rf `find $(TopDistDir) -type d -name CVS -print` ;\
+	  $(EchoCmd) Eliminating CVS/.svn directories from distribution ; \
+	  $(RM) -rf `find $(TopDistDir) -type d \( -name CVS -o -name .svn \) -print` ;\
 	  $(MAKE) dist-hook ; \
 	  $(FIND) $(TopDistDir) -type d ! -perm -777 -exec chmod a+rwx {} \; \
 	    -o ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; \