Merge r7814:7819 from the 3.3.x branch

git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@7820 d57e44dd-8a1f-0410-8b47-8ef2f437770f

scripts/generate-release-archive

@@ -20,7 +20,9 @@ if [ -z "$files" ]; then
     fi
 fi
 
+result=../$name-$version.tar.bz2
+rm -f "${result}"
 for f in "${files[@]}"; do echo "$f"; done | \
-    tar --owner=root --group=root --transform="s|^|$name-$version/|" \
-	-cjf "$name-$version.tar.bz2" -T- -h &&
-    ls -l "$name-$version.tar.bz2"
+    tar --owner=root --group=root --transform="s|^|$name-$version/|;s|^$name-$version/../scst/include/backport.h$|../scst/include/backport.h|;s|^$name-$version/scstadmin.sysfs$|scstadmin.sysfs|" \
+	-cjf "${result}" -T- &&
+    ls -l "${result}"

scripts/list-source-files

@@ -17,7 +17,7 @@ list_source_files() {
       grep -vE '^[D?]|^Performing|^$' | \
       cut -c3- | \
       while read -r a b c f; do
-        if [ -f "$f" ]; then
+        if [ -f "$f" -o -h "$f" ]; then
 	  echo "$a $b $c" >/dev/null
 	  echo "$f"
         fi
@@ -39,7 +39,7 @@ list_source_files() {
       hg manifest
     fi
   else
-    echo "Not under source control: $1 ?" >&2
+    ( cd "$d" && find -type f -o -type l | sed 's|^\./||' )
   fi
 }