diff options
author | Quincey Koziol <koziol@hdfgroup.org> | 2010-03-25 03:51:41 (GMT) |
---|---|---|
committer | Quincey Koziol <koziol@hdfgroup.org> | 2010-03-25 03:51:41 (GMT) |
commit | 42efc1c2b591e4cd45ec6cb3bdf32044343118d2 (patch) | |
tree | 0ab542871c32246199479e8933ff26286aaf629a /bin | |
parent | 3360c3af0c100ac4d3a2fe2865f34661da862ec5 (diff) | |
download | hdf5-42efc1c2b591e4cd45ec6cb3bdf32044343118d2.zip hdf5-42efc1c2b591e4cd45ec6cb3bdf32044343118d2.tar.gz hdf5-42efc1c2b591e4cd45ec6cb3bdf32044343118d2.tar.bz2 |
[svn-r18451] Description:
Bring r18172:18446 from trunk to revise_chunks branch.
Tested on:
FreeBSD/32 6.3 (duty) in debug mode
FreeBSD/64 6.3 (liberty) w/C++ & FORTRAN, in debug mode
Linux/32 2.6 (jam) w/PGI compilers, w/default API=1.8.x,
w/C++ & FORTRAN, w/threadsafe, in debug mode
Linux/64-amd64 2.6 (amani) w/Intel compilers, w/default API=1.6.x,
w/C++ & FORTRAN, in production mode
Solaris/32 2.10 (linew) w/deprecated symbols disabled, w/C++ & FORTRAN,
w/szip filter, in production mode
Linux/64-ia64 2.6 (cobalt) w/Intel compilers, w/C++ & FORTRAN,
in production mode
Linux/64-ia64 2.4 (tg-login3) w/parallel, w/FORTRAN, in debug mode
Linux/64-amd64 2.6 (abe) w/parallel, w/FORTRAN, in production mode
Diffstat (limited to 'bin')
-rw-r--r-- | bin/README | 2 | ||||
-rwxr-xr-x | bin/buildhdf5 | 2 | ||||
-rwxr-xr-x | bin/snapshot | 16 |
3 files changed, 15 insertions, 5 deletions
diff --git a/bin/README b/bin/README new file mode 100644 index 0000000..1c77043 --- /dev/null +++ b/bin/README @@ -0,0 +1,2 @@ +The daily tests run copies of some of the scripts in this directory from another repository, notably snapshot and runtest. The copies in this directory should work, but are not used in daily tests, though they should be tested occasionally. + diff --git a/bin/buildhdf5 b/bin/buildhdf5 index f0dd938..ac73df0 100755 --- a/bin/buildhdf5 +++ b/bin/buildhdf5 @@ -305,7 +305,7 @@ if [ ! -f config.status ]; then CONFIGURE="$CONFIGURE $CONFIG_OP $*" STEP "Configure HDF5..." "$CONFIGURE" "#config" else - STEP "Confiugre Skipped" "echo Confiugre Skipped" "#config" + STEP "Configure Skipped" "echo Configure Skipped" "#config" fi if [ x-$CONFIG_ONLY = x-yes ]; then diff --git a/bin/snapshot b/bin/snapshot index 4235670..bb02595 100755 --- a/bin/snapshot +++ b/bin/snapshot @@ -199,6 +199,9 @@ while [ $# -gt 0 ] ; do check-vfd) CHECKVAL=check-vfd ;; + yodconfigure) + YODCONFIGURE=yes + ;; --*) OP_CONFIGURE="$OP_CONFIGURE $1" ;; @@ -284,7 +287,14 @@ fi # Setup the proper configure option (--with-zlib) to use zlib library # provide ZLIB is non-empty. ZLIB=${ZLIB:+"--with-zlib="$ZLIB} -CONFIGURE="./configure $ZLIB $OP_CONFIGURE" +if [ -n "$YODCONFIGURE" ]; then + cp configure configure.yod + bin/yodconfigure configure.yod + CONFIGURE="./configure.yod" +else + CONFIGURE="./configure" +fi +CONFIGURE="$CONFIGURE $ZLIB $OP_CONFIGURE" # Execute the requests snapshot=yes @@ -460,9 +470,7 @@ if [ "$cmd" = "all" -o -n "$cmdrel" ]; then echo "Making snapshot release ($RELEASE_VERSION) to ${ReleaseDir}..." bin/release -d $ReleaseDir $METHODS perl bin/h5vers -i - echo "Committing snapshot from current/bin/snapshot." - ls - svn -q commit -m "Snapshot $RELEASE_VERSION" . + svn -q commit -m "Snapshot $RELEASE_VERSION" ) errcode=$? fi |