X Strike Force XOrg SVN commit: r26 - in xorg/trunk/debian: . scripts

[X Strike Force SVN Repository Admin <branden+svnadmin@deadbeast.net>]

Author: fabbione
Date: 2004-10-04 13:02:21 -0500 (Mon, 04 Oct 2004)
New Revision: 26

Modified:
   xorg/trunk/debian/CHANGESETS
   xorg/trunk/debian/scripts/split-source
Log:
General improvement of debian/scripts/split-source:
  + Add more code documentation.
  + Fix generation of special case xorg-source-config.
  + Cosmetic: always print the progress status.



Modified: xorg/trunk/debian/CHANGESETS
===================================================================
--- xorg/trunk/debian/CHANGESETS	2004-10-04 17:31:19 UTC (rev 25)
+++ xorg/trunk/debian/CHANGESETS	2004-10-04 18:02:21 UTC (rev 26)
@@ -47,4 +47,10 @@
 * Cosmetic: s/indipendent/independent/g
     25
 
+* General improvement of debian/scripts/split-source:
+  + Add more code documentation.
+  + Fix generation of special case xorg-source-config.
+  + Cosmetic: always print the progress status.
+    26
+
 vim:set ai et sts=4 sw=4 tw=80:

Modified: xorg/trunk/debian/scripts/split-source
===================================================================
--- xorg/trunk/debian/scripts/split-source	2004-10-04 17:31:19 UTC (rev 25)
+++ xorg/trunk/debian/scripts/split-source	2004-10-04 18:02:21 UTC (rev 26)
@@ -9,32 +9,61 @@
 # Not much checking is done now since it is supposed to be called
 # from a sane debian/rules that takes care of everything.
 
+# path to the built-tree
+
 path="$1"
+
+# top level directory (usually xc/)
+
 src="$2"
+
+# path to a directory where to store the tarballs
+
 dst="$3"
+
+# path to the banfile
+
 banfile="$4"
 
 cd $path
 
+# onefilelist variable contains the list of subdirectories that will be packed 
+# exactly as they are. Example: xc/doc -> xorg-source-doc.tar.gz
+
 onefilelist="doc fonts include nls util extras"
+
+# multifilelist variable contains the list of subdirectories that will be packed
+# scanned for the relative subdirectories. 
+# Example: xc/programs/Xserver -> xorg-source-programs-Xserver.tar.gz
+
 multifilelist="lib programs"
 
+# expand the list and add paths to the single entries.
+
 for i in $onefilelist; do
   expandedlist="$expandedlist $src/$i"
 done
 
+# as above, expand the list and add patch to the single entries. the
+# multifilelist requires more love to create proper entries.
+
 for i in $multifilelist; do
   for x in $(ls -lad $src/$i/* | grep ^d | awk '{print $NF}'); do
     expandedlist="$expandedlist $x"
   done
 done
 
+# create the tar.gz files taking care of informing which ones will be skipped
+# and which ones will be created.
+
 for i in $expandedlist; do
   tarname=$(echo $i | sed -e 's/\//-/g' -e 's/'$src'-//g')
   if ! grep -q ^$tarname$ $banfile; then
+    echo -n "Creating xorg-source-$tarname.tar.gz: "
     tar zclp -f $dst/xorg-source-$tarname.tar.gz $i
+    echo "done."
   else
-    echo skipping $tarname
+    echo "Skipping $tarname."
   fi
 done
 
@@ -43,9 +72,11 @@
 
 for i in $multifilelist; do
   imakes="$imakes $src/$i/Imakefile"
-  extrafiles="$(ls -lad $src/* | grep -v ^d | awk '{print $NF}')"
-  tar zclp -f $dst/xorg-source-config.tar.gz $src/config $imakes $extrafiles
 done
+extrafiles="$(ls -lad $src/* | grep -v ^d | awk '{print $NF}')"
+echo -n "Creating xorg-source-config.tar.gz: "
+tar zclp -f $dst/xorg-source-config.tar.gz $src/config $imakes $extrafiles
+echo "done."
 
 exit 0