Changeset 6116

Timestamp:

29/07/09 10:50:47 (3 years ago)

Author:

westram

Message:

• arb_save inserts 'arbsrc_REV' as directory prefix to source-tarball
• ignore all of names_*.dat

Location:

trunk/util

Files:

• arb_save (modified) (1 diff)
• arb_srclst.pl (modified) (1 diff)

trunk/util/arb_save

@@ -1 @@
-#!/bin/sh
-#watch out for DEPOT and DEPOT2 [they are no longer in use]
-name=`date '+arbsrc_%Y_%m_%d__%H_%M.tgz'`
+#!/bin/bash
 
-( ( util/arb_srclst.pl $* > arbsrc.lst.tmp ) || \
-  ( echo "Failed to build arbsrc.lst" ; echo "To save manually use 'make save2'"; false ) \
-) && \
-sort < arbsrc.lst.tmp > arbsrc.lst && \
-rm -f arbsrc.lst.tmp && \
-tar -zcf $name --files-from=arbsrc.lst && \
-( rm -f arbsrc.tgz ; \
-  ln -s $name arbsrc.tgz ; \
-  ls -alG -rt arbsrc* ; \
-  true )
+NAME=`date '+arbsrc_%Y_%m_%d__%H_%M.tgz'`
 
+dump_revision() {
+    ./SOURCE_TOOLS/build_info.pl && \
+        grep ARB_SVN_REVISION ./TEMPLATES/svn_revision.h | \
+        perl -ne 'if (/ARB_SVN_REVISION\s+\"(.*)\"/) { $_=$1; s/:/_/; print $_; }'
+}
+
+
+REVISION=`dump_revision`
+REVISION_DIR=arbsrc_$REVISION
+echo REVISION_DIR=$REVISION_DIR
+
+
+rm_noerr() {
+    test -f $1 && rm -f $1 
+}
+cleanup() {
+    # rm_noerr arbsrc.lst
+    rm_noerr arbsrc.lst.tmp
+    test -L $REVISION_DIR && rm $REVISION_DIR
+    true
+}
+
+gen_list() {
+    util/arb_srclst.pl $* > arbsrc.lst.tmp || \
+        ( echo "Failed to build arbsrc.lst" ; echo "To save manually use 'make save2'"; false )
+}
+sort_list() {
+    sort < arbsrc.lst.tmp | perl -pne "s/^\./.\/$REVISION_DIR/g;" > arbsrc.lst
+}
+gen_tarball() {
+    ln -s . $REVISION_DIR && \
+    tar -zcf $NAME --files-from=arbsrc.lst && \
+        ( rm -f arbsrc.tgz ; \
+        ln -s $NAME arbsrc.tgz ; \
+        true )
+}
+
+save() {
+    gen_list $* && sort_list && gen_tarball
+}
+
+(save $* && cleanup && (ls -alG -rt arbsrc*;true)) || \
+(cleanup;echo "Failed to create source tarball";false)

trunk/util/arb_srclst.pl

@@ -172 +172 @@
                                 qr/^\.\/TEMPLATES\/arb_build\.h$/o,
                                 qr/^\.\/lib\/ARB\.pm$/o,
-                                qr/^\.\/lib\/nas\/names\.dat$/o,
+                                qr/^\.\/lib\/nas\/names.*\.dat$/o,
                                 qr/^\.\/lib\/arb_tcp\.dat$/o,
                                 qr/^\.\/arb.*\.tgz$/o,