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

Stephane Popinet popinet at users.sf.net
Tue Nov 24 12:24:05 UTC 2009


The following commit has been merged in the upstream branch:
commit c86c187500a94024cf9fbb90abe619a375b1a437
Author: Stephane Popinet <popinet at users.sf.net>
Date:   Wed May 13 08:44:30 2009 +1000

    Bug fix for incorrect generation of dependencies in tests docs
    
    darcs-hash:20090512224430-d4795-4b04d972a5aae63e4af51c23af061dedc22ecc1f.gz

diff --git a/tools/daily b/tools/daily
index 786307c..2cf97d5 100755
--- a/tools/daily
+++ b/tools/daily
@@ -170,7 +170,7 @@ if ( $build_gerris || $build_gfsview ) ; then
    else
        check=1
    fi
-   if ( cd $wdir/$gerris/test && make -k tests && \
+   if ( cd $wdir/$gerris/test && make -k tests.tar.gz && \
         cd $wdir/$gerris/doc/tutorial && make -k tutorial.pdf tutorial.tar.gz && \
         cd $wdir/$gerris/doc/examples && make -k examples.tar.gz && \
         cd $wdir/$gerris/doc && make -k templates sgml html ) > $wdir/tests 2>&1 ; then :
@@ -284,11 +284,11 @@ if ( $build_gerris || $build_gfsview ) ; then
        fi
    fi
    if test -z "$tests"; then
-       if ( cd $wdir/$gerris/test && make tests.tar.gz && \
+       if ( cd $wdir/$gerris/test && \
            rm -r -f $localgerrisweb/tests/* && \
            cp tests.tar.gz $localgerrisweb/tests/ && \
 	   cd $localgerrisweb/tests/ && \
-	   tar xzf tests.tar.gz && \
+	   tar xzf tests.tar.gz && rm -f tests.tar.gz && \
 	   cd $wdir/$gerris/doc/examples && \
            rm -r -f $HOME/local/src/gerris-www/publish/examples/* && \
            cp examples.tar.gz $HOME/local/src/gerris-www/publish/examples/ && \

-- 
Gerris Flow Solver



More information about the debian-science-commits mailing list