Merge pull request #2 from hmenke/libtool

Add support for libtool to build shared libraries

Author: pouillon

.github/workflows/linux.yml

@@ -0,0 +1,55 @@
+name: Linux
+
+on: push
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Add historical Ubuntu repository for robodoc
+        run: |
+          # Ubuntu 11.10 (Oneiric Ocelot) is the last release to contain robodoc
+          # The keys are long expired, so we need to use [trusted=yes]
+          echo "deb [trusted=yes] http://old-releases.ubuntu.com/ubuntu/ oneiric universe" | sudo tee /etc/apt/sources.list.d/precise.list
+          sudo apt-get update
+
+      - name: Install dependencies
+        run: >-
+          sudo DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y
+          build-essential
+          autoconf
+          automake
+          libtool
+          gcc
+          gfortran
+          libnetcdff-dev
+          python-is-python3
+          robodoc
+
+      - name: Configure etsf-io
+        run: |
+          bash -e autogen.sh
+          mkdir build/
+          cd build/
+          ../configure
+          make -j V=1
+        env:
+          FFLAGS: "-O0 -g3 -fno-omit-frame-pointer -fsanitize=address"
+          LDFLAGS: "-fsanitize=address"
+
+      - name: Compile etsf-io
+        working-directory: build/
+        run: |
+          make -j V=1
+
+      - name: Test etsf-io
+        working-directory: build/
+        run: |
+          make -j check V=1
+
+      - uses: actions/upload-artifact@v4
+        if: always()
+        with:
+          path: build/config.log

.github/workflows/macos.yml

@@ -0,0 +1,51 @@
+name: macOS
+
+on: push
+
+jobs:
+  build:
+    runs-on: macos-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Install dependencies
+        run: >-
+          brew install
+          autoconf
+          automake
+          libtool
+          gcc@14
+          netcdf-fortran
+          pkg-config
+          robodoc
+
+      - name: Add gnubin to PATH
+        run: |
+          echo PATH="/opt/homebrew/opt/libtool/libexec/gnubin:$PATH" >> $GITHUB_ENV
+          echo FC=gfortran-14 >> $GITHUB_ENV
+
+      - name: Configure etsf-io
+        run: |
+          mkdir src/group_level/
+          bash -e autogen.sh
+          mkdir build/
+          cd build/
+          ../configure --with-netcdf-incs="$(pkg-config --cflags netcdf-fortran)"  --with-netcdf-libs="$(pkg-config --libs netcdf-fortran)"
+        env:
+          FFLAGS: "-O0 -g3 -fno-omit-frame-pointer -fsanitize=address"
+          LDFLAGS: "-fsanitize=address"
+
+      - name: Compile etsf-io
+        working-directory: build/
+        run: |
+          make -j V=1
+
+      # - name: Test etsf-io
+      #   working-directory: build/
+      #   run: |
+      #     make -j check V=1
+
+      - uses: actions/upload-artifact@v4
+        if: always()
+        with:
+          path: build/config.log

.gitignore

@@ -0,0 +1,33 @@
+# Build-system files
+/aclocal.m4
+/autom4te.cache/
+/configure
+/configure~
+/config/gnu/
+/config/m4/libtool.m4
+/config/m4/ltoptions.m4
+/config/m4/ltsugar.m4
+/config/m4/ltversion.m4
+/config/m4/lt~obsolete.m4
+Makefile.in
+
+# Generated source files
+/src/group_level/
+/src/low_level/read_routines_auto.f90
+/src/low_level/write_routines_auto.f90
+/src/utils/Makefile.am
+/src/utils/etsf_io_file.f90
+/src/utils/etsf_io_file_check_crystallographic_data.f90
+/src/utils/etsf_io_file_check_dielectric_function_data.f90
+/src/utils/etsf_io_file_check_scalar_field_data.f90
+/src/utils/etsf_io_file_check_wavefunctions_data.f90
+/src/utils/etsf_io_file_contents.f90
+
+# Generated tests
+/tests/group_level/tests_copy.f90
+/tests/group_level/tests_init.f90
+/tests/group_level/tests_read.f90
+/tests/group_level/tests_write.f90
+
+# Documentation
+/robodoc.log

autogen.sh

@@ -22,6 +22,8 @@ echo
 echo "== Generate build system =="
 echo "Listing known macro with 'aclocal'."
 aclocal -I config/m4
