From 0704abae0cb5747cfbc168c41d4f40176944dccd Mon Sep 17 00:00:00 2001 From: Dana Robinson <43805+derobins@users.noreply.github.com> Date: Sun, 19 Mar 2023 10:34:31 -0700 Subject: Remove bin/mkdirs and bin/newer (#2593) As in develop --- bin/mkdirs | 32 -------------------------------- bin/newer | 42 ------------------------------------------ config/conclude.am | 11 +++++++++-- config/examples.am | 4 ++-- 4 files changed, 11 insertions(+), 78 deletions(-) delete mode 100755 bin/mkdirs delete mode 100755 bin/newer diff --git a/bin/mkdirs b/bin/mkdirs deleted file mode 100755 index 4e66eb5..0000000 --- a/bin/mkdirs +++ /dev/null @@ -1,32 +0,0 @@ -#! /bin/sh -# -# Copyright by The HDF Group. -# All rights reserved. -# -# This file is part of HDF5. The full HDF5 copyright notice, including -# terms governing use, modification, and redistribution, is contained in -# the COPYING file, which can be found at the root of the source code -# distribution tree, or in https://www.hdfgroup.org/licenses. -# If you do not have access to either file, you may request a copy from -# help@hdfgroup.org. -# -# This is a small program which will create directories n-levels deep. -# You just call it with something like: -# -# mkdirs /tmp/foo/bar/baz -# -# and it will create all the directories from /tmp down to baz which -# don't exist. -# -chmodprog="${CHMODPROG-chmod}" -mkdirprog="${MKDIRPROG-mkdir}" - -make_dir () { - if test ! -d $1; then - make_dir `echo $1 | sed -e 's#/[^/]*$##'` - $mkdirprog $1 - $chmodprog 755 $1 - fi -} - -make_dir `echo $1 | sed -e 's#/$##'` diff --git a/bin/newer b/bin/newer deleted file mode 100755 index c36df03..0000000 --- a/bin/newer +++ /dev/null @@ -1,42 +0,0 @@ -#!/bin/sh -# -# Copyright by The HDF Group. -# All rights reserved. -# -# This file is part of HDF5. The full HDF5 copyright notice, including -# terms governing use, modification, and redistribution, is contained in -# the COPYING file, which can be found at the root of the source code -# distribution tree, or in https://www.hdfgroup.org/licenses. -# If you do not have access to either file, you may request a copy from -# help@hdfgroup.org. -# -# Compare the modification time of file argument 1 against other file arguments. -# Return true (0) if argument 1 is newer than all others, otherwise return -# false (1). If any of the argument is not a file, return false (1). -# -# Programmer: Albert Cheng -# Created Date: 2005/07/06 -# Modification: -# Albert Cheng 2005/8/30 -# Changed from two arguments to multiple arguments. - -if test $# -lt 2; then - exit 1 -fi -if test ! -f $1; then - exit 1 -fi -f1=$1 -shift - -for f in $*; do - if test ! -f $f; then - exit 1 - fi - if test X = X`find $f1 -newer $f -print`; then - exit 1 - fi -done - -# passed all tests. Must be a file newer than all others. -exit 0 diff --git a/config/conclude.am b/config/conclude.am index fde966e..3336670 100644 --- a/config/conclude.am +++ b/config/conclude.am @@ -121,7 +121,7 @@ $(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) dummy.chkexe_: tname=$(@:.chkexe_=)$(EXEEXT);\ log=$(@:.chkexe_=.chklog); \ echo "============================"; \ - if $(top_srcdir)/bin/newer $(@:.chkexe_=.chkexe) $${tname}; then \ + if [ $(@:.chkexe_=.chkexe) -nt $${tname} ]; then \ echo "No need to test $${tname} again."; \ else \ if test -n "$(REALTIMEOUTPUT)"; then \ @@ -203,7 +203,14 @@ $(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummysh.chkexe_: chkname=`basename $(@:.chkexe_=.chkexe)`;\ log=`basename $(@:.chkexe_=.chklog)`; \ echo "============================"; \ - if $(top_srcdir)/bin/newer $${chkname} $$cmd $(SCRIPT_DEPEND); then \ + newer=true; \ + for i in $${cmd} $(SCRIPT_DEPEND); do \ + if [ $${chkname} -ot $$i ]; then \ + newer=false; \ + break; \ + fi; \ + done; \ + if $${newer}; then \ echo "No need to test $${tname} again."; \ else \ echo "============================" > $${log}; \ diff --git a/config/examples.am b/config/examples.am index 06d8d4e..09a9a24 100644 --- a/config/examples.am +++ b/config/examples.am @@ -50,9 +50,9 @@ CLEANFILES=$(EXAMPLE_PROG) $(EXAMPLE_PROG_PARA) # How to create EXAMPLEDIR if it doesn't already exist $(EXAMPLEDIR): - -$(top_srcdir)/bin/mkdirs $@ + mkdir -p -m 755 $@ $(EXAMPLETOPDIR): - -$(top_srcdir)/bin/mkdirs $@ + mkdir -p -m 755 $@ # Install and uninstall rules. We install the source files, not the # example programs themselves. -- cgit v0.12