[SCM] Gerris Flow Solver branch, upstream, updated. b3aa46814a06c9cb2912790b23916ffb44f1f203

[Stephane Popinet]

The following commit has been merged in the upstream branch:
commit 90b4485873c2fa363bb31e287d5910a6ad10e6ae
Author: Stephane Popinet <popinet at users.sf.net>
Date:   Fri Jun 20 19:17:25 2008 +1000

    darcs2dist makes tarballs with consistent version numbers
    
    darcs-hash:20080620091725-d4795-61c43316af44cd66a7ba2dc3a2ad95f77c30f59d.gz

diff --git a/src/darcsversion.sh b/src/darcsversion.sh
index 28a60a9..2d865e1 100755
--- a/src/darcsversion.sh
+++ b/src/darcsversion.sh
@@ -1,5 +1,6 @@
 #!/bin/sh
 
+# do not forget to update ../tools/darcs2dist when changing the way $version is computed
 version=`darcs changes --last=1 --xml-output | \
     awk 'BEGIN{RS=" ";FS="="}{if ($1 == "date") print substr($2,4,6) "-" substr($2,10,6);}'`
 changes=`darcs whatsnew -s | awk '{
diff --git a/tools/darcs2dist b/tools/darcs2dist
index 8852c78..6809bee 100755
--- a/tools/darcs2dist
+++ b/tools/darcs2dist
@@ -1,5 +1,12 @@
 #!/bin/sh
 
+# see ../src/darcsversion.sh
+darcsversion()
+{
+    darcs changes --last=1 --xml-output | \
+	awk 'BEGIN{RS=" ";FS="="}{if ($1 == "date") print substr($2,4,6);}'
+}
+
 usage()
 {
 	cat <<EOF
@@ -23,6 +30,9 @@ wrkdir=`mktemp -d /tmp/darcs2dist.XXXXXX`
 cd $wrkdir
 if ( darcs get $repo $package && \
      cd $package && \
+     version=`darcsversion` && \
+     login=`echo $url | awk 'BEGIN{FS=":"}{print $1}'` && \
+     dir=`echo $url | awk 'BEGIN{FS=":"}{print $2}'` && \
      sh autogen.sh && \
      make && \
      make dist && \
@@ -30,9 +40,11 @@ if ( darcs get $repo $package && \
      cd  $package-[0-9].[0-9].[0-9] && \
      ./configure && make && cd .. && \
      rm -r -f $package-[0-9].[0-9].[0-9] && tar xzf $package-*.tar.gz && \
-     mv $package-[0-9].[0-9].[0-9] $package-snapshot-`date +%y%m%d` && \
-     tar chof - $package-snapshot-`date +%y%m%d` | gzip --best -c > $package-snapshot.tar.gz && \
-     scp -q $package-snapshot.tar.gz $url/$package-snapshot.tar.gz ) > msg 2>&1; then
+     mv $package-[0-9].[0-9].[0-9] $package-snapshot-$version && \
+     tar chof - $package-snapshot-$version | gzip --best -c > $package-snapshot-$version.tar.gz && \
+     ssh $login "cd $dir && rm -f $package-snapshot-*.tar.gz" && \
+     scp -q $package-snapshot-$version.tar.gz $url/$package-snapshot-$version.tar.gz && \
+     ssh $login "cd $dir && ln -s -f $package-snapshot-$version.tar.gz $package-snapshot.tar.gz") > msg 2>&1; then
     rm -f msg
     status=0
 else

-- 
Gerris Flow Solver