+echo "Prepare package to use libtool."
+libtoolize
 echo "Creating configure script  with 'autoconf'."
 autoconf
 echo "Creating required files for autotools."

config/etsf/template.Makefile.am

@@ -1,4 +1,4 @@
-lib_LIBRARIES = libetsf_io.a
+lib_LTLIBRARIES = libetsf_io.la
 
 EXTRA_DIST = \
 @INCLUDED_FILES@
@@ -19,13 +19,13 @@ endif
 
 AM_FCFLAGS = -I$(top_builddir)/src/low_level -I$(srcdir) @NETCDF_INCLUDES@
 
-libetsf_io_a_SOURCES = etsf_io.f90
+libetsf_io_la_SOURCES = etsf_io.f90
 
-libetsf_io_a_LIBADD = $(top_builddir)/src/low_level/etsf_io_low_level.o \
+libetsf_io_la_LIBADD = $(top_builddir)/src/low_level/libetsf_io_low_level.la \
 	$(NETCDF_WRAPPERS)
 
 #dependencies
-etsf_io.o: etsf_io.f90 \
+$(libetsf_io_la_OBJECTS): etsf_io.f90 \
 @INCLUDED_FILES@
 
-ETSF_IO.@MODULE_EXT@ etsf_io.@MODULE_EXT@: etsf_io.o
+ETSF_IO.@MODULE_EXT@ etsf_io.@MODULE_EXT@: $(libetsf_io_la_OBJECTS)

config/etsf/template.utils_Makefile.am

@@ -1,8 +1,8 @@
-vpath %.a $(top_builddir)/src/group_level
+vpath %.la $(top_builddir)/src/group_level
 
 bin_PROGRAMS = etsf_io
 
-lib_LIBRARIES = libetsf_io_utils.a
+lib_LTLIBRARIES = libetsf_io_utils.la
 
 EXTRA_DIST = \
 @SPEC_CHECK_LIST@
@@ -20,27 +20,25 @@ CLEANFILES = $(module_DATA)
 
 AM_FCFLAGS = -I$(top_builddir)/src/low_level -I$(top_builddir)/src/group_level @NETCDF_INCLUDES@
 
-libetsf_io_utils_a_SOURCES = etsf_io_file.f90 \
+libetsf_io_utils_la_SOURCES = etsf_io_file.f90 \
 	etsf_io_tools.f90
 
 etsf_io_SOURCES = etsf_io.f90
 etsf_io_LDFLAGS = -L$(top_builddir)/src/group_level -L.
-etsf_io_LDADD = -letsf_io_utils -letsf_io
+etsf_io_LDADD = libetsf_io_utils.la $(top_builddir)/src/group_level/libetsf_io.la
 
 
 #dependencies
-etsf_io_file.o: libetsf_io.a \
+$(libetsf_io_utils_la_OBJECTS): libetsf_io.la \
 @SPEC_CHECK_LIST@
 	etsf_io_file_contents.f90 \
 	etsf_io_file_private.f90 \
 	etsf_io_file_public.f90
 
-etsf_io_tools.o: libetsf_io.a
-
-etsf_io.o: libetsf_io_utils.a
+$(etsf_io_OBJECTS): libetsf_io_utils.la
 
 ETSF_IO_FILE.@MODULE_EXT@ etsf_io_file.@MODULE_EXT@: \
-	etsf_io_file.o
+	libetsf_io_utils.la
 
 ETSF_IO_TOOLS.@MODULE_EXT@ etsf_io_tools.@MODULE_EXT@: \
-	etsf_io_tools.o
+	libetsf_io_utils.la

config/scripts/autogen_low_level.py

@@ -10,7 +10,7 @@
 
 from time import gmtime,strftime
 
-import commands
+import subprocess
 import os
 import re
 import sys
@@ -27,17 +27,17 @@
 
 # Check if we are in the top of the ETSF_IO source tree
 if ( not os.path.exists("configure.ac") ):
- print "%s: You must be in the top of the library source tree." % my_name
- print "%s: Aborting now." % my_name
+ print("%s: You must be in the top of the library source tree." % my_name)
+ print("%s: Aborting now." % my_name)
  sys.exit(1)
 
 # Read config file(s)
 for cnf in my_configs:
  if ( os.path.exists(cnf) ):
-  execfile(cnf)
+  exec(compile(open(cnf, "rb").read(), cnf, 'exec'))
  else:
