Commit Graph
215 Commits
Author SHA1 Message Date
Allen Byrne 4e2fbaab15 Correct dimensions in java test (#3485) 2023-09-01 11:17:27 -07:00
Allen Byrne ceef4a9ebd Merge/update CMake, presets,java and tools (#3393) 2023-08-21 17:13:03 -05:00
Allen Byrne b8529623eb Change name of test file to avoid conflict (#2705) 2023-04-13 09:11:15 -07:00
Allen Byrne 04d11bfb2b 1.12 Fix some Java warnings (#2146)
* Fix some Java warnings

* Fix accidental change
2022-10-06 16:40:27 -07:00
Allen Byrne a0a1959c58 clang 13 format #1933 (#1939) 2022-07-27 10:28:11 -07:00
Larry Knox d0739f13c1 Revert "1.12 eliminate unnecessary errors in the error stack (#1880)" (#1935)
This reverts commit f699768133.
2022-07-26 14:30:04 -05:00
Allen Byrne f699768133 1.12 eliminate unnecessary errors in the error stack (#1880)
* Eliminate unnecessary error output

* Fix merge typo

* fix format

* Fix object address to tokens

* Fix conflict
2022-07-18 10:23:37 -07:00
Allen Byrne 21b8d65c2c 1.12 HDFFV-11310 implement JNI VL support for primitive types (#1856)
* HDFFV-11310 - implement VL read/write using List of Lists

* Fix function name typo

* Add JIRA issue

* Correct note to match change in code.

* HDFFV-11318 add VL references as byte arrays

* Fix unreleased allocations

* Fix format
2022-07-12 08:46:26 -07:00
Allen Byrne 2a147be72f Hdf5 1 12 sync (#1794) 2022-06-11 23:06:49 -05:00
Allen Byrne 974aefb841 Add java clang-format (#1672) 2022-04-22 08:24:27 -07:00
Larry Knox 1e34f1d3b5 Update version to 1.12.3-1 after creating hdf5_1_12_2 release
preparation branch.
Clean release note entries from RELEASE.txt.
2022-04-08 16:25:01 -05:00
Allen Byrne 3d9e1f0975 Fix java test name conflict #1467 (#1496) 2022-03-11 23:04:21 -06:00
Allen Byrne b88cfdbfc9 Merge Update the java slf4j logging jars to latest 1.7.33 (#1370) 2022-01-24 15:40:45 -06:00
Allen Byrne a0c2b2e8d4 1.12 Merge Add tests for H5Ocopy of new object refs (#1339)
* Add tests for H5Ocopy of new object refs

* Correct class name

* Skip test because of issue with debug assertions

* Update reference file

* Fix object examples for new refs and spelling fixs

* Fix ref try-catch blocks
2022-01-13 22:17:59 -06:00
Allen Byrne d952c863b2 Merge Fix Java VOL tests #1158 (#1160) 2021-11-03 17:33:00 -05:00
Allen Byrne 3186b8227c Fix javadoc and java warnings (#1010) 2021-09-17 11:00:32 -05:00
Allen Byrne b19234c31a Correct dataset close in java test #919 (#920) 2021-08-19 13:19:15 -05:00
Allen Byrneandgithub-actions 3bbc4f0df4 Hdf5 1 12 merge cmake ninja and java refs (#698)
* OESS-98 fix tools test for plugins

* sync fork

* Merge of changes from dev

* Move problem option to bottom of the list until fixed

* HDFFV-11106 - fix parsing optional args

* HDFFV-11106 add note

* grammer fix

* Whitespace after clang formatting

* Undo format version 11 changes

* Update check to working version

* Merge workflow and minor changes from develop

* Update supported platforms

* PR#3 merge from develop

* Merge gcc 10 diagnostics option from develop

* Merge #318 OSX changes from develop

* Merge serval small changes from dev

* fix typo

* Minor non-space formatting changes

* GH #386 copyright corrections for java folder

* revert because logic requires false return

* Merges from develop

#358 patches from vtk
#361 fix header guard spelling

* Remove case statement for H5I_EVENTSET

* Correct call with versioning

* Remove tabs

* Double underscore change

* Merges from develop

#340 clang -Wformat-security warnings
#360 Fixed uninitialized warnings
Remove more underscores from header guards

* Merge #380 from develop

* Correct date entry

* Split format source and commit changes on repo push

* remove pre-split setting

* Change windows TS to use older VS.

* HDFFV-11212 JNI export util and Javadoc

* Suggested review changes

* Another change found

* Committing clang-format changes

* Some Javadoc warning fixes

* Committing clang-format changes

* Updated javadoc fixes

* HDFFV-11228/9 merges from develop

* remove obsolete debug comment

* Fix conflict

* HDFFV-11229 merge changes from develop

* HDFFV-11229 merge second compare from develop

* HDFFV-11229 fix reference file

* HDFFV-11229 update autotools test script for two ref files

* HDFFV-11229 merge dev changes for long double display in tools

* Committing clang-format changes

* Update with changes from develop

* Add "option" command for clang options

* Rework CMake add_custom to use the BYPRODUCTS argument

Update pkgconfig scripts for parallel builds.
Fix install COPYING file reference.
Remove unused round defines.
Change CMake default setting of BUILD_CPP to off.

* Whitespace changes

* Rework CMake add_custom to use the BYPRODUCTS argument

* Revert CMake configure checks for round defines

* With VS 2015 minimum strdup is supported

* Doxygen comments merged from develop

* doxygen build updates

* Correct version string for map functions

* TRILAB-227 and tools debug merge from develop

* TRILAB-227 Enable test

* Quote subset args

* Use MATCHES in compiler id compare, merge from dev

* Revert test enable

* Add file to list

* doxygen version errors

* if blocks needed for build modes

* Update list of test platforms

* Issue #669 remove version from pkgcfg filename

* remove version from h5cc script

* Merge CMake and java refs from dev

Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
2021-05-29 15:30:27 -05:00
Larry Knox ed86f4aaf4 Update version to 1.12.2-1.
Update so numbers according to compatibility rules for 1.12.1 release.
2021-05-17 23:29:51 -05:00
Allen Byrneandgithub-actions 7a2b7faa39 1 12 merge CMake flag groups and tools long double changes from develop (#523)
* OESS-98 fix tools test for plugins

* sync fork

* Merge of changes from dev

* Move problem option to bottom of the list until fixed

* HDFFV-11106 - fix parsing optional args

* HDFFV-11106 add note

* grammer fix

* Whitespace after clang formatting

* Undo format version 11 changes

* Update check to working version

* Merge workflow and minor changes from develop

* Update supported platforms

* PR#3 merge from develop

* Merge gcc 10 diagnostics option from develop

* Merge #318 OSX changes from develop

* Merge serval small changes from dev

* fix typo

* Minor non-space formatting changes

* GH #386 copyright corrections for java folder

* revert because logic requires false return

* Merges from develop

#358 patches from vtk
#361 fix header guard spelling

* Remove case statement for H5I_EVENTSET

* Correct call with versioning

* Remove tabs

* Double underscore change

* Merges from develop

#340 clang -Wformat-security warnings
#360 Fixed uninitialized warnings
Remove more underscores from header guards

* Merge #380 from develop

* Correct date entry

* Split format source and commit changes on repo push

* remove pre-split setting

* Change windows TS to use older VS.

* HDFFV-11212 JNI export util and Javadoc

* Suggested review changes

* Another change found

* Committing clang-format changes

* Some Javadoc warning fixes

* Committing clang-format changes

* Updated javadoc fixes

* HDFFV-11228/9 merges from develop

* remove obsolete debug comment

* Fix conflict

* HDFFV-11229 merge changes from develop

* HDFFV-11229 merge second compare from develop

* HDFFV-11229 fix reference file

* HDFFV-11229 update autotools test script for two ref files

* HDFFV-11229 merge dev changes for long double display in tools

* Committing clang-format changes

* Update with changes from develop

Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
2021-04-19 07:53:45 -05:00
Allen Byrneandgithub-actions 579b266e65 1 12 JNI export references and java updates (#464)
* OESS-98 fix tools test for plugins

* sync fork

* Merge of changes from dev

* Move problem option to bottom of the list until fixed

* HDFFV-11106 - fix parsing optional args

* HDFFV-11106 add note

* grammer fix

* Whitespace after clang formatting

* Undo format version 11 changes

* Update check to working version

* Merge workflow and minor changes from develop

* Update supported platforms

* PR#3 merge from develop

* Merge gcc 10 diagnostics option from develop

* Merge #318 OSX changes from develop

* Merge serval small changes from dev

* fix typo

* Minor non-space formatting changes

* GH #386 copyright corrections for java folder

* revert because logic requires false return

* Merges from develop

#358 patches from vtk
#361 fix header guard spelling

* Remove case statement for H5I_EVENTSET

* Correct call with versioning

* Remove tabs

* Double underscore change

* Merges from develop

#340 clang -Wformat-security warnings
#360 Fixed uninitialized warnings
Remove more underscores from header guards

* Merge #380 from develop

* Correct date entry

* Split format source and commit changes on repo push

* remove pre-split setting

* Change windows TS to use older VS.

* HDFFV-11212 JNI export util and Javadoc

* Suggested review changes

* Another change found

* Committing clang-format changes

Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
2021-03-12 07:48:16 -06:00
Allen Byrne 0f219cafea 1 12 merges from develop (#412)
* OESS-98 fix tools test for plugins

* sync fork

* Merge of changes from dev

* Move problem option to bottom of the list until fixed

* HDFFV-11106 - fix parsing optional args

* HDFFV-11106 add note

* grammer fix

* Whitespace after clang formatting

* Undo format version 11 changes

* Update check to working version

* Merge workflow and minor changes from develop

* Update supported platforms

* PR#3 merge from develop

* Merge gcc 10 diagnostics option from develop

* Merge #318 OSX changes from develop

* Merge serval small changes from dev

* fix typo

* Minor non-space formatting changes

* GH #386 copyright corrections for java folder

* revert because logic requires false return

* Merges from develop

#358 patches from vtk
#361 fix header guard spelling

* Remove case statement for H5I_EVENTSET

* Correct call with versioning

* Remove tabs

* Double underscore change
2021-03-03 07:08:37 -06:00
Allen Byrne 498a6de935 1 12 merge java copyright header changes (#391)
* OESS-98 fix tools test for plugins

* sync fork

* Merge of changes from dev

* Move problem option to bottom of the list until fixed

* HDFFV-11106 - fix parsing optional args

* HDFFV-11106 add note

* grammer fix

* Whitespace after clang formatting

* Undo format version 11 changes

* Update check to working version

* Merge workflow and minor changes from develop

* Update supported platforms

* PR#3 merge from develop

* Merge gcc 10 diagnostics option from develop

* Merge #318 OSX changes from develop

* Merge serval small changes from dev

* fix typo

* Minor non-space formatting changes

* GH #386 copyright corrections for java folder

* revert because logic requires false return
2021-03-01 14:07:44 -06:00
Larry Knox 8d4a9d589b Update URL in source file Copyright headers for web copy of COPYING
file - files not in src or test.
2021-02-20 08:08:39 -06:00
Dana Robinson 5d0be1b196 Manual sync with develop (#95)
Brings all features from develop. Note that RELEASE.txt has not been
updated (will be done in a future PR).
2020-11-17 07:47:52 -06:00
Allen Byrne 46bc76ab63 Correct TARGET variable and CMake config file location 2020-11-12 10:50:00 -06:00
Allen Byrne 7416cd2598 HDFFV-10868 merge from develop 2020-10-28 09:25:26 -05:00
Dana Robinson 1ae6daaa80 Sync with develop 2020-08-01 09:18:18 -07:00
Larry Knox 1d1cba787f Change load path in libhdf5_java.dylib to unversioned libhdf5.dylib for
junit tests on Macs.
2020-07-07 11:03:15 -05:00
Larry Knox f9c38c6253 Merge pull request #2667 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:develop to develop
* commit '32c483cb86031962a09ecdb49dcb331d28dddee9':
  Copy lib files for junit.sh to temporary subdirectory of <build directory>/java/test instead of to the prefix/lib directory.  Fix for HDFFV-11063.
2020-07-07 11:02:21 -05:00
Larry Knox 8171ef3c88 Merge pull request #2670 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:develop to develop
* commit 'fc69de0e8ae30e80c1c3c542b156226a75444525':
  Lib files needed are now copied to a subdirectory in the java/test directory, and on Macs the loader path for libhdf5.xxxs.so is changed in the temporary copy of libhdf5_java.dylib. Fix for HDFFV-11063
2020-07-06 12:34:51 -05:00
Allen Byrne 2a3d394f7c Whitespace cleanup 2020-05-12 15:59:59 -05:00
Allen Byrne e0183056d5 Add github actions and cleanup java whitespace 2020-05-06 11:19:50 -05:00
Allen Byrne 9ed096fb39 Merge changes from develop mostly cmake 3.12 minimum version 2020-02-23 11:55:47 -06:00
Allen Byrne 21f11e240b HDFFV-10996 merge java vol tests from develop 2020-02-04 11:43:45 -06:00
Jordan Henderson edec1f017d Introduce new H5VL _by_value routines 2020-01-29 16:59:41 -06:00
Larry Knox 3ecbb767c3 Update version to 1.12.1-snap0 for hdf5_1_12 branch. 2020-01-28 15:55:05 -06:00
Allen Byrne 6bae11bb5b Improved CMake options for tests 2020-01-19 07:53:46 -06:00
Dana Robinson 2b1709f6ff Squashed commit of the token_refactoring branch: 2020-01-18 20:02:16 -08:00
Allen Byrne 06f3c95c6e Merge tools changes from develop 2020-01-13 11:35:40 -06:00
Allen Byrne 483f862a01 Fix compile error and add ref destroy to Java test 2019-12-09 15:44:38 -06:00
Allen Byrne 310b42e35a HDFFV-10876 Merge from develop 2019-12-09 15:44:38 -06:00
Jordan Henderson f3f67a5645 Fix various Java issues when deprecated symbols are disabled 2019-10-10 16:03:34 -05:00
Larry Knox e7dbf81191 Set versions in initial hdf5_1_12 revision. 2019-09-25 15:57:22 -05:00
Allen Byrne cf9eff93e0 Remove obsolete symbol 2019-09-20 09:30:36 -05:00
Allen Byrne aa8c7b31d7 small syntax changes 2019-09-19 16:32:40 -05:00
Allen Byrne b477f9bcc7 HDFFV-10901 add missing config options 2019-09-13 11:34:00 -05:00
Allen Byrne dcab85c83b Add back missing java implementation 2019-09-05 14:35:33 -05:00
Allen Byrne 935f27c1b8 HDFFV-10887 Implement requested functions 2019-08-19 11:58:52 -05:00
Larry Knox c234479258 Update junit.sh.in to copy lib files to $prefix/lib.
Correct checking for s3 and hdfs options.
2019-08-02 09:58:48 -05:00