preparing for version 2.5.4

REPOSITORIES

@@ -2,13 +2,13 @@ Overview of former and current Takin repositories
 -------------------------------------------------
 
 - From 2019 till now:
-	https://code.ill.fr/scientific-software/takin
-	Main development repository group for Takin 2.
-
 	https://github.com/ILLGrenoble/takin
 	https://github.com/t-weber/takin2
 	Unified release repositories for Takin 2.
 
+	https://code.ill.fr/scientific-software/takin
+	Development repository group for Takin 2.
+
 - From 2016 till 2019:
 	https://github.com/t-weber/takin
 	Private repository for Takin 1.

core/LICENSES.txt

@@ -207,8 +207,9 @@ License: GNU GPL version 2 (see below) or FreeType License
 
 
 --------------------------------------------------------------------------------
-Lapack & Lapacke
+Lapack, Lapacke, and included BLAS
 URL: http://www.netlib.org/lapack
+URL: https://github.com/Reference-LAPACK/lapack
 License URL: http://www.netlib.org/lapack/LICENSE.txt
 
 Copyright (c) 1992-2013 by The University of Tennessee and The University

core/setup/get_3rdparty_licenses.sh

@@ -155,6 +155,11 @@ if ! wget https://raw.githubusercontent.com/gcc-mirror/gcc/master/COPYING.RUNTIM
 	echo -e "Error: Cannot download gcc_runtime license.";
 fi
 
+# libquadmath
+if ! wget https://raw.githubusercontent.com/gcc-mirror/gcc/master/libquadmath/COPYING.LIB -O ${LICDIR}/libquadmath_license.txt; then
+	echo -e "Error: Cannot download libquadmath license.";
+fi
+
 # hdf5
 if ! wget https://raw.githubusercontent.com/HDFGroup/hdf5/develop/COPYING -O ${LICDIR}/hdf5_license.txt; then
 	echo -e "Error: Cannot download hdf5 license.";
@@ -164,3 +169,33 @@ fi
 if ! wget https://gitlab.dkrz.de/k202009/libaec/-/raw/master/LICENSE.txt -O ${LICDIR}/libaec_license.txt; then
 	echo -e "Error: Cannot download libaec license.";
 fi
+
+# libharfbuzz
+if ! wget https://raw.githubusercontent.com/harfbuzz/harfbuzz/main/COPYING -O ${LICDIR}/harfbuzz_license.txt; then
+	echo -e "Error: Cannot download harfbuzz license.";
+fi
+
+# libbzip2
+if ! wget https://raw.githubusercontent.com/libarchive/bzip2/master/COPYING -O ${LICDIR}/bzip2_license.txt; then
+	echo -e "Error: Cannot download bzip2 license.";
+fi
+
+# zlib
+if ! wget https://raw.githubusercontent.com/libarchive/zlib/master/LICENSE -O ${LICDIR}/zlib_license.txt; then
+	echo -e "Error: Cannot download zlib license.";
+fi
+
+# libiconv
+if ! wget https://git.savannah.gnu.org/cgit/libiconv.git/plain/COPYING.LIB -O ${LICDIR}/libiconv_license.txt; then
+	echo -e "Error: Cannot download libiconv license.";
+fi
+
+# mingw64
+if ! wget https://raw.githubusercontent.com/mingw-w64/mingw-w64/master/COPYING -O ${LICDIR}/mingw64_license.txt; then
+	echo -e "Error: Cannot download mingw64 license.";
+fi
+
+# winpthreads
+if ! wget https://raw.githubusercontent.com/mingw-w64/mingw-w64/master/mingw-w64-libraries/winpthreads/COPYING -O ${LICDIR}/winpthreads_license.txt; then
+	echo -e "Error: Cannot download winpthreads license.";
+fi

magnon-plugin/src/magnonmod.cpp

@@ -26,8 +26,6 @@
  * ----------------------------------------------------------------------------
  */
 
-// g++ -std=c++20 -I../ext -I../ext/takin -I/usr/include/lapacke -Iext/lapacke/include -Lext/lapacke/lib -I/usr/local/opt/lapack/include -L/usr/local/opt/lapack/lib -shared -fPIC -o magnonmod.so magnonmod.cpp ../ext/takin/tools/monteconvo/sqwbase.cpp ../ext/tlibs/log/log.cpp -llapacke
-
 #include "magnonmod.h"
 
 #include "libs/version.h"
@@ -308,22 +306,35 @@ SqwBase* MagnonMod::shallow_copy() const
 // ----------------------------------------------------------------------------
 // SO interface
 
-#include <boost/dll/alias.hpp>
+#ifndef __MINGW32__
 
+#include <boost/dll/alias.hpp>
 
 std::tuple<std::string, std::string, std::string> sqw_info()
 {
 	return std::make_tuple(TAKIN_VER, "magnonmod", "Magnetic Dynamics");
 }
 
-
 std::shared_ptr<SqwBase> sqw_construct(const std::string& cfg_file)
 {
 	return std::make_shared<MagnonMod>(cfg_file);
 }
 
-
 // exports from so file
 BOOST_DLL_ALIAS(sqw_info, takin_sqw_info);
 BOOST_DLL_ALIAS(sqw_construct, takin_sqw);
+
+#else  // mingw exports
+
+extern "C" std::tuple<std::string, std::string, std::string> takin_sqw_info()
+{
+	return std::make_tuple(TAKIN_VER, "magnonmod", "Magnetic Dynamics");
+}
+
+extern "C" std::shared_ptr<SqwBase> takin_sqw(const std::string& cfg_file)
+{
+	return std::make_shared<MagnonMod>(cfg_file);
+}
+
+#endif
 // ----------------------------------------------------------------------------

tlibs/REPOSITORIES

@@ -4,12 +4,12 @@ Overview of former and current tlibs repositories
 - From 2019 till now:
 	https://code.ill.fr/scientific-software/takin/tlibs
 	https://code.ill.fr/scientific-software/takin/tlibs2
-	Main development repositories for tlibs 1/2.
+	Development repositories for tlibs 1/2.
 
 - From 2016 till 2019:
 	https://github.com/t-weber/tlibs
 	Private repository for tlibs 1.
 
 - From 2015 till 2017:
-	https://forge.frm2.tum.de/cgit/cgit.cgi/frm2/mira/tlibs.git/
+	https://forge.frm2.tum.de/cgit/cgit.cgi/frm2/mira/tlibs.git
 	Former main development repository for tlibs 1.

tlibs2/REPOSITORIES

@@ -4,7 +4,7 @@ Overview of former and current tlibs repositories
 - From 2019 till now:
 	https://code.ill.fr/scientific-software/takin/tlibs
 	https://code.ill.fr/scientific-software/takin/tlibs2
-	Main development repositories for tlibs 1/2.
+	Development repositories for tlibs 1/2.
 
 - From 2016 till 2019:
 	https://github.com/t-weber/tlibs