From b80345db0b62dba7882fb08e8b3298df7d15a805 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Tue, 21 Oct 2014 13:57:03 +0200 Subject: [PATCH] Fix tgz script, addons_contrib was in release --- build_files/utils/build_tgz.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/build_files/utils/build_tgz.sh b/build_files/utils/build_tgz.sh index 409c738e9f8..16899fd34b2 100755 --- a/build_files/utils/build_tgz.sh +++ b/build_files/utils/build_tgz.sh @@ -13,8 +13,10 @@ blender_subversion=$(grep "BLENDER_SUBVERSION\s" "$blender_srcdir/source/blender if [ "$blender_version_cycle" = "release" ] ; then VERSION=$(expr $blender_version / 100).$(expr $blender_version % 100)$blender_version_char + SUBMODULE_EXCLUDE="^\(release/scripts/addons_contrib\)$" else VERSION=$(expr $blender_version / 100).$(expr $blender_version % 100)_$blender_subversion + SUBMODULE_EXCLUDE="^$" # dummy regex fi MANIFEST="blender-$VERSION-manifest.txt" @@ -30,7 +32,7 @@ echo -n "Building manifest of files: \"$BASE_DIR/$MANIFEST\" ..." git ls-files | python3 -c "$FILTER_FILES_PY" > $BASE_DIR/$MANIFEST # Enumerate submodules -for lcv in $(git submodule | awk '{print $2}'); do +for lcv in $(git submodule | awk '{print $2}' | grep -v "$SUBMODULE_EXCLUDE"); do cd "$BASE_DIR" cd "$blender_srcdir/$lcv" git ls-files | python3 -c "$FILTER_FILES_PY" | awk '$0="'"$lcv"/'"$0' >> $BASE_DIR/$MANIFEST