WIP adding the DLM (and LINKIMAGE) functionality. (#2043)

Co-authored-by: Giloo <gildas@localhost>

Author: GillesDuvert

.github/workflows/main.yml

@@ -239,8 +239,6 @@ jobs:
         run: |
           pacman -Q | tr ' ' '-' | sort > ~/snapshot1.txt
           scripts/build_gdl.sh prep
-          ls MINGW-packages/mingw-w64-graphicsmagick/
-          mv MINGW-packages/mingw-w64-graphicsmagick/mingw-w64-*-graphicsmagick-*.tar.* /var/cache/pacman/pkg
           pacman -Q | tr ' ' '-' | sort > ~/snapshot2.txt
           echo "Setting up cache..."
           mkdir -p /cache

CMakeLists.txt

@@ -197,22 +197,8 @@ check_include_file(strings.h HAVE_STRINGS_H)
 check_include_file(sys/stat.h HAVE_SYS_STAT_H)
 check_include_file(sys/types.h HAVE_SYS_TYPES_H)
 check_include_file(unistd.h HAVE_UNISTD_H)
-#check_include_file(ext/stdio_filebuf.h HAVE_EXT_STDIO_FILEBUF_H)
-#sometimes it compiles but stdio_filebuf is only in gcc-x-y-z directory tree...
-# would be silly not to use this functionality if present, so recheck:
-if (HAVE_EXT_STDIO_FILEBUF_H)
-else (HAVE_EXT_STDIO_FILEBUF_H)
-    check_cxx_source_compiles("
-#include <ext/stdio_filebuf.h>
-int main(int argc, char **argv) {
-    int i=0;
-    i+=1;
-}" REALLY_HAVE_EXT_STDIO_FILEBUF_H)
-endif (HAVE_EXT_STDIO_FILEBUF_H)
-if (REALLY_HAVE_EXT_STDIO_FILEBUF_H)
-message(STATUS "INFO: will use GNU extensions for STDIO (useful for compressed I/O) since it seems accepted by your c++ compiler.")
-set (HAVE_EXT_STDIO_FILEBUF_H 1)
-endif (REALLY_HAVE_EXT_STDIO_FILEBUF_H)
+#need to use check_include_file_cxx since this is a C++ only header!!!
+check_include_file_cxx(ext/stdio_filebuf.h HAVE_EXT_STDIO_FILEBUF_H)
 # dlfcn.h
 check_include_file(dlfcn.h HAVE_DLFCN_H)
 

CMakeModules/FindXdr.cmake

@@ -1,27 +1,27 @@
-#
-# copyright : (c) 2012 Jeongbin Park
-#
-# 2012/Sep/18 Jeongbin Park added this file; to support Windows platform.
-#
-#  This program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2 of the License, or
-#  (at your option) any later version.
-#
-if(XDRDIR) 
-  set(CMAKE_PREFIX_PATH $XDRDIR)
-endif(XDRDIR)
-find_library(XDR_LIBRARY NAMES bsdxdr xdr)
-set(XDR_LIBRARIES ${XDR_LIBRARY})
-find_path(XDR_INCLUDE_DIR NAMES rpc/xdr.h)
-
-unset( CMAKE_PREFIX_PATH)
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(Xdr DEFAULT_MSG XDR_LIBRARIES XDR_INCLUDE_DIR)
-
-mark_as_advanced(
-XDR_LIBRARY
-XDR_LIBRARIES
-XDR_INCLUDE_DIR 
-)
+#
+# copyright : (c) 2012 Jeongbin Park
+#
+# 2012/Sep/18 Jeongbin Park added this file; to support Windows platform.
+#
+#  This program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2 of the License, or
+#  (at your option) any later version.
+#
+if(XDRDIR) 
+  set(CMAKE_PREFIX_PATH $XDRDIR)
+endif(XDRDIR)
+find_library(XDR_LIBRARY NAMES bsdxdr xdr)
+set(XDR_LIBRARIES ${XDR_LIBRARY})
+find_path(XDR_INCLUDE_DIR NAMES rpc/xdr.h)
+
+unset( CMAKE_PREFIX_PATH)
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(Xdr DEFAULT_MSG XDR_LIBRARIES XDR_INCLUDE_DIR)
+
+mark_as_advanced(
+XDR_LIBRARY
+XDR_LIBRARIES
+XDR_INCLUDE_DIR 
+)

config.h.cmake

@@ -3,7 +3,6 @@
 
 #define EXEC_PREFIX "@CMAKE_INSTALL_PREFIX@"
 #define GDLDATADIR "@CMAKE_INSTALL_PREFIX@@GDL_DATA_DIR@"
-#define GDLLIBDIR "@GDL_LIB_DIR@"
 
 #define _CRT_SECURE_NO_WARNINGS
 

scripts/build_gdl.sh

@@ -88,13 +88,12 @@ function log {  # log is needded just below!
 if [ ${BUILD_OS} == "Windows" ]; then
     BSDXDR_URL="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/bsd-xdr/bsd-xdr-1.0.0.tar.gz"
     MSYS2_PACKAGES=(
-        readline zlib libpng gsl wxWidgets libgd libtiff libgeotiff netcdf hdf4 hdf5 fftw proj msmpi udunits
-        eigen3 eccodes glpk shapelib expat openssl qhull
+        readline zlib libpng gsl wxwidgets3.2 libgd libtiff libgeotiff netcdf hdf4 hdf5 fftw proj msmpi udunits
+        eigen3 eccodes glpk shapelib expat openssl qhull graphicsmagick
     )
-# GD: dunno why graphicsmagick has this special treatment????
     #if you add something in MSYS2_PACKAGES_REBUILD you may have to add special lines in main.yml to push the product in /var/cache/pacman/pkg
     MSYS2_PACKAGES_REBUILD=(
-        graphicsmagick
+       
     )
 elif [ ${BUILD_OS} == "Linux" ]; then
     # JP: Note the seperator ',' between the package name candidates below. The leftmost one has the highest priority.
@@ -311,24 +310,17 @@ function prep_packages {
             eval "pacman --noconfirm --needed -S ${msys2_packages}"
         fi
 
-        for package_name in ${MSYS2_PACKAGES_REBUILD[@]}; do
-            build_msys2_package $package_name
-        done
+#        for package_name in ${MSYS2_PACKAGES_REBUILD[@]}; do
+#            build_msys2_package $package_name
+#        done
 
-#	pushd ${ROOT_DIR}
-#        download_file "https://github.com/qhull/qhull/archive/refs/tags/2020.2.zip"
-#        decompress_file
-#        log "Building qhull..."
-#        pushd qhull-2020.2
-#        make SO=dll || exit 1
-#        popd
-#	popd
-
         download_file ${BSDXDR_URL}
         decompress_file
 
         log "Building bsd-xdr..."
         pushd bsd-xdr-1.0.0
+#		need a patch now with a new version of the mingw compiler... (GD)
+        patch lib/xdr_rec.c ${GDL_DIR}/scripts/deps/windows/mingw-patches/bsdxdr_rec.patch
         sed -e 's/-Wall/-Wall -Wno-pointer-to-int-cast #/' -e 's/$(XDR_LIBRARIES) $(TEST_PROGS)/$(XDR_LIBRARIES)/' -e 's/libxdr/libbsdxdr/' -i Makefile
         mv lib/libxdr.def.in lib/libbsdxdr.def.in
         make || exit 1
@@ -359,15 +351,6 @@ function prep_packages {
             done
         done
 
-#	pushd ${ROOT_DIR}
-#        download_file "https://github.com/qhull/qhull/archive/refs/tags/2020.2.zip"
-#        decompress_file
-#        log "Building qhull..."
-#        pushd qhull-2020.2
-#        make || exit 1
-#        popd
-#	popd
-
         if [[ -z ${INSTALL_PACKAGES} ]]; then
             log "All required packages are already installed on your system."
 	    else
@@ -438,6 +421,9 @@ function configure_gdl {
                                     "-DCMAKE_CXX_COMPILER=/opt/homebrew/opt/llvm/bin/clang++"
                                     "-DCMAKE_C_COMPILER=/opt/homebrew/opt/llvm/bin/clang" ) 
         else
+#patch to be tested: should avoid the error "tried including <stddef.h> but didn't find libc++'s <stddef.h> header."
+            sudo xcode-select -s /Library/Developer/CommandLineTools
+#end patch
             export LIBRARY_PATH=$LIBRARY_PATH:/usr/local/opt/llvm/lib
             CMAKE_ADDITIONAL_ARGS=( "-DMPI=OFF -DREADLINEDIR=/usr/local/opt/readline"
                                     "-DCMAKE_CXX_COMPILER=/usr/local/opt/llvm/bin/clang++"

scripts/deps/windows/mingw-patches/bsdxdr_rec.patch

@@ -0,0 +1,11 @@
+--- /home/gildas/Downloads/bsd-xdr-1.0.0/lib/xdr_rec.c	2009-05-23 07:30:51.000000000 +0200
++++ bsd-xdr-1.0.0/lib/xdr_rec.c	2025-07-12 23:09:18.543660836 +0200
+@@ -69,8 +69,6 @@
+   XPRT_IDLE
+ };
+ 
+-static u_int fix_buf_size ();
+-
+ static bool_t xdrrec_getlong (XDR *, long *);
+ static bool_t xdrrec_putlong (XDR *, const long *);
+ static bool_t xdrrec_getbytes (XDR *, char *, u_int);

src/CMakeLists.txt

@@ -92,7 +92,7 @@ getfmtast.cpp
 graphicsdevice.cpp
 basic_pro.cpp
 basic_pro_jmg.cpp
-brent.cpp
+# brent.cpp #as DLM test 
 grib.cpp
 gsl_fun.cpp
 gsl_matrix.cpp
@@ -219,6 +219,7 @@ set_source_files_properties(libinit_cl.cpp PROPERTIES COMPILE_FLAGS -Wno-depreca
 add_library(whereami STATIC ${CMAKE_SOURCE_DIR}/src/whereami/src/whereami.c)
 add_subdirectory(antlr)
 add_subdirectory(plplot)
+add_subdirectory(dlm)
 
 include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/src/antlr ${CMAKE_BINARY_DIR}/src ${CMAKE_SOURCE_DIR}/src/whereami/src ${CMAKE_BINARY_DIR})
 link_directories(${LINK_DIRECTORIES})
@@ -276,6 +277,17 @@ else(PYTHON_MODULE)
 	set_target_properties(gdl PROPERTIES INSTALL_RPATH_USE_LINK_PATH TRUE)
 endif(PYTHON_MODULE)
 
+#permit gdl.exe to export its symbols, necessary for linkimage and DLM
+if (NOT APPLE AND NOT OSX AND NOT MINGW)
+    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--export-dynamic")
+endif()
+if (APPLE OR OSX )
+    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fvisibility=protected") #-exported_symbols_list ${EXPORTED_SYMBOLS_LIST}")
+endif()
+if (MINGW )
+#set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--export-all-symbols")
+endif()
+
 install(DIRECTORY ${CMAKE_SOURCE_DIR}/src/pro/ DESTINATION ${CMAKE_INSTALL_PREFIX}/${GDL_DATA_DIR}/lib
 	PATTERN CVS EXCLUDE
 	PATTERN checks EXCLUDE
@@ -288,6 +300,8 @@ install(DIRECTORY ${CMAKE_SOURCE_DIR}/resource DESTINATION ${CMAKE_INSTALL_PREFI
 	PATTERN Makefile* EXCLUDE
 	PATTERN UrgentNeed.txt EXCLUDE)
 
+install(DIRECTORY DESTINATION ${CMAKE_INSTALL_PREFIX}/${GDL_DATA_DIR}/dlm )
+
 configure_file(
  	${CMAKE_SOURCE_DIR}/scripts/quick_start_GDL.sh.in
 	${CMAKE_BINARY_DIR}/quick_start_GDL.sh