preparing for version 2.5.4

ILLGrenoble · Aug 24, 2023 · 068162a · 068162a
1 parent d2276c0
commit 068162a
Show file tree

Hide file tree

Showing 17 changed files with 85 additions and 71 deletions.
diff --git a/core/doc/documentation.txt b/core/doc/documentation.txt
@@ -1,2 +1,2 @@
-The user documentation has moved to here:
-https://code.ill.fr/scientific-software/takin/core/-/wikis/home
+The user documentation has moved to:
+https://github.com/ILLGrenoble/takin/wiki
diff --git a/core/setup/clean.sh b/core/setup/clean.sh
@@ -31,11 +31,6 @@ rm -fv bin/*.exe
 rm -fv plugins/*.so
 rm -fv plugins/*.dll
 
-rm -fv doc/takin.qch
-rm -fv doc/takin.qhc
-rm -rfv doc/devel/html
-rm -fv doc/devel/*.tmp
-
 if [ -f Makefile ]
 then
 	echo -e "\nCleaning stuff made by Makefile..."

diff --git a/core/setup_lin/cp_takin.sh b/core/setup_lin/cp_takin.sh
@@ -58,7 +58,6 @@ cp -rv data/demos 		${INSTDIR}/
 # resources
 mkdir ${INSTDIR}/res
 cp -rv res/* ${INSTDIR}/res/
-cp -rv doc/*.html ${INSTDIR}/res/doc/
 gunzip -v ${INSTDIR}/res/data/*
 
 

diff --git a/core/setup_lin/mkdeb_bionic.sh b/core/setup_lin/mkdeb_bionic.sh
@@ -63,7 +63,6 @@ cp -v bin/takinmod_py		${INSTDIR}/usr/local/bin
 cp -v bin/takinmod_jl		${INSTDIR}/usr/local/bin
 
 cp -rv res/*			${INSTDIR}/usr/local/share/takin/res/
-cp -rv doc/* 			${INSTDIR}/usr/local/share/takin/res/doc/
 cp -rv 3rdparty_licenses/*	${INSTDIR}/usr/local/share/takin/3rdparty_licenses/
 cp -v *.txt			${INSTDIR}/usr/local/share/takin
 cp -v setup_lin/takin.desktop		${INSTDIR}/usr/share/applications

diff --git a/core/setup_lin/mkdeb_bullseye.sh b/core/setup_lin/mkdeb_bullseye.sh
@@ -4,6 +4,7 @@
 # @author Tobias Weber <[email protected]>, Jens Krüger
 # @date 3 february 2023
 # @license GPLv2
+# @note based on the mkdeb_jammy.sh script
 #
 # ----------------------------------------------------------------------------
 # Takin (inelastic neutron scattering software package)
@@ -93,7 +94,6 @@ cp -v bin/takinmod_py		${INSTDIR}/usr/local/bin
 cp -v bin/takinmod_jl		${INSTDIR}/usr/local/bin
 
 cp -rv res/*			${INSTDIR}/usr/local/share/takin/res/
-cp -rv doc/* 			${INSTDIR}/usr/local/share/takin/res/doc/
 cp -v *.txt			${INSTDIR}/usr/local/share/takin
 cp -rv 3rdparty_licenses/*	${INSTDIR}/usr/local/share/takin/3rdparty_licenses/
 cp -v setup_lin/takin.desktop	${INSTDIR}/usr/share/applications

diff --git a/core/setup_lin/mkdeb_deb10.sh b/core/setup_lin/mkdeb_deb10.sh
@@ -63,7 +63,6 @@ cp -v bin/takinmod_py		${INSTDIR}/usr/local/bin
 cp -v bin/takinmod_jl		${INSTDIR}/usr/local/bin
 
 cp -rv res/*			${INSTDIR}/usr/local/share/takin/res/
-cp -rv doc/* 			${INSTDIR}/usr/local/share/takin/res/doc/
 cp -v *.txt			${INSTDIR}/usr/local/share/takin
 cp -rv 3rdparty_licenses/*	${INSTDIR}/usr/local/share/takin/3rdparty_licenses/
 cp -v setup_lin/takin.desktop	${INSTDIR}/usr/share/applications

diff --git a/core/setup_lin/mkdeb_jammy.sh b/core/setup_lin/mkdeb_jammy.sh
@@ -2,6 +2,7 @@
 #
 # creates a DEB distro
 # @author Tobias Weber <[email protected]>
+# @date july 2022
 # @license GPLv2
 #
 # ----------------------------------------------------------------------------
@@ -93,7 +94,6 @@ cp -v bin/takinmod_py		${INSTDIR}/usr/local/bin
 cp -v bin/takinmod_jl		${INSTDIR}/usr/local/bin
 
 cp -rv res/*			${INSTDIR}/usr/local/share/takin/res/
-cp -rv doc/* 			${INSTDIR}/usr/local/share/takin/res/doc/
 cp -v *.txt			${INSTDIR}/usr/local/share/takin
 cp -rv 3rdparty_licenses/*	${INSTDIR}/usr/local/share/takin/3rdparty_licenses/
 cp -v setup_lin/takin.desktop	${INSTDIR}/usr/share/applications

diff --git a/core/setup_mingw/cp_mingw_takin.sh b/core/setup_mingw/cp_mingw_takin.sh
@@ -57,7 +57,6 @@ cp -rv data/demos 		${INSTDIR}/
 # resources
 mkdir ${INSTDIR}/res
 cp -rv res/* ${INSTDIR}/res/
-cp -rv doc/*.html ${INSTDIR}/res/doc/
 gunzip -v ${INSTDIR}/res/data/*
 
 

diff --git a/data/res/doc/.dir b/data/res/doc/.dir
diff --git a/mag-core/CMakeLists.txt b/mag-core/CMakeLists.txt
@@ -47,11 +47,11 @@ add_subdirectory(tools/magdyn)
 # molecular dynamics tool
 add_subdirectory(tools/moldyn)
 
-# scan browser tool
-add_subdirectory(tools/scanbrowser)
-
 
 if(NOT ONLY_BUILD_FINISHED)
+	# scan browser tool
+	add_subdirectory(tools/scanbrowser)
+
 	# setup tools
 	add_subdirectory(tools/setup)
 

diff --git a/mag-core/setup/setup_externals.sh b/mag-core/setup/setup_externals.sh
@@ -38,7 +38,6 @@ QCP=https://www.qcustomplot.com/release/2.0.1/QCustomPlot-source.tar.gz
 GEMMI=https://github.com/project-gemmi/gemmi/archive/master.zip
 MAGDATA=https://stokes.byu.edu/iso/magnetic_data.txt
 PATHSLIB=https://code.ill.fr/scientific-software/takin/paths/-/archive/master/paths-master.tar.bz2
-#TLIBS=https://forge.frm2.tum.de/cgit/cgit.cgi/frm2/mira/tlibs.git/snapshot/tlibs-master.tar.bz2
 
 # local file names
 QCP_LOCAL=${QCP##*[/\\]}
@@ -157,10 +156,10 @@ echo -e "Installing external Gemmi library...\n"
 dl_gemmi
 echo -e "--------------------------------------------------------------------------------\n"
 
-echo -e "\n--------------------------------------------------------------------------------"
-echo -e "Installing external TAS-Paths library...\n"
-dl_pathslib
-echo -e "--------------------------------------------------------------------------------\n"
+#echo -e "\n--------------------------------------------------------------------------------"
+#echo -e "Installing external TAS-Paths library...\n"
+#dl_pathslib
+#echo -e "--------------------------------------------------------------------------------\n"
 
 #echo -e "\n--------------------------------------------------------------------------------"
 #echo -e "Downloading magnetic space group data...\n"

diff --git a/setup/build_lin/build_bullseye.sh b/setup/build_lin/build_bullseye.sh
@@ -4,6 +4,7 @@
 # @author Tobias Weber <[email protected]>, Jens Krüger
 # @date 3 february 2023
 # @license GPLv2
+# @note based on the build_jammy.sh script
 #
 # ----------------------------------------------------------------------------
 # Takin (inelastic neutron scattering software package)
@@ -34,12 +35,28 @@ setup_externals2=1
 build_externals=1
 build_takin=1
 build_takin2=1
+build_plugins=0
 build_package=1
 
 
 NUM_CORES=$(nproc)
 
 
+# parse command-line options
+for((arg_idx=1; arg_idx<=$#; ++arg_idx)); do
+	arg="${!arg_idx}"
+	# look for argument identifier
+	if [[ "$arg" =~ [_A-Za-z][_A-Za-z0-9]* ]]; then
+		# get the argument's parameter
+		param_idx=$((arg_idx+1))
+		param="${!param_idx}"
+
+		# set the argument to the given parameter
+		export $arg=${param}
+	fi
+done
+
+
 # get root dir of takin repos
 TAKIN_ROOT=$(dirname $0)/../..
 cd "${TAKIN_ROOT}"
@@ -137,6 +154,24 @@ if [ $build_takin2 -ne 0 ]; then
 fi
 
 
+if [ $build_plugins -ne 0 ]; then
+	echo -e "\n================================================================================"
+	echo -e "Building Takin plugins..."
+	echo -e "================================================================================\n"
+
+	pushd "${TAKIN_ROOT}/magnon-plugin"
+		rm -rf build
+		mkdir -p build
+		cd build
+		cmake -DCMAKE_BUILD_TYPE=Release ..
+		make -j${NUM_CORES}
+
+		# copy plugin to Takin main dir
+		cp -v libmagnonmod.so "${TAKIN_ROOT}"/core/plugins/
+	popd
+fi
+
+
 if [ $build_package -ne 0 ]; then
 	echo -e "\n================================================================================"
 	echo -e "Building Takin package..."

diff --git a/setup/build_lin/build_jammy.sh b/setup/build_lin/build_jammy.sh
@@ -7,7 +7,7 @@
 #
 # ----------------------------------------------------------------------------
 # Takin (inelastic neutron scattering software package)
-# Copyright (C) 2017-2021  Tobias WEBER (Institut Laue-Langevin (ILL),
+# Copyright (C) 2017-2023  Tobias WEBER (Institut Laue-Langevin (ILL),
 #                          Grenoble, France).
 # Copyright (C) 2013-2017  Tobias WEBER (Technische Universitaet Muenchen
 #                          (TUM), Garching, Germany).
@@ -41,6 +41,21 @@ build_package=1
 NUM_CORES=$(nproc)
 
 
+# parse command-line options
+for((arg_idx=1; arg_idx<=$#; ++arg_idx)); do
+	arg="${!arg_idx}"
+	# look for argument identifier
+	if [[ "$arg" =~ [_A-Za-z][_A-Za-z0-9]* ]]; then
+		# get the argument's parameter
+		param_idx=$((arg_idx+1))
+		param="${!param_idx}"
+
+		# set the argument to the given parameter
+		export $arg=${param}
+	fi
+done
+
+
 # get root dir of takin repos
 TAKIN_ROOT=$(dirname $0)/../..
 cd "${TAKIN_ROOT}"
@@ -138,22 +153,22 @@ if [ $build_takin2 -ne 0 ]; then
 fi
 
 
-#if [ $build_plugins -ne 0 ]; then
-#	echo -e "\n================================================================================"
-#	echo -e "Building Takin plugins..."
-#	echo -e "================================================================================\n"
-#
-#	pushd "${TAKIN_ROOT}/plugins/magnons"
-#		rm -rf build
-#		mkdir -p build
-#		cd build
-#		cmake -DCMAKE_BUILD_TYPE=Release ..
-#		make -j${NUM_CORES}
-#
-#		# copy plugin to Takin main dir
-#		cp -v libmagnonmod.so "${TAKIN_ROOT}"/core/plugins/
-#	popd
-#fi
+if [ $build_plugins -ne 0 ]; then
+	echo -e "\n================================================================================"
+	echo -e "Building Takin plugins..."
+	echo -e "================================================================================\n"
+
+	pushd "${TAKIN_ROOT}/magnon-plugin"
+		rm -rf build
+		mkdir -p build
+		cd build
+		cmake -DCMAKE_BUILD_TYPE=Release ..
+		make -j${NUM_CORES}
+
+		# copy plugin to Takin main dir
+		cp -v libmagnonmod.so "${TAKIN_ROOT}"/core/plugins/
+	popd
+fi
 
 
 if [ $build_package -ne 0 ]; then

diff --git a/setup/misc/backup.sh → setup/mirror/backup.sh b/setup/misc/backup.sh → setup/mirror/backup.sh
@@ -29,35 +29,17 @@
 #
 
 declare -a REPOS_ILL=(
+	"https://github.com/ILLGrenoble/takin"
+	"https://github.com/ILLGrenoble/taspaths"
 	"https://code.ill.fr/scientific-software/takin/core"
 	"https://code.ill.fr/scientific-software/takin/mag-core"
 	"https://code.ill.fr/scientific-software/takin/tlibs"
 	"https://code.ill.fr/scientific-software/takin/tlibs2"
 	"https://code.ill.fr/scientific-software/takin/setup"
 	"https://code.ill.fr/scientific-software/takin/data"
 	"https://code.ill.fr/scientific-software/takin/plugins/mnsi"
+	"https://code.ill.fr/scientific-software/takin/plugins/magnons"
 	"https://code.ill.fr/scientific-software/takin/paths"
-	"https://code.ill.fr/tweber/tlibs2_magnon_helpers"
-	"https://code.ill.fr/tweber/hercules"
-	"https://code.ill.fr/tweber/thesis"
-	"https://code.ill.fr/tweber/takin-mnsi"
-	"https://code.ill.fr/tweber/in20tools"
-)
-
-declare -a REPOS_PRIVATE=(
-	"https://github.com/t-weber/takin"
-	"https://github.com/t-weber/takin2"
-	"https://github.com/t-weber/tlibs"
-	"https://github.com/t-weber/misc"
-	"https://github.com/t-weber/lr1"
-	"https://github.com/t-weber/matrix_calc"
-	"https://github.com/t-weber/geo"
-	"https://github.com/t-weber/qm"
-	"https://github.com/t-weber/os-seminar"
-	"https://github.com/t-weber/magtools"
-	"https://github.com/t-weber/libcrystal"
-	"https://github.com/t-weber/qthelpers"
-	"https://github.com/t-weber/takin-data"
 )
 
 
@@ -79,16 +61,6 @@ done
 popd
 
 
-mkdir -v -p priv
-pushd priv
-for repo in ${REPOS_PRIVATE[@]}; do
-	echo "Cloning ${repo}..."
-	git clone -v --recurse-submodules ${repo}
-	echo -e "\n"
-done
-popd
-
-
 mkdir -v -p frm
 pushd frm
 for repo in ${REPOS_FRM[@]}; do

diff --git a/setup/checkout.sh → setup/mirror/checkout.sh b/setup/checkout.sh → setup/mirror/checkout.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# checkout all of takin's repos
+# checkout all of takin's development repos
 # @author Tobias Weber <[email protected]>
 # @date jul-20
 # @license GPLv2

diff --git a/setup/misc/mirror.sh → setup/mirror/mirror.sh b/setup/misc/mirror.sh → setup/mirror/mirror.sh
@@ -39,6 +39,7 @@ declare -a repo_dirs=(
 	"ill_mirror-takin2-data"
 	"ill_mirror-takin2-paths"
 	"ill_mirror-takin2-mnsi"
+	"ill_mirror-takin2-magnons"
 )
 
 

diff --git a/setup/misc/mirror_setup.sh → setup/mirror/mirror_setup.sh b/setup/misc/mirror_setup.sh → setup/mirror/mirror_setup.sh
@@ -38,6 +38,7 @@ declare -a repos_orig=(
 	"https://code.ill.fr/scientific-software/takin/data"
 	"https://code.ill.fr/scientific-software/takin/paths"
 	"https://code.ill.fr/scientific-software/takin/plugins/mnsi"
+	"https://code.ill.fr/scientific-software/takin/plugins/magnons"
 )
 
 declare -a repos_mirror=(
@@ -49,6 +50,7 @@ declare -a repos_mirror=(
 	"https://github.com/tweber-ill/ill_mirror-takin2-data"
 	"https://github.com/tweber-ill/ill_mirror-takin2-paths"
 	"https://github.com/tweber-ill/ill_mirror-takin2-mnsi"
+	"https://github.com/tweber-ill/ill_mirror-takin2-magnons"
 )