[Bf-blender-cvs] [bce5b6b] master: Fix tgz script (included all files in submodules)

Campbell Barton noreply at git.blender.org
Sun Oct 5 17:18:58 CEST 2014


Commit: bce5b6b241fdfbc51b604aa65a544b8a924df268
Author: Campbell Barton
Date:   Sun Oct 5 17:18:20 2014 +0200
Branches: master
https://developer.blender.org/rBbce5b6b241fdfbc51b604aa65a544b8a924df268

Fix tgz script (included all files in submodules)

===================================================================

M	build_files/utils/build_tgz.sh

===================================================================

diff --git a/build_files/utils/build_tgz.sh b/build_files/utils/build_tgz.sh
index 944bc52..9ffa72b 100755
--- a/build_files/utils/build_tgz.sh
+++ b/build_files/utils/build_tgz.sh
@@ -22,15 +22,18 @@ TARBALL="blender-$VERSION.tar.gz"
 
 cd "$blender_srcdir"
 
+# not so nice, but works
+FILTER_FILES_PY="import os, sys; [print(l[:-1]) for l in sys.stdin.readlines() if os.path.isfile(l[:-1])]"
+
 # Build master list
 echo -n "Building manifest of files:  \"$BASE_DIR/$MANIFEST\" ..."
-git ls-files > $BASE_DIR/$MANIFEST
+git ls-files | python -c "$FILTER_FILES_PY" > $BASE_DIR/$MANIFEST
 
 # Enumerate submodules
 for lcv in $(git submodule | awk '{print $2}'); do
 	cd "$BASE_DIR"
 	cd "$blender_srcdir/$lcv"
-	git ls-files | awk '$0="'"$lcv"/'"$0' >> $BASE_DIR/$MANIFEST
+	git ls-files | python -c "$FILTER_FILES_PY" | awk '$0="'"$lcv"/'"$0' >> $BASE_DIR/$MANIFEST
 	cd "$BASE_DIR"
 done
 echo "OK"




More information about the Bf-blender-cvs mailing list