mirror/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2025-01-30 15:32:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

[svn-r19019] Enhancements:

Browse Source 
Cleaned up the code a bit by:
1. It used to that -xxx options must be at the beginning such that
   "buildhdf5 --disable-shared -config" was an error. Now -xxx options
   can appear anywhere in the command options.
2. Eliminate the need of variables $CONFIG_CXX, $CONFIG_FORTRAN,
   $CONFIG_PARALLEL by appending their values to $CONFIG_OP directly.
3. Also append $WITH_SZLIB to $CONFIG_OP when it is defined, not later.
4. Call CONFIG directly instead of setting up $CONFIGURE.
5. Removed the last TIMESTAMP since "trap 0" will call QUIT which calls
   TIMESTAMP already. This eliminated the extra timestamp when it finishes
   normal.

tested:
Tested by hand since h5committest does not really test this command.
This commit is contained in:
Albert Cheng 2010-06-18 17:47:22 -05:00
parent 9f208ec4e2
commit e6d56939f3
1 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
bin/buildhdf5
View File

@ -67,6 +67,7 @@ TIMESTAMP()
QUIT() QUIT()
{ {
# print the closing time
TIMESTAMP TIMESTAMP
} }
@ -234,7 +235,7 @@ trap QUIT 0
# #
MAKE=${MAKE:-'gmake'} MAKE=${MAKE:-'gmake'}
export MAKE export MAKE
CONFIGURE="CONFIG" CONFIG_CMD="CONFIG"
CONFIG_OP= # configure options CONFIG_OP= # configure options
CONFIG_ONLY=no # default is configure and build CONFIG_ONLY=no # default is configure and build
NOEXEC= # default to execute commands NOEXEC= # default to execute commands
@ -250,6 +251,7 @@ while [ $# -gt 0 ]; do
;; ;;
-szlib) -szlib)
LOCATE_SZLIB LOCATE_SZLIB
CONFIG_OP="$CONFIG_OP $WITH_SZLIB"
;; ;;
-help) -help)
USAGE USAGE
@ -263,16 +265,16 @@ while [ $# -gt 0 ]; do
SRCDIRLIST="$1" SRCDIRLIST="$1"
;; ;;
-cxx) -cxx)
CONFIG_CXX="--enable-cxx" CONFIG_OP="$CONFIG_OP --enable-cxx"
;; ;;
-fortran) -fortran)
CONFIG_FORTRAN="--enable-fortran" CONFIG_OP="$CONFIG_OP --enable-fortran"
;; ;;
-pp) -pp)
CONFIG_PARALLEL="--enable-parallel" CONFIG_OP="$CONFIG_OP --enable-parallel"
;; ;;
*) # Quit parsing *) # pass it as a configure option
break CONFIG_OP="$CONFIG_OP $1"
;; ;;
esac esac
shift shift
@ -296,14 +298,10 @@ if [ x-$SRCDIR = x-dummy ]; then
exit 1 exit 1
fi fi
# Setup Configure options
CONFIG_OP="$WITH_SZLIB $CONFIG_FORTRAN $CONFIG_CXX $CONFIG_PARALLEL"
# Configure # Configure
# no configure if already done. # no configure if already done.
if [ ! -f config.status ]; then if [ ! -f config.status ]; then
CONFIGURE="$CONFIGURE $CONFIG_OP $*" STEP "Configure HDF5..." "$CONFIG_CMD $CONFIG_OP" "#config"
STEP "Configure HDF5..." "$CONFIGURE" "#config"
else else
STEP "Configure Skipped" "echo Configure Skipped" "#config" STEP "Configure Skipped" "echo Configure Skipped" "#config"
fi fi
@ -324,4 +322,3 @@ STEP "Testing HDF5 parallel parts..." "$MAKE check-p" "#test-p"
# all done # all done
echo "No Errors encountered" echo "No Errors encountered"
TIMESTAMP