Consolidate XDR into the mfhdf library #483

derobins · 2024-02-04T00:45:57Z

XDR is now consolidated into the mfhdf library:

The build system always uses the library XDR implementation
Unused XDR functionality has been removed
There is no separate XDR library
The xdr.h header is no longer deployed
The POSIX XDR implementation is hard-coded as the only XDR implementation
The XDR "long" functions have been replaced with functions that take 32-bit data

XDR will eventually be removed from HDF4, but in the meantime, this will make it easier to deal with that layer and will fix the linking issues seen on some platforms.

Fixes #15
Fixes #25
Fixes #423
Fixes #151

We are removing XDR from the library, so the configuration options are being removed and the library's version of XDR will always be used. Removes: Autotools: --enable-hdf4-xdr CMake: HDF4_BUILD_XDR_LIB

This provided implementations of htons, etc. if a platform didn't have them. It's never compiled.

This appears to be an old VMS file and is not referenced in the test code

We no longer build a separate XDR library as all the XDR functionality has been moved to mfhdf/libsrc and is built with the mfhdf library. Because of this, we no longer distribute a separate XDR library with either build system. We also no longer distribute the XDR types.h and xdr.h headers.

Also, other misc cleanup

Also minor cleanup

Also, ran the formatter

* Included mfhdf.h to get Boolean values * Removed redundant TRUE/FALSE

* Move xdrposix.c netCDF fxns to file.c * XDR handle ops macro --> function * Comment out Sun get/put_int calls * Misc reorg and commenting

No longer needed since we make everyone use our XDR

xdrtest.c relies on xdrstdio and I want to unify xdr.c and xdrposix.c, so out they go...

Also hard-codes xdrposix calls for op-specific calls

Everything is hard-coded to POSIX now

Replaced with xdr_int, which is 32-bits on all supported platforms

These were commented out some time ago

byrnHDF · 2024-02-04T16:04:12Z

config/cmake/ConfigureChecks.cmake

@@ -64,7 +64,7 @@ if (WIN32 AND NOT MINGW)
 endif ()

 if (WINDOWS)
-  set (HDF4_REQUIRED_LIBRARIES "ws2_32.lib;wsock32.lib")
+  set (CMAKE_REQUIRED_LIBRARIES "ws2_32.lib;wsock32.lib")


Why the change?

I was trying to get MinGW to work and this seemed like the more correct thing to do. Is it not?

No, not really because HDF4_REQUIRED_LIBRARIES is temporary for checking, I believe CMAKE_REQUIRED_LIBRARIES is more global.

Isn't that the point, though? We want to require links to ws2_32, etc.

Actually it looks like the opposite is true - CMAKE_REQUIRED_LIBRARIES is temporary for checking, we use HDF4_REQUIRED_LIBRARIES after the configure_checks.

But then again CMAKE_REQUIRED_LIBRARIES shows up afterwards - ARRGH.

HDF5 uses CMAKE_REQUIRED_LIBRARIES is temporary for checking.

For HDF4 CMakeLists.txt line 485 incorrectly set CMAKE_REQUIRED_LIBRARIES and should have been setting HDF4_REQUIRED_LIBRARIES.
Then everything would be correct ;
CMAKE_REQUIRED_LIBRARIES is temporary for checking, we use HDF4_REQUIRED_LIBRARIES after the configure_checks.

…ely2

… into remove_xdr_entirely2

Dana Robinson added 30 commits February 2, 2024 00:48

Removed XDR configuration options

b314391

We are removing XDR from the library, so the configuration options are being removed and the library's version of XDR will always be used. Removes: Autotools: --enable-hdf4-xdr CMake: HDF4_BUILD_XDR_LIB

Remove mfhdf/xdr/byteordr.c

b30b0d9

This provided implementations of htons, etc. if a platform didn't have them. It's never compiled.

Remove mfhdf/xdr/xdrtest.opt

5d7c1d5

This appears to be an old VMS file and is not referenced in the test code

Removed unused XDR functions

21c1a28

Removed unused things from XDR struct

ee9ecef

Remove XDRDEBUG code

afeded4

Remove control and inline fields from XDR struct

746d7a8

Moved types.h content to xdr.h

ef3bec3

Removed unused XDR header cruft

0ed84f9

Removed xdr_enum, which was unused

52d3243

Remove xdr_short and xdr_u_short

f48d111

Removed capital flavor of XDR macros

