Merge branch 'master' of github.com:highperformancecoder/ecolab

Author: highperformancecoder

Makefile

@@ -58,7 +58,7 @@ endif
 endif
 
 ifeq ($(OS),Darwin)
-CXXFLAGS+=-std=c++11
+CXXFLAGS+=-std=c++20
 endif
 
 VPATH+=src
@@ -119,7 +119,13 @@ endif
 all: all-without-models
 	$(MAKE) models 
 
-all-without-models: ecolab-libs lib/libecolab$(ECOLIBS_EXT).a bin/ecolab$(ECOLIBS_EXT)
+ifeq ($(OS),Linux)
+  ifndef MXE
+    ECOLAB_INTERPRETER=bin/ecolab$(ECOLIBS_EXT)
+  endif
+endif
+
+all-without-models: ecolab-libs lib/libecolab$(ECOLIBS_EXT).a $(ECOLAB_INTERPRETER)
 	-$(CHMOD) a+x $(SCRIPTS)
 # copy in the system built TCL library
 ifdef MXE
@@ -173,10 +179,13 @@ lib/libecolab$(ECOLIBS_EXT).a: $(OBJS) $(LIBMODS) graphcode
 	ar r $@ $(OBJS) $(LIBMODS) graphcode/*.o
 ifeq ($(OS),Darwin)
 	ranlib $@
-endif
+else
+  ifndef MXE
 	$(CPLUSPLUS) -shared -Wl,-soname,libecolab$(ECOLIBS_EXT).so.$(SOVERSION)  $(OBJS) $(LIBMODS) graphcode/*.o $(LIBS) -o lib/libecolab$(ECOLIBS_EXT).so.$(SOVERSION)
 	cd lib; ln -sf libecolab$(ECOLIBS_EXT).so.$(SOVERSION) libecolab$(ECOLIBS_EXT).so
 	cd lib; ln -sf libecolab$(ECOLIBS_EXT).so.$(SOVERSION) ecolab.so
+  endif
+endif
 
 $(MODS:%=lib/%): lib/%: src/%
 	cp $< $@
@@ -236,8 +245,8 @@ latex-docs:
 	if which latex; then cd doc; rm -f *.aux *.dvi *.log *.blg *.toc *.lof *.out; latex -interaction=batchmode ecolab; fi
 
 #bin/ecolab is a python interpreter supporting MPI
-bin/ecolab$(ECOLIBS_EXT): src/pythonMain.o lib/libecolab$(ECOLIBS_EXT).so
-	$(LINK) $(FLAGS) src/pythonMain.o -Wl,-rpath $(ECOLAB_HOME)/lib $(LIBS) -lboost_system -o $@
+bin/ecolab$(ECOLIBS_EXT): src/pythonMain.o lib/libecolab$(ECOLIBS_EXT).a
+	$(LINK) $(FLAGS) src/pythonMain.o -Wl,-rpath $(ECOLAB_HOME)/lib $(LIBS) -lboost_system$(BOOST_EXT) -o $@
 	-find . \( -name "*.cc" -o -name "*.h" \) -print |etags -
 
 .PHONY: install
@@ -269,11 +278,13 @@ UNURAN_LIB=$(firstword $(call search,lib*/libunuran.a))
 
 $(ECOLAB_HOME)/$(MCFG):
 	@rm -f $(MCFG)
+ifndef MXE
 # absolute dependencies
 	@if ! $(PKG_CONFIG) --exists python3; then \
 	   echo "Error: Cannot find Python libs - please install python3-dev"; \
 	   exit 1; \
 	fi
+endif
 # optional dependecies
 	@if [ -n "$(call search,lib*/tclConfig.sh)" ]; then echo TCL=1>>$(MCFG); fi
 	@if [ -n "$(call search,lib*/tkConfig.sh)" ]; then echo TK=1>>$(MCFG); fi

classdesc

@@ -26,6 +26,32 @@ DPCPP=
 # enables ecolab for the MXE environment 
 MXE=
 
