Commit Graph

21 Commits

Author SHA1 Message Date
Allen Byrne
d4e7beb9ee Incr CMake min, add missing test, rework test CMake script 2018-02-27 16:39:10 -06:00
Allen Byrne
fc875eb5b7 HDFFV-10384 and includes cleanup merged from devlop 2018-02-16 09:25:51 -06:00
Allen Byrne
233afe3b6f HDFFV-10385,10392,10393 merge from develop 2018-01-22 11:22:27 -06:00
Allen Byrne
c1edb4ad89 HDFFV-10321 merge from develop 2017-11-02 10:14:14 -05:00
M. Scot Breitenfeld
2074cbd516 Merge remote-tracking branch 'upstream/hdf5_1_10' into hdf5_1_10 2017-10-26 10:57:26 -05:00
Allen Byrne
e9411e7d89 Fix test DEPENDS 2017-10-25 09:06:18 -05:00
Allen Byrne
76d90e4d9d HDFFV-10297 merge tools changes from develop 2017-10-03 14:40:24 -05:00
Allen Byrne
467f30c410 Cleanup cmake clean macros 2017-10-03 14:14:53 -05:00
Allen Byrne
8551126dcf Insure zip_perf program does not run concurrently 2017-07-26 11:04:36 -05:00
Allen Byrne
373a37da01 Make sure zip_perf program does not run concurrently 2017-07-26 09:30:41 -05:00
Allen Byrne
006e568021 Remove duplicate defines 2017-05-04 11:41:47 -05:00
Larry Knox
89fbe00dec Merge pull request #426 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:hdf5_1_10 to hdf5_1_10
* commit '54957d37f5aa73912763dbb6e308555e863c43f4':
  Commit copyright header change for src/H5PLpkg.c which was added after running script to make changes.
  Add new files in release_docs to MANIFEST. Cimmit changes to Makefile.in(s) and H5PL.c that resulted from running autogen.sh.
  Merge pull request #407 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:hdf5_1_10_1 to hdf5_1_10_1
  Change copyright headers to replace url referring to file to be removed and replace it with new url for COPYING file.
2017-04-25 16:05:36 -05:00
lrknox
49cded79ce Add new files in release_docs to MANIFEST.
Cimmit changes to Makefile.in(s) and H5PL.c that resulted from running
autogen.sh.

Conflicts:
	README.txt
	c++/src/Makefile.in
	fortran/src/Makefile.in
	hl/c++/src/Makefile.in
	hl/fortran/src/Makefile.in
	hl/src/Makefile.in
	java/src/jni/Makefile.in
	release_docs/RELEASE.txt
	src/Makefile.in
2017-04-15 08:17:10 -05:00
lrknox
b9a27fddaa Merge pull request #407 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:hdf5_1_10_1 to hdf5_1_10_1
* commit '0d05cb607e5951f3a28a101be56ca194022a7fa1':
  Reverted addition of The HDF Group copyright headers to 3rd party CMake files for Java.
  Add Copyright headers to 90 files (mostly .cmake files) without Copyright headers.
  Add "Copyright by The HDF Group."" to copyright header.
2017-04-14 16:40:52 -05:00
lrknox
25ec07450a Change copyright headers to replace url referring to file to be removed
and replace it with new url for COPYING file.

Fix 2 lines in java error test expected output file where messages
include line numbers changed by reducing the copyright header by 2
lines.
2017-04-14 11:54:16 -05:00
Quincey Koziol
0313cbb91d Final merge of page buffering branch to develop 2017-03-13 21:30:37 -07:00
Quincey Koziol
a28b65bb9e Clean up whitespace 2017-02-07 09:18:57 -08:00
Allen Byrne
244faaa0d0 HDFFV-10094: upgrade cmake command conventions
Also converted tests to use macros
2017-01-11 14:02:34 -06:00
Allen Byrne
e1bcae8a6a Update cmake min version and cmake command convention 2017-01-10 17:10:03 -06:00
Allen Byrne
df13600ae2 Re-merge HDFFV-9942 to new folder structure 2016-10-27 11:03:26 -05:00
Allen Byrne
2c6dbbf212 Split tools into src and test - add folders 2016-10-27 10:06:00 -05:00