Mercurial > mxe-octave

annotate src/msvc-hdf5-1.patch @ 5893:53a6c7df43f8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Mesa 3D: Update to version 21.1.8. * src/mesa.mk: Update version and checksum. * src/mesa-2-uninitialized.patch: Remove file. * dist-files.mk: Remove file from list.
author Markus Mützel <markus.muetzel@gmx.de>
date Thu, 16 Sep 2021 22:37:45 +0200
parents f2bbfa69647e
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
3095
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
1 diff -ur hdf5-1.8.10-orig/c++/src/Makefile.am hdf5-1.8.10/c++/src/Makefile.am
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
2 --- hdf5-1.8.10-orig/c++/src/Makefile.am 2012-10-11 13:31:51 -0400
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
3 +++ hdf5-1.8.10/c++/src/Makefile.am 2013-06-25 14:30:43 -0400
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
4 @@ -30,6 +30,8 @@
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
5 # Add libtool numbers to the HDF5 C++ library (from config/lt_vers.am)
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
6 libhdf5_cpp_la_LDFLAGS= -version-info $(LT_VERS_INTERFACE):$(LT_VERS_REVISION):$(LT_VERS_AGE) $(AM_LDFLAGS)
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
7
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
8 +AM_CPPFLAGS += -DHDF5_CPPDLL_EXPORTS -D_HDF5USEDLL_
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
9 +
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
10 # Shared C++ libraries aren't universally supported.
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
11 if CXX_SHARED_CONDITIONAL
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
12 else
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
13 diff -ur hdf5-1.8.10-orig/c++/test/Makefile.am hdf5-1.8.10/c++/test/Makefile.am
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
14 --- hdf5-1.8.10-orig/c++/test/Makefile.am 2012-10-11 13:31:49 -0400
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
15 +++ hdf5-1.8.10/c++/test/Makefile.am 2013-06-25 14:30:43 -0400
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
16 @@ -23,6 +23,8 @@
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
17 # Include src, test, and c++/src directories
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
18 INCLUDES=-I$(top_srcdir)/src -I$(top_srcdir)/test -I$(top_srcdir)/c++/src
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
19
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
20 +AM_CPPFLAGS += -D_HDF5USEDLL_ -DHDF5CPP_USEDLL
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
21 +
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
22 # Shared C++ libraries aren't universally supported.
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
23 if CXX_SHARED_CONDITIONAL
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
24 else
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
25 diff -ur hdf5-1.8.10-orig/config/conclude.am hdf5-1.8.10/config/conclude.am
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
26 --- hdf5-1.8.10-orig/config/conclude.am 2012-10-11 13:31:46 -0400
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
27 +++ hdf5-1.8.10/config/conclude.am 2013-06-25 14:31:37 -0400
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
28 @@ -23,7 +23,7 @@
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
29 # lib_LIBRARIES are built for lib target), but EXTRA_LIB, EXTRA_PROG, and
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
30 # EXTRA_TEST variables are supplied to allow the user to force targets to
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
31 # be built at certain times.
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
32 -LIB = $(lib_LIBRARIES) $(lib_LTLIBRARIES) $(noinst_LIBRARIES) \
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
33 +_LIB = $(lib_LIBRARIES) $(lib_LTLIBRARIES) $(noinst_LIBRARIES) \
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
34 $(noinst_LTLIBRARIES) $(check_LIBRARIES) $(check_LTLIBRARIES) $(EXTRA_LIB)
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
35 PROGS = $(bin_PROGRAMS) $(bin_SCRIPTS) $(noinst_PROGRAMS) $(noinst_SCRIPTS) \
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
36 $(EXTRA_PROG)
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
37 @@ -36,9 +36,9 @@
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
38
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
39 # lib/progs/tests targets recurse into subdirectories. build-* targets
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
40 # build files in this directory.
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
41 -build-lib: $(LIB)
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
42 -build-progs: $(LIB) $(PROGS)
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
43 -build-tests: $(LIB) $(PROGS) $(chk_TESTS)
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
44 +build-lib: $(_LIB)
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
45 +build-progs: $(_LIB) $(PROGS)
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
46 +build-tests: $(_LIB) $(PROGS) $(chk_TESTS)
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
47
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
48 # General rule for recursive building targets.
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
49 # BUILT_SOURCES contain targets that need to be built before anything else
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
50 @@ -98,7 +98,7 @@
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
51 @$(MAKE) build-check-p
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
52
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
53 # Actual execution of check-s.
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
54 -build-check-s: $(LIB) $(PROGS) $(chk_TESTS)
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
55 +build-check-s: $(_LIB) $(PROGS) $(chk_TESTS)
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
56 @if test -n "$(TEST_PROG)$(TEST_SCRIPT)"; then \
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
57 echo "===Serial tests in `echo ${PWD} | sed -e s:.*/::` begin `date`==="; \
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
58 fi
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
59 @@ -193,7 +193,7 @@
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
60 fi
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
61
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
62 # Actual execution of check-p.
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
63 -build-check-p: $(LIB) $(PROGS) $(chk_TESTS)
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
64 +build-check-p: $(_LIB) $(PROGS) $(chk_TESTS)
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
65 @if test -n "$(TEST_PROG_PARA)$(TEST_SCRIPT_PARA)"; then \
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
66 echo "===Parallel tests in `echo ${PWD} | sed -e s:.*/::` begin `date`==="; \
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
67 fi
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
68 @@ -223,7 +223,7 @@
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
69 fi
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
70
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
71 # Run test with different Virtual File Driver
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
72 -check-vfd: $(LIB) $(PROGS) $(chk_TESTS)
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
73 +check-vfd: $(_LIB) $(PROGS) $(chk_TESTS)
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
74 @for vfd in $(VFD_LIST) dummy; do \
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
75 if test $$vfd != dummy; then \
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
76 echo "============================"; \
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
77 diff -ur hdf5-1.8.10-orig/hl/c++/src/Makefile.am hdf5-1.8.10/hl/c++/src/Makefile.am
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
78 --- hdf5-1.8.10-orig/hl/c++/src/Makefile.am 2012-10-11 13:31:44 -0400
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
79 +++ hdf5-1.8.10/hl/c++/src/Makefile.am 2013-06-25 14:30:43 -0400
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
80 @@ -30,6 +30,8 @@
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
81 # Add libtool numbers to the HDF5 HL C++ library (from config/lt_vers.am)
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
82 libhdf5_hl_cpp_la_LDFLAGS= -version-info $(LT_VERS_INTERFACE):$(LT_VERS_REVISION):$(LT_VERS_AGE) $(AM_LDFLAGS)
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
83
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
84 +AM_CPPFLAGS += -D_HDF5USEDLL_ -DHDF5_HL_CPPDLL_EXPORTS
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
85 +
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
86 # Shared C++ libraries aren't universally supported.
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
87 if CXX_SHARED_CONDITIONAL
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
88 else
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
89 diff -ur hdf5-1.8.10-orig/hl/c++/test/Makefile.am hdf5-1.8.10/hl/c++/test/Makefile.am
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
90 --- hdf5-1.8.10-orig/hl/c++/test/Makefile.am 2012-10-11 13:31:44 -0400
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
91 +++ hdf5-1.8.10/hl/c++/test/Makefile.am 2013-06-25 14:30:43 -0400
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
92 @@ -23,6 +23,8 @@
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
93 # Include directories
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
94 INCLUDES=-I$(top_srcdir)/src -I$(top_srcdir)/c++/src -I$(top_srcdir)/hl/src -I$(top_srcdir)/hl/c++/src -I$(top_srcdir)/test -I$(top_builddir)/hl/test -I$(top_srcdir)/hl/test
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
95
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
96 +AM_CPPFLAGS += -D_HDF5USEDLL_ -DHDF5USE_HLCPPDLL
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
97 +
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
98 # Shared C++ libraries aren't universally supported.
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
99 if CXX_SHARED_CONDITIONAL
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
100 else
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
101 diff -ur hdf5-1.8.10-orig/hl/src/Makefile.am hdf5-1.8.10/hl/src/Makefile.am
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
102 --- hdf5-1.8.10-orig/hl/src/Makefile.am 2012-10-11 13:31:43 -0400
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
103 +++ hdf5-1.8.10/hl/src/Makefile.am 2013-06-25 14:30:43 -0400
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
104 @@ -22,7 +22,7 @@
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
105 include $(top_srcdir)/config/lt_vers.am
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
106
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
107 # Add include directories to the C preprocessor flags
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
108 -AM_CPPFLAGS+=-I$(top_srcdir)/src
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
109 +AM_CPPFLAGS+=-I$(top_srcdir)/src -D_HDF5USEDLL_ -D_HDF5_HLDLL_EXPORTS_
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
110
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
111 # This library is our main target.
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
112 lib_LTLIBRARIES=libhdf5_hl.la
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
113 diff -ur hdf5-1.8.10-orig/hl/test/Makefile.am hdf5-1.8.10/hl/test/Makefile.am
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
114 --- hdf5-1.8.10-orig/hl/test/Makefile.am 2012-10-11 13:31:43 -0400
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
115 +++ hdf5-1.8.10/hl/test/Makefile.am 2013-06-25 14:30:43 -0400
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
116 @@ -22,7 +22,7 @@
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
117 include $(top_srcdir)/config/commence.am
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
118
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
119 # Add include directories to C preprocessor flags
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
120 -AM_CPPFLAGS+=-I. -I$(srcdir) -I$(top_builddir)/src -I$(top_srcdir)/src -I$(top_builddir)/test -I$(top_srcdir)/test -I$(top_srcdir)/hl/src
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
121 +AM_CPPFLAGS+=-I. -I$(srcdir) -I$(top_builddir)/src -I$(top_srcdir)/src -I$(top_builddir)/test -I$(top_srcdir)/test -I$(top_srcdir)/hl/src -D_HDF5USEDLL_ -D_HDF5USEHLDLL_
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
122
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
123 # The tests depend on the hdf5, hdf5 test, and hdf5_hl libraries
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
124 LDADD=$(LIBH5_HL) $(LIBH5TEST) $(LIBHDF5)
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
125 diff -ur hdf5-1.8.10-orig/perform/Makefile.am hdf5-1.8.10/perform/Makefile.am
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
126 --- hdf5-1.8.10-orig/perform/Makefile.am 2012-10-11 13:31:52 -0400
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
127 +++ hdf5-1.8.10/perform/Makefile.am 2013-06-25 14:30:43 -0400
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
128 @@ -23,6 +23,8 @@
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
129
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
130 INCLUDES=-I$(top_srcdir)/src -I$(top_srcdir)/test -I$(top_srcdir)/tools/lib
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
131
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
132 +AM_CPPFLAGS += -D_HDF5USEDLL_
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
133 +
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
134 # bin_PROGRAMS will be installed.
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
135 if BUILD_PARALLEL_CONDITIONAL
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
136 bin_PROGRAMS=h5perf_serial h5perf
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
137 diff -ur hdf5-1.8.10-orig/src/H5public.h hdf5-1.8.10/src/H5public.h
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
138 --- hdf5-1.8.10-orig/src/H5public.h 2012-10-26 20:12:05 -0400
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
139 +++ hdf5-1.8.10/src/H5public.h 2013-06-25 14:30:43 -0400
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
140 @@ -126,7 +126,7 @@
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
141 typedef int htri_t;
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
142
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
143 /* Define the ssize_t type if it not is defined */
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
144 -#if H5_SIZEOF_SSIZE_T==0
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
145 +#if H5_SIZEOF_SSIZE_T==0 && ! defined (ssize_t)
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
146 /* Undefine this size, we will re-define it in one of the sections below */
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
147 #undef H5_SIZEOF_SSIZE_T
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
148 #if H5_SIZEOF_SIZE_T==H5_SIZEOF_INT
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
149 diff -ur hdf5-1.8.10-orig/src/Makefile.am hdf5-1.8.10/src/Makefile.am
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
150 --- hdf5-1.8.10-orig/src/Makefile.am 2012-10-11 13:30:56 -0400
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
151 +++ hdf5-1.8.10/src/Makefile.am 2013-06-25 14:30:43 -0400
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
152 @@ -41,7 +41,8 @@
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
153 DISTCLEANFILES=H5pubconf.h
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
154
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
155 # library sources
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
156 -libhdf5_la_SOURCES= H5.c H5checksum.c H5dbg.c H5system.c H5timer.c H5trace.c \
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
157 +AM_CPPFLAGS += -D_HDF5DLL_
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
158 +libhdf5_la_SOURCES= H5FDwindows.c H5.c H5checksum.c H5dbg.c H5system.c H5timer.c H5trace.c \
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
159 H5A.c H5Abtree2.c H5Adense.c H5Adeprec.c H5Aint.c H5Atest.c \
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
160 H5AC.c H5B.c H5Bcache.c H5Bdbg.c \
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
161 H5B2.c H5B2cache.c H5B2dbg.c H5B2hdr.c H5B2int.c H5B2stat.c H5B2test.c \
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
162 @@ -113,7 +114,7 @@
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
163 H5FDmulti.h H5FDsec2.h H5FDstdio.h \
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
164 H5Gpublic.h H5Ipublic.h H5Lpublic.h \
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
165 H5MMpublic.h H5Opublic.h H5Ppublic.h H5Rpublic.h H5Spublic.h \
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
166 - H5Tpublic.h H5Zpublic.h
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
167 + H5Tpublic.h H5Zpublic.h H5FDwindows.h
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
168
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
169 # install libhdf5.settings in lib directory
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
170 settingsdir=$(libdir)
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
171 diff -ur hdf5-1.8.10-orig/test/Makefile.am hdf5-1.8.10/test/Makefile.am
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
172 --- hdf5-1.8.10-orig/test/Makefile.am 2012-10-11 13:30:44 -0400
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
173 +++ hdf5-1.8.10/test/Makefile.am 2013-06-25 14:30:43 -0400
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
174 @@ -23,6 +23,8 @@
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
175
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
176 INCLUDES=-I$(top_srcdir)/src -I$(top_builddir)/src
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
177
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
178 +AM_CPPFLAGS += -D_HDF5USEDLL_
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
179 +
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
180 # Test script for error_test and err_compat
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
181 TEST_SCRIPT = testerror.sh testlibinfo.sh testcheck_version.sh testlinks_env.sh
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
182 check_SCRIPTS = $(TEST_SCRIPT)
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
183 diff -ur hdf5-1.8.10-orig/test/testcheck_version.sh.in hdf5-1.8.10/test/testcheck_version.sh.in
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
184 --- hdf5-1.8.10-orig/test/testcheck_version.sh.in 2012-10-11 13:30:44 -0400
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
185 +++ hdf5-1.8.10/test/testcheck_version.sh.in 2013-06-25 14:30:43 -0400
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
186 @@ -178,6 +178,7 @@
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
187 ret_code=$?
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
188 cat $actual_err >> $actual
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
189
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
190 + dos2unix $actual > /dev/null 2>&1
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
191 if [ $h5haveexitcode = 'yes' -a \( $expect_code -ne $ret_code \) ]; then
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
192 echo "*FAILED*"
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
193 echo " Expected exit code ($expect_code) differs from actual code ($ret_code)"
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
194 diff -ur hdf5-1.8.10-orig/test/testerror.sh.in hdf5-1.8.10/test/testerror.sh.in
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
195 --- hdf5-1.8.10-orig/test/testerror.sh.in 2012-10-11 13:30:43 -0400
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
196 +++ hdf5-1.8.10/test/testerror.sh.in 2013-06-25 14:30:44 -0400
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
197 @@ -72,7 +72,8 @@
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
198 -e 's/H5Eset_auto[1-2]*/H5Eset_auto(1 or 2)/' \
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
199 $actual_err > $actual_ext
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
200 cat $actual_ext >> $actual
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
201 -
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
202 +
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
203 + dos2unix $actual > /dev/null 2>&1
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
204 if $CMP $expect1 $actual; then
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
205 echo " PASSED"
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
206 elif $CMP $expect2 $actual; then
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
207 diff -ur hdf5-1.8.10-orig/tools/h5copy/Makefile.am hdf5-1.8.10/tools/h5copy/Makefile.am
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
208 --- hdf5-1.8.10-orig/tools/h5copy/Makefile.am 2012-10-11 13:31:39 -0400
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
209 +++ hdf5-1.8.10/tools/h5copy/Makefile.am 2013-06-25 14:30:44 -0400
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
210 @@ -23,6 +23,8 @@
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
211 # Include src and tools/lib directories
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
212 INCLUDES=-I$(top_srcdir)/src -I$(top_srcdir)/tools/lib
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
213
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
214 +AM_CPPFLAGS += -D_HDF5USEDLL_
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
215 +
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
216 # Test programs and scripts
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
217 TEST_PROG=h5copygentest
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
218 TEST_SCRIPT=testh5copy.sh
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
219 diff -ur hdf5-1.8.10-orig/tools/h5diff/Makefile.am hdf5-1.8.10/tools/h5diff/Makefile.am
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
220 --- hdf5-1.8.10-orig/tools/h5diff/Makefile.am 2012-10-11 13:31:39 -0400
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
221 +++ hdf5-1.8.10/tools/h5diff/Makefile.am 2013-06-25 14:30:44 -0400
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
222 @@ -23,6 +23,8 @@
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
223 # Include src and tools/lib directories
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
224 INCLUDES=-I$(top_srcdir)/src -I$(top_srcdir)/tools/lib
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
225
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
226 +AM_CPPFLAGS += -D_HDF5USEDLL_
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
227 +
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
228 # Always build and test h5diff but build and test ph5diff only if parallel
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
229 # is enabled.
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
230 if BUILD_PARALLEL_CONDITIONAL
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
231 diff -ur hdf5-1.8.10-orig/tools/h5dump/Makefile.am hdf5-1.8.10/tools/h5dump/Makefile.am
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
232 --- hdf5-1.8.10-orig/tools/h5dump/Makefile.am 2012-10-11 13:31:22 -0400
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
233 +++ hdf5-1.8.10/tools/h5dump/Makefile.am 2013-06-25 14:30:44 -0400
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
234 @@ -23,6 +23,8 @@
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
235 # Include files in /src directory and /tools/lib directory
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
236 INCLUDES=-I$(top_srcdir)/src -I$(top_srcdir)/tools/lib
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
237
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
238 +AM_CPPFLAGS += -D_HDF5USEDLL_
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
239 +
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
240 # Test programs and scripts
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
241 TEST_PROG=h5dumpgentest
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
242 TEST_SCRIPT=testh5dump.sh testh5dumppbits.sh testh5dumpxml.sh
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
243 diff -ur hdf5-1.8.10-orig/tools/h5import/Makefile.am hdf5-1.8.10/tools/h5import/Makefile.am
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
244 --- hdf5-1.8.10-orig/tools/h5import/Makefile.am 2012-10-11 13:31:40 -0400
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
245 +++ hdf5-1.8.10/tools/h5import/Makefile.am 2013-06-25 14:30:44 -0400
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
246 @@ -23,6 +23,8 @@
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
247 # Include src and tools/lib directories
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
248 INCLUDES=-I$(top_srcdir)/src -I$(top_srcdir)/tools/lib
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
249
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
250 +AM_CPPFLAGS += -D_HDF5USEDLL_
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
251 +
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
252 # Test programs and scripts
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
253 TEST_PROG=h5importtest
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
254 TEST_SCRIPT=h5importtestutil.sh
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
255 diff -ur hdf5-1.8.10-orig/tools/h5jam/Makefile.am hdf5-1.8.10/tools/h5jam/Makefile.am
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
256 --- hdf5-1.8.10-orig/tools/h5jam/Makefile.am 2012-10-11 13:31:36 -0400
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
257 +++ hdf5-1.8.10/tools/h5jam/Makefile.am 2013-06-25 14:30:44 -0400
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
258 @@ -23,6 +23,8 @@
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
259 # Include src and tools/lib directories
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
260 INCLUDES=-I$(top_srcdir)/src -I$(top_srcdir)/tools/lib
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
261
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
262 +AM_CPPFLAGS += -D_HDF5USEDLL_
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
263 +
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
264 bin_PROGRAMS=h5jam h5unjam
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
265 check_PROGRAMS=tellub h5jamgentest getub
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
266 TEST_SCRIPT=testh5jam.sh
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
267 diff -ur hdf5-1.8.10-orig/tools/h5ls/Makefile.am hdf5-1.8.10/tools/h5ls/Makefile.am
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
268 --- hdf5-1.8.10-orig/tools/h5ls/Makefile.am 2012-10-11 13:31:41 -0400
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
269 +++ hdf5-1.8.10/tools/h5ls/Makefile.am 2013-06-25 14:30:44 -0400
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
270 @@ -23,6 +23,8 @@
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
271 # Include src and tools/lib directories
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
272 INCLUDES=-I$(top_srcdir)/src -I$(top_srcdir)/tools/lib
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
273
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
274 +AM_CPPFLAGS += -D_HDF5USEDLL_
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
275 +
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
276 # Test programs and scripts
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
277 TEST_SCRIPT=testh5ls.sh
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
278 check_SCRIPTS=$(TEST_SCRIPT)
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
279 diff -ur hdf5-1.8.10-orig/tools/h5repack/Makefile.am hdf5-1.8.10/tools/h5repack/Makefile.am
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
280 --- hdf5-1.8.10-orig/tools/h5repack/Makefile.am 2012-10-11 13:31:23 -0400
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
281 +++ hdf5-1.8.10/tools/h5repack/Makefile.am 2013-06-25 14:30:44 -0400
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
282 @@ -23,6 +23,8 @@
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
283 # Include src, test, and tools/lib directories
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
284 INCLUDES=-I$(top_srcdir)/src -I$(top_srcdir)/test -I$(top_srcdir)/tools/lib
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
285
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
286 +AM_CPPFLAGS += -D_HDF5USEDLL_
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
287 +
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
288 # Test programs and scripts
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
289 TEST_SCRIPT=h5repack.sh
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
290 TEST_PROG=h5repacktst
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
291 diff -ur hdf5-1.8.10-orig/tools/h5stat/Makefile.am hdf5-1.8.10/tools/h5stat/Makefile.am
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
292 --- hdf5-1.8.10-orig/tools/h5stat/Makefile.am 2012-10-11 13:31:41 -0400
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
293 +++ hdf5-1.8.10/tools/h5stat/Makefile.am 2013-06-25 14:30:44 -0400
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
294 @@ -23,6 +23,8 @@
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
295 # Include src directory
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
296 INCLUDES=-I$(top_srcdir)/src -I$(top_srcdir)/tools/lib
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
297
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
298 +AM_CPPFLAGS += -D_HDF5USEDLL_
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
299 +
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
300 #test script and program
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
301 TEST_PROG=h5stat_gentest
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
302 TEST_SCRIPT=testh5stat.sh
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
303 diff -ur hdf5-1.8.10-orig/tools/h5stat/testh5stat.sh.in hdf5-1.8.10/tools/h5stat/testh5stat.sh.in
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
304 --- hdf5-1.8.10-orig/tools/h5stat/testh5stat.sh.in 2012-10-11 13:31:41 -0400
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
305 +++ hdf5-1.8.10/tools/h5stat/testh5stat.sh.in 2013-06-25 14:30:44 -0400
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
306 @@ -158,6 +158,7 @@
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
307 ) >$actual 2>$actual_err
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
308 cat $actual_err >> $actual
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
309
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
310 + dos2unix $actual > /dev/null 2>&1
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
311
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
312 if [ ! -f $expect ]; then
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
313 # Create the expect file if it doesn't yet exist.
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
314 diff -ur hdf5-1.8.10-orig/tools/lib/Makefile.am hdf5-1.8.10/tools/lib/Makefile.am
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
315 --- hdf5-1.8.10-orig/tools/lib/Makefile.am 2012-10-11 13:31:39 -0400
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
316 +++ hdf5-1.8.10/tools/lib/Makefile.am 2013-06-25 14:30:44 -0400
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
317 @@ -23,6 +23,8 @@
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
318 # Include files in /src directory
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
319 INCLUDES=-I$(top_srcdir)/src
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
320
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
321 +AM_CPPFLAGS += -D_HDF5USEDLL_
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
322 +
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
323 # This is our main target, the h5tools library.
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
324 noinst_LTLIBRARIES=libh5tools.la
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
325
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
326 diff -ur hdf5-1.8.10-orig/tools/misc/Makefile.am hdf5-1.8.10/tools/misc/Makefile.am
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
327 --- hdf5-1.8.10-orig/tools/misc/Makefile.am 2012-10-11 13:31:41 -0400
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
328 +++ hdf5-1.8.10/tools/misc/Makefile.am 2013-06-25 14:30:44 -0400
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
329 @@ -23,6 +23,8 @@
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
330 # Include src directory
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
331 INCLUDES=-I$(top_srcdir)/src -I$(top_srcdir)/tools/lib
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
332
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
333 +AM_CPPFLAGS += -D_HDF5USEDLL_
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
334 +
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
335 #test script and program
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
336 TEST_PROG=h5repart_gentest talign
f2bbfa69647e [MSVC] enable HDF5 compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
337 TEST_SCRIPT=testh5repart.sh testh5mkgrp.sh