Merge branch 'HDFGroup:develop' into develop

hyoklee · Apr 10, 2024 · 04382dc · 04382dc
2 parents 6c3c149 + e6ad84d
commit 04382dc
Show file tree

Hide file tree

Showing 11 changed files with 335 additions and 3,357 deletions.
diff --git a/.github/workflows/cmake-ctest.yml b/.github/workflows/cmake-ctest.yml
@@ -41,7 +41,7 @@ jobs:
       - name: Install Dependencies
         uses: ssciwr/doxygen-install@v1
         with:
-          version: "1.10.0"
+          version: "1.9.7"
 
       - name: Enable Developer Command Prompt
         uses: ilammy/msvc-dev-cmd@v1.13.0

diff --git a/bin/h5cc.in b/bin/h5cc.in
@@ -62,7 +62,7 @@ host_os="@host_os@"
 
 prog_name="`basename $0`"
 
-misc_args=""
+qargs=""
 compile_args=""
 libraries=""
 link_args=""
@@ -71,8 +71,7 @@ clibpath=""
 
 do_link="yes"
 do_compile="no"
-dash_o="no"
-dash_c="no"
+dash_c=""
 get_output_file="no"
 
 SHOW="eval"
@@ -209,12 +208,10 @@ for arg in $@ ; do
       fi
 
       do_link="no"
-      dash_c="yes"
+      dash_c="-c"
       ;;
     -o)
-      dash_o="yes"
-
-      if test "x$dash_c" = "xyes"; then
+      if test "x$dash_c" = "x-c"; then
         compile_args="$compile_args $arg"
       else
         link_args="$link_args $arg"
@@ -224,7 +221,7 @@ for arg in $@ ; do
       ;;
     -E|-M|-MT)
       compile_args="$compile_args $arg"
-      dash_c="yes"
+      dash_c="-c"
       do_link="no"
       ;;
     -l*)
@@ -260,15 +257,13 @@ for arg in $@ ; do
       ;;
     *\"*)
       qarg="'"$arg"'"
-      misc_args="$misc_args $qarg"
+      qargs="$qargs $qarg"
       ;;
     *\'*)
       qarg='"'"$arg"'"'
-      misc_args="$misc_args $qarg"
+      qargs="$qargs $qarg"
       ;;
     *)
-      misc_args="$misc_args $qarg"
-
       if test -s "$arg"; then
         ext=`expr "$arg" : '.*\(\..*\)'`
 
@@ -278,7 +273,7 @@ for arg in $@ ; do
           fname=`basename $arg .c`
           link_objs="$link_objs $fname.o"
         elif test "x$ext" = "x.o"; then
-          if test "x$dash_c" = "xyes"; then
+          if test "x$dash_c" = "x-c"; then
             compile_args="$compile_args $arg"
           else
             do_link="yes"
@@ -298,18 +293,17 @@ for arg in $@ ; do
       ;;
   esac
 done
-
-if test "$dash_c" = "yes" -a "$do_compile" = no -a "$do_link" = no ; then
+link_args="$link_args $qargs"
+if test "$dash_c" = "-c" -a "$do_compile" = no -a "$do_link" = no ; then
     # -c was specified.  Force do_compile on.
     do_compile=yes
 fi
 
 if test "x$do_compile" = "xyes"; then
-  if test "x$dash_c" != "xyes"; then
-    compile_args="-c $compile_args"
+  if test "x$dash_c" = "x"; then
+    dash_c="-c"
   fi
-
-  $SHOW $CC -I$includedir $H5BLD_CPPFLAGS $CPPFLAGS $H5BLD_CFLAGS $CFLAGS $misc_args $compile_args
+  $SHOW $CC -I$includedir $H5BLD_CPPFLAGS $CPPFLAGS $H5BLD_CFLAGS $CFLAGS $dash_c $qargs $compile_args
   status=$?
 
   if test "$status" != "0"; then

diff --git a/bin/h5vers b/bin/h5vers
@@ -192,10 +192,6 @@ die "unable to read file: $NEWS\n" unless -r $file;
 my $CONFIGURE = $file;
 $CONFIGURE =~ s/[^\/]*$/..\/configure.ac/;
 die "unable to read file: $CONFIGURE\n" unless -r $file;