+# choose 32 bits by preference
+ifdef MXE
+  MXE_32bit=$(shell if which i686-w64-mingw32.shared-g++>&/dev/null; then echo 1; fi)
+  MXE_64bit=$(shell if which x86_64-w64-mingw32.shared-g++>&/dev/null; then echo 1; fi)
+  ifeq ($(MXE_32bit),1)
+    MXE_PREFIX=i686-w64-mingw32.shared
+  else
+    ifeq ($(MXE_64bit),1)
+      MXE_PREFIX=x86_64-w64-mingw32.shared
+    else
+      $(error "MXE compiler not found")
+    endif
+    BOOST_EXT=-mt-x64
+  endif
+
+  # force 64 bit build
+  ifdef MXE64
+    MXE_64bit=$(shell if which x86_64-w64-mingw32.shared-g++>&/dev/null; then echo 1; fi)
+    ifeq ($(MXE_64bit),1)
+      MXE_PREFIX=x86_64-w64-mingw32.shared
+    else
+      $(error "MXE compiler not found")
+    endif
+  endif
+endif
+
 FLAGS+=-DECOLAB_HOME=\"$(ECOLAB_HOME)\"
 
 ifdef MPI_DEBUG
@@ -49,127 +75,123 @@ ICC=
 AQUA=
 
 ifneq ($(MAKECMDGOALS),clean)
-# configuration variables generated by make configure
-include $(ECOLAB_HOME)/include/Makefile.config
+  # configuration variables generated by make configure
+  include $(ECOLAB_HOME)/include/Makefile.config
 endif
 
 .SUFFIXES: .cd .d .rc $(SUFFIXES)
 VPATH=$(ECOLAB_HOME)/classdesc $(ECOLAB_HOME)/classdesc/json5_parser/json5_parser $(ECOLAB_HOME)/graphcode $(ECOLAB_HOME)/include
 PATH:=$(ECOLAB_HOME)/bin:$(PATH):$(HOME)/usr/bin
 CLASSDESC=$(ECOLAB_HOME)/bin/classdesc
-PKG_CONFIG_PATH:=$(HOME)/usr/lib/pkgconfig:/usr/local/lib/pkgconfig:/opt/local/lib/pkgconfig:$(PKG_CONFIG_PATH)
-PKG_CONFIG=env PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) pkg-config
-
-# where to look for installed software (prefix values)
-# nb Cygwin does not like /usr put here. Add it to the search command 
-DIRS=$(ECOLAB_HOME) $(HOME)/usr /usr/local /opt/local /usr/X11R6
-# a search mechanism to find a particular file
-# use as $(call search,name)
+
 ifdef MXE
-search=$(firstword $(foreach dir,$(DIRS),$(wildcard $(dir)/$(1))))
+  # rewrite ecolab home to be the mxe one
+  ifeq ($(ECOLAB_HOME),$(HOME)/usr/ecolab)
+    ECOLAB_HOME=$(HOME)/usr/mxe/ecolab
+  endif
+  # where to look for installed software (prefix values)
+  DIRS=$(ECOLAB_HOME) $(HOME)/usr/mxe $(subst bin/$(CPLUSPLUS),$(MXE_PREFIX),$(shell which $(CPLUSPLUS)))
+
+  # a search mechanism to find a particular file
+  # use as $(call search,name)
+  search=$(firstword $(foreach dir,$(DIRS),$(wildcard $(dir)/$(1))))
+
+  # xdr on MXE is positively ancient, so just disable it here
+  XDR=
+  PKG_CONFIG_PATH:=$(HOME)/usr/mxe/lib/pkgconfig:$(PKG_CONFIG_PATH)
+  PKG_CONFIG=env PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) $(MXE_PREFIX)-pkg-config
+  LIBS+=-lgdiplus
+
 else
-search=$(firstword $(foreach dir,$(DIRS) /usr,$(wildcard $(dir)/$(1))))
+  # where to look for installed software (prefix values)
+  # nb Cygwin does not like /usr put here. Add it to the search command 
+  DIRS=$(ECOLAB_HOME) $(HOME)/usr /usr/local /opt/local /usr/X11R6
+  # a search mechanism to find a particular file
+  # use as $(call search,name)
+  search=$(firstword $(foreach dir,$(DIRS) /usr,$(wildcard $(dir)/$(1))))
+
+  PKG_CONFIG_PATH:=$(HOME)/usr/lib/pkgconfig:/usr/local/lib/pkgconfig:/opt/local/lib/pkgconfig:$(PKG_CONFIG_PATH)
+  PKG_CONFIG=env PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) pkg-config
 endif
 
+# add standard list of search paths, -L/usr/lib32 must be before this statement
+LIBS+= $(DIRS:%=-L%/lib) 
+FLAGS+=$(DIRS:%=-I%/include)
+
 # where to find classdesc header files (eg pack_base.h)
 CDINCLUDE=$(ECOLAB_HOME)/include
 
 ifdef AEGIS