2058ebd

Also, other misc cleanup

Moved xdr_vector into xdrtest.c

186ff32

Also minor cleanup

Remove xdrposix_inline

07dba71

Change XDRLIBAPI --> HDFLIBAPI

e9fd083

Remove free, 64-bit int XDR functions

b652425

Replace u_int and u_long with ANSI types

9cb6f01

Also, ran the formatter

xdr.h Boolean cleanup

479e632

* Included mfhdf.h to get Boolean values * Removed redundant TRUE/FALSE

Moved things out of xdr.h

8d8c7b3

Misc XDR cleanup

3f7cecf

* Move xdrposix.c netCDF fxns to file.c * XDR handle ops macro --> function * Comment out Sun get/put_int calls * Misc reorg and commenting

Removed ancient Sun get/put_int ops

7cb8fe2

No longer needed since we make everyone use our XDR

Remove xdrstdio and xdrtest

94b4b4d

xdrtest.c relies on xdrstdio and I want to unify xdr.c and xdrposix.c, so out they go...

Move xdrposix.c to xdr.c

c35b885

Also hard-codes xdrposix calls for op-specific calls

Remove ops from XDR

2bbd6fd

Everything is hard-coded to POSIX now

Remove put/getint32 functions

b48e32d

Replaced with xdr_int, which is 32-bits on all supported platforms

Removed 64-bit XDR functions

df7bb3b

These were commented out some time ago

Remove redundant xdr_get/putlong()

057c4c1

Ran formatter

4e39b8b

Add helpful comments

7e90156

Dana Robinson and others added 8 commits February 3, 2024 17:41

Update winsock defines for MinGW

7ab4bc6

Committing clang-format changes

3a08966

Add htonl comments

26a55f2

Clean up htonl, etc. build functionality

5b488db

Tweak to CMake Windows network libraries

0351705

HDF4 --> CMAKE_REQUIRED_LIBRARIES

240f8c1

Restore missing target_link_libraries

07ae856

Restore netinet/in.h

a9a954a

bmribler approved these changes Feb 4, 2024

View reviewed changes

bmribler self-requested a review February 4, 2024 04:50

bmribler approved these changes Feb 4, 2024

View reviewed changes

Dana Robinson added 7 commits February 3, 2024 23:34

Refactoring and commenting

4da9e6e

Spelling fixes

d66422b

Fix typo

4e19ae1

Improve comments about 64-bit BE systems

b8451c8

Fix incorrect error string

64e6dbd

Switched some xdr long ops to int

82400d0

Replaced problematic XDR long operations

56e6daf

byrnHDF reviewed Feb 4, 2024

View reviewed changes

byrnHDF approved these changes Feb 4, 2024

View reviewed changes

derobins mentioned this pull request Feb 6, 2024

Use proper type for xdr_long on 32-bit #496

Closed

Dana Robinson and others added 6 commits February 6, 2024 01:55

Merge remote-tracking branch 'canonical/master' into remove_xdr_entir…

54e6bf5

…ely2

Added h4 prefix to XDR calls

2511111

Renamed XDR files w/ h4 prefix

6a7a011

Committing clang-format changes

b335b9f

Merge remote-tracking branch 'canonical/master' into remove_xdr_entir…

143f66a

…ely2

Merge branch 'remove_xdr_entirely2' of https://github.com/derobins/hdf4…

3bdfb4f

… into remove_xdr_entirely2

derobins mentioned this pull request Feb 6, 2024

Build fails on x86_64 OpenBSD 7.2 clang #151

Closed

derobins merged commit b9fb3af into HDFGroup:master Feb 6, 2024
31 checks passed

derobins deleted the remove_xdr_entirely2 branch March 3, 2024 20:09

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Consolidate XDR into the mfhdf library #483

Consolidate XDR into the mfhdf library #483

derobins commented Feb 4, 2024 •

edited

Loading

byrnHDF Feb 4, 2024

derobins Feb 6, 2024

byrnHDF Feb 6, 2024

derobins Feb 6, 2024

byrnHDF Feb 6, 2024

byrnHDF Feb 6, 2024

byrnHDF Feb 6, 2024

byrnHDF Feb 6, 2024

Consolidate XDR into the mfhdf library #483

Consolidate XDR into the mfhdf library #483

Conversation

derobins commented Feb 4, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

derobins commented Feb 4, 2024 •

edited

Loading