-  print "%s: Could not find config file (%s)." % (my_name,cnf)
-  print "%s: Aborting now." % my_name
+  print("%s: Could not find config file (%s)." % (my_name,cnf))
+  print("%s: Aborting now." % my_name)
   sys.exit(2)
 
 # This script auto generate the read method for the nD dimensional arrays.
@@ -58,8 +58,8 @@
 banner += "!================================================================\n"
 
 # We load the template and replace in it.
-var_template = file("config/etsf/template.low_level_var", "r").read()
-att_template = file("config/etsf/template.low_level_att", "r").read()
+var_template = open("config/etsf/template.low_level_var", "r").read()
+att_template = open("config/etsf/template.low_level_att", "r").read()
 
 for (action, tgt_file) in NC_ACTION:
   if (action == "read"):
@@ -132,7 +132,7 @@
       ret += sub_src + "\n"
 
   # We create the file
-  out = file("%s/%s_routines_auto.f90" % (etsf_low_level_file_srcdir, action), "w")
+  out = open("%s/%s_routines_auto.f90" % (etsf_low_level_file_srcdir, action), "w")
   out.write(banner + "\n" + ret)
   out.close()
 
@@ -258,7 +258,7 @@
         ret += sub_src + "\n"
 
   # We create the file
-  out = file("%s/%s_routines_auto.f90" % (etsf_low_level_file_srcdir, action), "w")
+  out = open("%s/%s_routines_auto.f90" % (etsf_low_level_file_srcdir, action), "w")
   out.write(banner + "\n" + ret)
   out.close()
 

config/scripts/autogen_module.py

@@ -10,7 +10,7 @@
 
 from time import gmtime,strftime
 
-import commands
+import subprocess
 import os
 import re
 import sys
@@ -30,22 +30,22 @@
 
 # Check if we are in the top of the ETSF_IO source tree
 if ( not os.path.exists("configure.ac") ):
- print "%s: You must be in the top of the library source tree." % my_name
- print "%s: Aborting now." % my_name
+ print("%s: You must be in the top of the library source tree." % my_name)
+ print("%s: Aborting now." % my_name)
  sys.exit(1)
 
 # Read config file(s)
 for cnf in my_configs:
  if ( os.path.exists(cnf) ):
-  execfile(cnf)
+  exec(compile(open(cnf, "rb").read(), cnf, 'exec'))
  else:
-  print "%s: Could not find config file (%s)." % (my_name,cnf)
-  print "%s: Aborting now." % my_name
+  print("%s: Could not find config file (%s)." % (my_name,cnf))
+  print("%s: Aborting now." % my_name)
   sys.exit(2)
 
 # Global attributes
 ead = " ! Global attributes"
-for att in etsf_attributes.keys():
+for att in list(etsf_attributes.keys()):
  att_desc = etsf_attributes[att]
 
  if ( att in etsf_properties ):
@@ -236,7 +236,7 @@
 ivlf = 0
 vlf += "  integer, parameter :: etsf_%-30s = 0\n" % "specs_none"
 vlf_id = "  character(len = *), parameter :: etsf_specs_names(%d) = (/ &\n" % len(etsf_specifications_files)
-for id in etsf_specifications_files.keys():
+for id in list(etsf_specifications_files.keys()):
   vlf += "  integer, parameter :: etsf_%-30s = %d\n" % (id, 2 ** ivlf)
   vlf_id += "    & \"%-25s\", &\n" % id
   ivlf += 1
@@ -246,7 +246,7 @@
 
 
 # Import template
-src = file("config/etsf/template.%s" % (etsf_modules["etsf_io"]),"r").read()
+src = open("config/etsf/template.%s" % (etsf_modules["etsf_io"]),"r").read()
 src = re.sub("@SCRIPT@",my_name,src)
 src = re.sub("@CONSTANTS@",ead,src)
 src = re.sub("@FLAGS_GROUPS@",egc,src)
@@ -260,6 +260,9 @@
 src = re.sub("@SPLIT_NAME_GROUP@",vsn,src)
 
 # Write module
-mod = file(etsf_file_module,"w")
+etsf_file_srcdir = os.path.dirname(etsf_file_module)
+if not os.path.exists(etsf_file_srcdir):
+   os.mkdir(etsf_file_srcdir)
+mod = open(etsf_file_module,"w")
 mod.write(src)
 mod.close()