-# unused-variable warnings fail certain RAII usages in C++
-FLAGS+=-Werror -Wall -Wno-unused-variable -Wno-unused-function
-# for now, we maintain the code for C++98 standard
-# noexcept-type is a warning about ABI changes coming in C++17
-# Travis complains about unused-local-typedefs, so shut it up.
-CXXFLAGS+=-Wno-noexcept-type -Wno-unused-local-typedefs -std=c++20
+  # unused-variable warnings fail certain RAII usages in C++
+  FLAGS+=-Werror -Wall -Wno-unused-variable -Wno-unused-function
+  # for now, we maintain the code for C++98 standard
+  # noexcept-type is a warning about ABI changes coming in C++17
+  # Travis complains about unused-local-typedefs, so shut it up.
+  CXXFLAGS+=-Wno-noexcept-type -Wno-unused-local-typedefs -std=c++20
 endif
 
-# needed for generating .so files
 ifndef MXE
-FLAGS+=-fPIC
-endif
-
-# use mpicc etc by default if MPI set
-ifdef MPI
-HAVE_mpiCC=$(shell if which mpiCC>&/dev/null; then echo 1; fi)
-CC=mpicc
-ifeq ($(HAVE_mpiCC),1)
-CPLUSPLUS=mpiCC
-else
-# newer versions of mpich use this name!!
-CPLUSPLUS=mpicxx
-endif
-LINK=$(CPLUSPLUS)
-CPP=$(CPLUSPLUS) -E
-
-# disable inclusion of mpi++.h in the MPICH case (don't know what the problem is here)
-FLAGS+=-UHAVE_MPI_CPP
-else
-# Engage Intel OneAPI compiler
-ifdef DPCPP
-CPLUSPLUS=icpx
-SYCL+=-fsycl
-# -std=c++20 used to suppress warning messages
-FLAGS+=-std=c++20 -Wno-vla-cxx-extension
-else
-CPLUSPLUS=g++
-endif
-CC=gcc
-LINK=$(CPLUSPLUS) $(SYCL)
-CPP=g++ -E
-endif
-
-ifdef CCACHE
-CC:=ccache $(CC)
-CPLUSPLUS:=ccache $(CPLUSPLUS)
-endif
-
-# choose 32 bits by preference
-ifdef MXE
-MXE_32bit=$(shell if which i686-w64-mingw32.shared-g++>&/dev/null; then echo 1; fi)
-MXE_64bit=$(shell if which x86_64-w64-mingw32.shared-g++>&/dev/null; then echo 1; fi)
-ifeq ($(MXE_32bit),1)
-MXE_PREFIX=i686-w64-mingw32.shared
-else
-ifeq ($(MXE_64bit),1)
-MXE_PREFIX=x86_64-w64-mingw32.shared
-else
-$(error "MXE compiler not found")
-endif
-endif
-
-# force 64 bit build
-ifdef MXE64
-MXE_64bit=$(shell if which x86_64-w64-mingw32.shared-g++>&/dev/null; then echo 1; fi)
-ifeq ($(MXE_64bit),1)
-MXE_PREFIX=x86_64-w64-mingw32.shared
-else
-$(error "MXE compiler not found")
-endif
-endif
-
-GCC=1
-FLAGS+= -DNO_FWD_DECLARE_STL -DMXE -DSTATIC_BUILD
-CC=$(MXE_PREFIX)-gcc
-CPLUSPLUS=$(MXE_PREFIX)-g++
-LINK=$(CPLUSPLUS)
-CPP=$(CPLUSPLUS) -E
-# rewrite ecolab home to be the mxe one
-ifeq ($(ECOLAB_HOME),$(HOME)/usr/ecolab)
-ECOLAB_HOME=$(HOME)/usr/mxe/ecolab
-endif
-DIRS=$(ECOLAB_HOME) $(HOME)/usr/mxe $(subst bin/$(CPLUSPLUS),$(MXE_PREFIX),$(shell which $(CPLUSPLUS)))
-PKG_CONFIG_PATH:=$(HOME)/usr/mxe/lib/pkgconfig:$(PKG_CONFIG_PATH)
-PKG_CONFIG=env PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) $(MXE_PREFIX)-pkg-config
-LIBS+=-lgdiplus
-
-# xdr on MXE is positively ancient, so just disable it here
-XDR=
-
-# rule for running the resource compiler
-.rc.o:
+  # needed for generating .so files
+  FLAGS+=-fPIC
+
+  # use mpicc etc by default if MPI set
+  ifdef MPI
+    HAVE_mpiCC=$(shell if which mpiCC>&/dev/null; then echo 1; fi)
+    CC=mpicc
+    ifeq ($(HAVE_mpiCC),1)
+      CPLUSPLUS=mpiCC
+    else
+      # newer versions of mpich use this name!!
+      CPLUSPLUS=mpicxx
+    endif
+    LINK=$(CPLUSPLUS)
+    CPP=$(CPLUSPLUS) -E
+
+    # disable inclusion of mpi++.h in the MPICH case (don't know what the problem is here)
+    FLAGS+=-UHAVE_MPI_CPP
+  else
+    # Engage Intel OneAPI compiler
+    ifdef DPCPP
+      CPLUSPLUS=icpx
+      SYCL+=-fsycl
+      # -std=c++20 used to suppress warning messages
+      FLAGS+=-std=c++20 -Wno-vla-cxx-extension
+    else
+      CPLUSPLUS=g++
+    endif
+    CC=gcc
+    LINK=$(CPLUSPLUS) $(SYCL)
+    CPP=g++ -E
+  endif
+
+  ifdef CCACHE
+    CC:=ccache $(CC)
+    CPLUSPLUS:=ccache $(CPLUSPLUS)
+  endif
+
+  BOOST_EXT=
+  # try to autonomously figure out which boost extension we should be using
+  ifeq ($(shell if $(CPLUSPLUS) test/testmain.cc $(LIBS) -lboost_system>&/dev/null; then echo 1; else echo 0; fi),0)
+    ifeq ($(shell if $(CPLUSPLUS) test/testmain.cc $(LIBS) -lboost_system-mt>&/dev/null; then echo 1; else echo 0; fi),1)
+      BOOST_EXT=-mt
+    else
+      $(warning cannot figure out boost extension) 
+    endif
+  endif
+  $(warning Boost extension=$(BOOST_EXT))
+else # MXE
+  GCC=1
+  FLAGS+= -DNO_FWD_DECLARE_STL -DMXE -DSTATIC_BUILD
+  CC=$(MXE_PREFIX)-gcc
+  CPLUSPLUS=$(MXE_PREFIX)-g++
+  LINK=$(CPLUSPLUS)
+  CPP=$(CPLUSPLUS) -E
+
+  # rule for running the resource compiler
+  .rc.o:
 	$(MXE_PREFIX)-windres -O coff -i $< -o $@
 
