summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2013-06-24 21:58:17 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2013-06-24 21:58:17 (GMT)
commitb65c8842fdfdebbcb52ba71ed179cf6acc3a08da (patch)
tree025971fe81fe5aa26f832d4f482d46f97659550b
parent5ee14b07b99a3e3e0e5ac967989bad83cfff4454 (diff)
downloadhdf5-b65c8842fdfdebbcb52ba71ed179cf6acc3a08da.zip
hdf5-b65c8842fdfdebbcb52ba71ed179cf6acc3a08da.tar.gz
hdf5-b65c8842fdfdebbcb52ba71ed179cf6acc3a08da.tar.bz2
[svn-r23816] HDFFV-8455: moved h5dump before h5import
HDFFV-8465: corrected DTD reference path Merged from trunk Tested: local linux with cmake
-rw-r--r--tools/Makefile.am2
-rw-r--r--tools/Makefile.in2
-rw-r--r--tools/h5diff/h5diff_main.c1
-rw-r--r--tools/h5dump/h5dump.c4
4 files changed, 4 insertions, 5 deletions
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 4479c20..76b32d2 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -24,6 +24,6 @@ include $(top_srcdir)/config/commence.am
CONFIG=ordered
# All subdirectories
-SUBDIRS=lib h5diff h5ls misc h5import h5repack h5jam h5copy h5stat h5dump
+SUBDIRS=lib h5diff h5ls h5dump misc h5import h5repack h5jam h5copy h5stat
include $(top_srcdir)/config/conclude.am
diff --git a/tools/Makefile.in b/tools/Makefile.in
index 46c7d53..4af6d74 100644
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@ -425,7 +425,7 @@ CHECK_CLEANFILES = *.chkexe *.chklog *.clog
CONFIG = ordered
# All subdirectories
-SUBDIRS = lib h5diff h5ls misc h5import h5repack h5jam h5copy h5stat h5dump
+SUBDIRS = lib h5diff h5ls h5dump misc h5import h5repack h5jam h5copy h5stat
# Automake needs to be taught how to build lib, progs, and tests targets.
# These will be filled in automatically for the most part (e.g.,
diff --git a/tools/h5diff/h5diff_main.c b/tools/h5diff/h5diff_main.c
index 607d58e..a916ec5 100644
--- a/tools/h5diff/h5diff_main.c
+++ b/tools/h5diff/h5diff_main.c
@@ -101,7 +101,6 @@ int main(int argc, const char *argv[])
print_info(&options);
-out:
/*-------------------------------------------------------------------------
* exit code
* 1 if differences, 0 if no differences, 2 if error
diff --git a/tools/h5dump/h5dump.c b/tools/h5dump/h5dump.c
index d89202c..ef979b2 100644
--- a/tools/h5dump/h5dump.c
+++ b/tools/h5dump/h5dump.c
@@ -30,7 +30,7 @@ static const char *xml_dtd_uri = NULL;
/* module-scoped variables for XML option */
#define DEFAULT_XSD "http://www.hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd"
-#define DEFAULT_DTD "http://www.hdfgroup.org/HDF5/XML/schema/HDF5-File.dtd"
+#define DEFAULT_DTD "http://www.hdfgroup.org/HDF5/XML/DTD/HDF5-File.dtd"
/* Standard DDL output */
static const dump_functions ddl_function_table = {
@@ -1649,7 +1649,7 @@ main(int argc, const char *argv[])
indx = HDstrrchr(ns,(int)':');
if (indx) *indx = '\0';
- PRINTSTREAM(rawoutstream, "<%sHDF5-File xmlns:%s=\"http://hdfgroup.org/HDF5/XML/schema/HDF5-File\" "
+ PRINTSTREAM(rawoutstream, "<%sHDF5-File xmlns:%s=\"http://hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd\" "
"xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" "
"xsi:schemaLocation=\"http://hdfgroup.org/HDF5/XML/schema/HDF5-File "
"http://www.hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd\">\n",xmlnsprefix,ns);