From 7a4a4c05b49c00b82749495a988d9bbe3247c81b Mon Sep 17 00:00:00 2001 From: Ralf Mueller <ralf.mueller@dkrz.de> Date: Wed, 12 Jan 2022 11:52:27 +0100 Subject: [PATCH] Make f2003/bindGen.rb change Size- and DateType. --- interfaces/f2003/bindGen.rb | 3 +++ src/Makefile.am | 4 +--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/interfaces/f2003/bindGen.rb b/interfaces/f2003/bindGen.rb index 7cff34711..d1c6ba5a5 100755 --- a/interfaces/f2003/bindGen.rb +++ b/interfaces/f2003/bindGen.rb @@ -938,6 +938,9 @@ def scanHeader(headerPath) headerLines.each do |line| line.chomp! + line.gsub!(/SizeType/,'int') + line.gsub!(/DateType/,'int') + if /^\s*$/.match(line) #Empty lines are ignored. diff --git a/src/Makefile.am b/src/Makefile.am index d764a08aa..b4c74043a 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -284,9 +284,7 @@ endif # # cat $(top_srcdir)/src/cdi.h |sed -e 's/SizeType/size_t/g' -e s/DateType/int64_t/g > cditmp.h mo_cdi.f90: @MAINTAINER_MODE_TRUE@ $(top_srcdir)/src/cdi.h $(top_srcdir)/interfaces/f2003/bindGen.rb - cat $(top_srcdir)/src/cdi.h |sed -e 's/SizeType/int/g' -e s/DateType/int/g > cditmp.h - $(AM_V_GEN)$(RUBY) $(top_srcdir)/interfaces/f2003/bindGen.rb cditmp.h $@ - rm cditmp.h + $(AM_V_GEN)$(RUBY) $(top_srcdir)/interfaces/f2003/bindGen.rb $(top_srcdir)/src/cdi.h $@ if FORTRAN_MOD_UC MO_CDI.$(FCMODEXT): mo_cdi.lo -- GitLab