-.rc.d:
+  .rc.d:
 	touch $@
 endif
 
@@ -196,7 +218,7 @@ endif
 ECOLIBS=$(ECOLAB_HOME)/lib/libecolab$(ECOLIBS_EXT).a
 
 # why is boost_thread required here?
-LIBS+=-L$(ECOLAB_HOME)/lib -lecolab$(ECOLIBS_EXT) -lboost_thread
+LIBS+=-L$(ECOLAB_HOME)/lib -lecolab$(ECOLIBS_EXT) -lboost_thread$(BOOST_EXT)
 FLAGS+=-I. -I$(ECOLAB_HOME)/classdesc -I$(ECOLAB_HOME)/classdesc/json5_parser/json5_parser -I$(ECOLAB_HOME)/graphcode -I$(ECOLAB_HOME)/include -I$(ECOLAB_HOME)/Ouroboros-SYCL/include -DHASH_TCL_hash
 
 # The following section uses GNU Make specific syntax. If not using
@@ -284,10 +306,6 @@ FLAGS+=-DTR1
 endif
 endif
 
-# add standard list of search paths, -L/usr/lib32 must be before this statement
-LIBS+= $(DIRS:%=-L%/lib) 
-FLAGS+=$(DIRS:%=-I%/include)
-
 # canonicalise CYGWIN's OS name
 ifeq ($(findstring CYGWIN,$(OS)),CYGWIN)
 OS=CYGWIN
@@ -590,7 +608,8 @@ LINK+=$(OPT)
 LIBMODS=
 
 # modules to include on the MODLINK command line
-ALWAYSLINK=tcl_arrays tclgraph analysis random cairo_types plot
+#ALWAYSLINK=analysis random cairo_types plot
+ALWAYSLINK=
 
 # for some reason, the -u option doesn't work with MXE
 ifdef MXE