-# cpp_doc_config
-my $CPP_DOC_CONFIG = $file;
-$CPP_DOC_CONFIG =~ s/[^\/]*$/..\/c++\/src\/cpp_doc_config/;
-die "unable to read file: $CPP_DOC_CONFIG\n"  unless -r $file;
 my $H5_JAVA = $file;
 $H5_JAVA =~ s/[^\/]*$/..\/java\/src\/hdf\/hdf5lib\/H5.java/;
 die "unable to read file: $H5_JAVA\n" unless -r $file;
@@ -253,7 +249,6 @@ if ($set) {
   $RELEASE = "";
   $NEWS = "";
   $CONFIGURE = "";
-  $CPP_DOC_CONFIG = "";
   $LT_VERS = "";       
   $HDF5CONFIGCMAKE = "";
   @newver = @curver;
@@ -348,22 +343,6 @@ if ($NEWS) {
   close FILE;
 }
 
-# Update the c++/src/cpp_doc_config file
-if ($CPP_DOC_CONFIG) {
-  my $data = read_file($CPP_DOC_CONFIG);
-  my $sub_rel_ver_str = (
-     $newver[3] eq "" 
-     ? sprintf("%s", "") 
-     : sprintf("%s", "-".$newver[3].", currently under development")
-     );
-  my $version_string = sprintf("\"%d.%d.%d%s%s\"",
-                               @newver[0,1,2],
-                               $sub_rel_ver_str);
-  $data =~ s/PROJECT_NUMBER\s*=.*/PROJECT_NUMBER         = $version_string/;
-
-  write_file($CPP_DOC_CONFIG, $data);  
-}
-
 # Update the config/cmake/scripts/HDF5config.cmake file
 if ($HDF5CONFIGCMAKE) {
   my $data = read_file($HDF5CONFIGCMAKE);
@@ -427,7 +406,7 @@ if ($REPACK_LAYOUT_PLUGIN_VERSION) {
   write_file($REPACK_LAYOUT_PLUGIN_VERSION, $data);
 }
 
-# helper function to read the file for updating c++/src/cpp_doc_config,
+# helper function to read the file for updating
 # config/cmake/scripts/HDF5Config.cmake, and java files.
 # The version string in that file is not at the top, so the string replacement
 # is not for the first line, and reading/writing the entire file as one string
@@ -444,7 +423,7 @@ sub read_file {
     return $all;
 }
 
-# helper function to write the file for updating c++/src/cpp_doc_config, 
+# helper function to write the file for updating
 # config/cmake/scripts/HDF5config.cmake and java files.
 sub write_file {
     my ($filename, $content) = @_;

diff --git a/bin/release b/bin/release
@@ -327,7 +327,6 @@ today=`date +%Y%m%d`
 pmode='no'
 revmode='no'
 tmpdir="../#release_tmp.$$"     # tmp work directory
-CPPLUS_RM_NAME=cpplus_RM
 MAINT_MODE_ENABLED=""
 
 # If maintainer mode is enabled in configure, it should be disabled for release,
@@ -502,23 +501,6 @@ for comp in $methods; do
             tar2cmakezip $HDF5_VERS $tmpdir/$HDF5_VERS.tar $DEST/CMake-$HDF5_VERS.zip 1>&2
             (cd $DEST; sha256sum CMake-$HDF5_VERS.zip > CMake-$HDF5_VERS.zip.sha256)
             ;;
-        doc)
-            if [ "${DOCVERSION}" = "" ]; then
-                DOCVERSION=master
-            fi
-            test "$verbose" && echo "   Creating docs..." 1>&2
-            # Check out docs from git repo
-            (cd $tmpdir; git clone -q $DOC_URL ${DOCVERSION} > /dev/null) || exit 1
-            # Create doxygen C++ RM
-            (cd c++/src && doxygen cpp_doc_config > /dev/null ) || exit 1
-            # Replace version of C++ RM with just-created version
-            rm -rf $tmpdir/${DOCVERSION}/html/$CPPLUS_RM_NAME || exit 1
-            mv c++/src/$CPPLUS_RM_NAME $tmpdir/${DOCVERSION}/html/$CPPLUS_RM_NAME || exit 1
-            # Compress the docs and move them to the release area
-            mv $tmpdir/${DOCVERSION} $tmpdir/${HDF5_VERS}_docs || exit 1
-            (cd $tmpdir && tar cf ${HDF5_VERS}_docs.tar ${HDF5_VERS}_docs) || exit 1
-            mv $tmpdir/${HDF5_VERS}_docs.tar $DEST || exit 1
-            ;;
         *)
             echo "***Error*** Unknown method $comp"
             exit 1