From da6d41eaf98c7a7bcd8204326cab19afd22f3811 Mon Sep 17 00:00:00 2001 From: Peter Willendrup Date: Mon, 5 Aug 2024 15:01:15 +0200 Subject: [PATCH 1/2] Remove old "switch between branches" logic --- buildscripts/build_loc_3.x_ess | 2 +- buildscripts/build_loc_3.x_mac | 2 +- buildscripts/build_loc_3.x_mac_conda | 2 +- buildscripts/build_loc_3.x_tree | 2 +- buildscripts/build_loc_mcx_3x_mac.sh | 2 +- buildscripts/build_pkg_ghostbsd | 2 +- buildscripts/xbuild_loc_3.x_tree | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/buildscripts/build_loc_3.x_ess b/buildscripts/build_loc_3.x_ess index 129b58453..4a34e0e32 100755 --- a/buildscripts/build_loc_3.x_ess +++ b/buildscripts/build_loc_3.x_ess @@ -4,7 +4,7 @@ export CMAKE_BUILD_PARALLEL_LEVEL=${CMAKE_BUILD_PARALLEL_LEVEL:-$(python3 -c "im # rapid-build script for mcstas-kernel dev: -git checkout main + git pull # Ensure our 3rd party modules are in place and updated diff --git a/buildscripts/build_loc_3.x_mac b/buildscripts/build_loc_3.x_mac index 60c93420b..01d7ff2a8 100755 --- a/buildscripts/build_loc_3.x_mac +++ b/buildscripts/build_loc_3.x_mac @@ -4,7 +4,7 @@ export CMAKE_BUILD_PARALLEL_LEVEL=${CMAKE_BUILD_PARALLEL_LEVEL:-$(python3 -c "im # rapid-build script for mcstas-kernel dev: -#git checkout main + git pull # Ensure our 3rd party modules are in place and updated diff --git a/buildscripts/build_loc_3.x_mac_conda b/buildscripts/build_loc_3.x_mac_conda index fa6708991..374d40947 100755 --- a/buildscripts/build_loc_3.x_mac_conda +++ b/buildscripts/build_loc_3.x_mac_conda @@ -4,7 +4,7 @@ export CMAKE_BUILD_PARALLEL_LEVEL=${CMAKE_BUILD_PARALLEL_LEVEL:-$(python3 -c "im # rapid-build script for mcstas-kernel dev: -#git checkout main + #git pull # Ensure our 3rd party modules are in place and updated diff --git a/buildscripts/build_loc_3.x_tree b/buildscripts/build_loc_3.x_tree index 8d527a531..f421df3a3 100755 --- a/buildscripts/build_loc_3.x_tree +++ b/buildscripts/build_loc_3.x_tree @@ -4,7 +4,7 @@ export CMAKE_BUILD_PARALLEL_LEVEL=${CMAKE_BUILD_PARALLEL_LEVEL:-$(python3 -c "im # rapid-build script for mcstas-kernel dev: -git checkout main + git pull # Ensure our 3rd party modules are in place and updated diff --git a/buildscripts/build_loc_mcx_3x_mac.sh b/buildscripts/build_loc_mcx_3x_mac.sh index c749cd740..2c61aa3e3 100755 --- a/buildscripts/build_loc_mcx_3x_mac.sh +++ b/buildscripts/build_loc_mcx_3x_mac.sh @@ -4,7 +4,7 @@ export CMAKE_BUILD_PARALLEL_LEVEL=${CMAKE_BUILD_PARALLEL_LEVEL:-$(python3 -c "im # rapid-build script for mcxtrace-kernel dev: -git checkout main + git pull # Ensure our 3rd party modules are in place and updated diff --git a/buildscripts/build_pkg_ghostbsd b/buildscripts/build_pkg_ghostbsd index 65d7e2b31..456ca8678 100755 --- a/buildscripts/build_pkg_ghostbsd +++ b/buildscripts/build_pkg_ghostbsd @@ -10,7 +10,7 @@ if [ "x$1" = "x" ]; then exit 1; fi -git checkout main + git pull # Ensure our 3rd party modules are in place and updated diff --git a/buildscripts/xbuild_loc_3.x_tree b/buildscripts/xbuild_loc_3.x_tree index 6ae2e093e..13af40db7 100755 --- a/buildscripts/xbuild_loc_3.x_tree +++ b/buildscripts/xbuild_loc_3.x_tree @@ -4,7 +4,7 @@ export CMAKE_BUILD_PARALLEL_LEVEL=${CMAKE_BUILD_PARALLEL_LEVEL:-$(python3 -c "im # rapid-build script for mcstas-kernel dev: -git checkout main + git pull # Ensure our 3rd party modules are in place and updated From b1079c82fd9d26bbb631f6a138dea164014bfea8 Mon Sep 17 00:00:00 2001 From: Peter Willendrup Date: Mon, 5 Aug 2024 15:03:27 +0200 Subject: [PATCH 2/2] Remove old script referring to mccode-legacy --- buildscripts/build_loc_2.x_mac | 54 ---------------------- buildscripts/build_loc_2.x_tree | 56 ----------------------- buildscripts/xbuild_loc_1.x_tree | 78 -------------------------------- 3 files changed, 188 deletions(-) delete mode 100755 buildscripts/build_loc_2.x_mac delete mode 100755 buildscripts/build_loc_2.x_tree delete mode 100755 buildscripts/xbuild_loc_1.x_tree diff --git a/buildscripts/build_loc_2.x_mac b/buildscripts/build_loc_2.x_mac deleted file mode 100755 index b78c0e410..000000000 --- a/buildscripts/build_loc_2.x_mac +++ /dev/null @@ -1,54 +0,0 @@ -#!/usr/bin/env bash - -# rappid-build script for mcstas-kernel dev: - -# Ensure our 3rd party modules are in place and updated -THIRDPARTY=`ls 3rdparty | grep -v patches` -cd 3rdparty - -cd - - -./3rdparty/sync.sh - - -for MODULE in `echo $THIRDPARTY` -do - if [ -d "3rdparty/patches/${MODULE}" ]; then - echo Making McCode cmake modules available for $MODULE - rsync -avz cmake/ 3rdparty/${MODULE}/cmake - echo Applying McCode patches to 3rdparty/${MODULE} - cp -rp 3rdparty/patches/${MODULE}/* 3rdparty/${MODULE}/ - fi -done - -#git checkout mcstas-3.x -#git pull - -WORK=`pwd` - -export MCINSTALL_PREFIX=$HOME/McStas - -if [[ -d $HOME/McStas/mcstas/2.x-dev ]] -then - rm -rf $HOME/McStas/mcstas/2.x-dev/* -fi -./mkdist mcstas 2.x-dev "" "" mac "" -- justinst -./mkdist mcstas-comps 2.x-dev "" "" mac "" -- justinst -./mkdist mcstas-tools-python-mcrun 2.x-dev tools/Python/mcrun/ "" mac "" -- justinst -./mkdist mcstas-tools-python-mcgui 2.x-dev tools/Python/mcgui/ "" mac "" -- justinst -./mkdist mcstas-tools-python-mccodelib 2.x-dev tools/Python/mccodelib/ "" mac "" -- justinst -./mkdist mcstas-tools-python-mcdisplay-pyqtgraph 2.x-dev tools/Python/mcdisplay/pyqtgraph/ "" mac "" -- justinst -./mkdist mcstas-tools-python-mcplot-pyqtgraph 2.x-dev tools/Python/mcplot/pyqtgraph/ "" mac "" -- justinst -./mkdist mcstas-tools-python-mcplot-html 2.x-dev tools/Python/mcplot/html/ "" mac "" -- justinst -./mkdist mcstas-tools-python-mcplot-matplotlib 2.x-dev tools/Python/mcplot/matplotlib/ "" mac "" -- justinst -cp tools/other/mcsplit/mcsplit.py $MCINSTALL_PREFIX/mcstas/2.x-dev/bin/ - -export MCINSTALL_PREFIX=$HOME/McStas/mcstas/2.x-dev/ -./mkdist mcstas-ncrystal 2.x-dev 3rdparty/ncrystal "" mac "" -- justinst -./mkdist mcstas-mcpl 2.x-dev 3rdparty/mcpl "" mac "" -- justinst - - -# Ensure we are configured for 10 node MPI runs -sed -i.bak s/\'4\'/\'10\'/g $HOME/McStas/mcstas/2.x-dev/tools/Python/mccodelib/mccode_config.json -x -ln -sf /Applications/McStas-2.7.1.app/Contents/Resources/mcstas/2.7.1/miniconda3 $MCINSTALL_PREFIX/miniconda3 diff --git a/buildscripts/build_loc_2.x_tree b/buildscripts/build_loc_2.x_tree deleted file mode 100755 index 06cc3ada4..000000000 --- a/buildscripts/build_loc_2.x_tree +++ /dev/null @@ -1,56 +0,0 @@ -#!/usr/bin/env bash -export PATH=$HOME/McStas/mcstas/2.x-dev/miniconda3/bin:$PATH -export CMAKE_BUILD_PARALLEL_LEVEL=${CMAKE_BUILD_PARALLEL_LEVEL:-$(python3 -c "import os;print(os.cpu_count())")} - -# rappid-build script for mcstas-kernel dev: - -git checkout mccode-legacy -git pull - -# Ensure our 3rd party modules are in place and updated -THIRDPARTY=`ls 3rdparty | grep -v patches` -cd 3rdparty - -cd - - -./3rdparty/sync.sh - - -for MODULE in `echo $THIRDPARTY` -do - if [ -d "3rdparty/patches/${MODULE}" ]; then - echo Making McCode cmake modules available for $MODULE - rsync -avz cmake/ 3rdparty/${MODULE}/cmake - echo Applying McCode patches to 3rdparty/${MODULE} - cp -rp 3rdparty/patches/${MODULE}/* 3rdparty/${MODULE}/ - fi -done - -WORK=`pwd` - -export MCINSTALL_PREFIX=$HOME/McStas -export CC=gcc -export FC=gfortran - -./mkdist mcstas 2.x-dev "" "" deb64 "" -- justinst -./mkdist mcstas-comps 2.x-dev "" "" deb64 "" -- justinst -./mkdist mcstas-tools-python-mcrun 2.x-dev tools/Python/mcrun/ "" deb64 "" -- justinst -./mkdist mcstas-tools-python-mcdoc 2.x-dev tools/Python/mcdoc/ "" deb64 "" -- justinst -./mkdist mcstas-tools-python-mctest 2.x-dev tools/Python/mctest/ "" deb64 "" -- justinst -./mkdist mcstas-tools-python-mcgui 2.x-dev tools/Python/mcgui/ "" deb64 "" -- justinst -./mkdist mcstas-tools-python-mccodelib 2.x-dev tools/Python/mccodelib/ "" deb64 "" -- justinst -./mkdist mcstas-tools-python-mcdisplay-pyqtgraph 2.x-dev tools/Python/mcdisplay/pyqtgraph/ "" deb64 "" -- justinst -./mkdist mcstas-tools-python-mcdisplay-webgl 2.x-dev tools/Python/mcdisplay/webgl/ "" deb64 "" -- justinst -./mkdist mcstas-tools-python-mcplot-pyqtgraph 2.x-dev tools/Python/mcplot/pyqtgraph/ "" deb64 "" -- justinst -./mkdist mcstas-tools-python-mcplot-matplotlib 2.x-dev tools/Python/mcplot/matplotlib/ "" deb64 "" -- justinst - -export MCINSTALL_PREFIX=$HOME/McStas/mcstas/2.x-dev/ -./mkdist mcstas-ncrystal 2.x-dev 3rdparty/ncrystal-package "" deb64 "" -- justinst -./mkdist mcstas-mcpl 2.x-dev 3rdparty/mcpl-package "" deb64 "" -- justinst -export MCINSTALL_PREFIX=$HOME/McStas - -# Ensure we are configured for 10 node MPI runs -sed -i s/\'4\'/\'10\'/g $MCINSTALL_PREFIX/mcstas/2.x-dev/tools/Python/mccodelib/mccode_config.py - - - diff --git a/buildscripts/xbuild_loc_1.x_tree b/buildscripts/xbuild_loc_1.x_tree deleted file mode 100755 index b6bd7d230..000000000 --- a/buildscripts/xbuild_loc_1.x_tree +++ /dev/null @@ -1,78 +0,0 @@ -#!/usr/bin/env bash - -# rappid-build script for mcstas-kernel dev: - -git checkout mccode-legacy -git pull - -# Ensure our 3rd party modules are in place and updated -THIRDPARTY=`ls 3rdparty | grep -v patches` - -./3rdparty/sync.sh - -WORK=`pwd` - -export MCINSTALL_PREFIX=$HOME/McXtrace -export CONDALOCATION=$MCINSTALL_PREFIX/mcxtrace/1.x-dev/miniconda3 -export CC=gcc -export CXX=c++ -export FC=gfortran - -if [[ -d $HOME/McXtrace/mcxtrace/1.x-dev ]] -then - cd $HOME/McXtrace/mcxtrace/1.x-dev - ls | grep -v miniconda3 | xargs -n1 rm -rf - cd - -fi - -if [ ! -f Miniforge3-$(uname)-$(uname -m).sh ]; then - # Download and embed a miniconda - echo - echo "*********************************************************" - echo "* Downloading a miniconda3 for your app *" - echo "*********************************************************" - echo - sleep 3 - curl -L -O "https://github.com/conda-forge/miniforge/releases/latest/download/Miniforge3-$(uname)-$(uname -m).sh" -fi - -if [[ ! -d $CONDALOCATION ]]; then - echo "*********************************************************" - echo "* Embedding miniconda3 in your app *" - echo "*********************************************************" - chmod a+x Miniforge3-$(uname)-$(uname -m).sh - ./Miniforge3-$(uname)-$(uname -m).sh -b -p $CONDALOCATION - # Run conda to install the dependencies - echo - echo "*********************************************************" - echo "* Downloading python dependencies to embedded miniconda *" - echo "*********************************************************" - echo - export PATH=$CONDALOCATION/bin:$PATH - mamba update mamba -y - mamba install gsl pyaml ply matplotlib numpy tornado scipy pillow pyqtgraph pyqt nomkl qscintilla2 nexusformat nexpy hdf5 autoconf automake libtool -y - mamba clean --all -y -fi - -./mkdist mcxtrace 1.x-dev "" "" deb64 "" -- justinst -./mkdist mcxtrace-comps 1.x-dev "" "" deb64 "" -- justinst -./mkdist mcxtrace-tools-python-mxrun 1.x-dev tools/Python/mcrun/ "" deb64 "" -- justinst -./mkdist mcxtrace-tools-python-mxgui 1.x-dev tools/Python/mcgui/ "" deb64 "" -- justinst -./mkdist mcxtrace-tools-python-mccodelib 1.x-dev tools/Python/mccodelib/ "" deb64 "" -- justinst -./mkdist mcxtrace-tools-python-mxdisplay-pyqtgraph 1.x-dev tools/Python/mcdisplay/pyqtgraph/ "" deb64 "" -- justinst -./mkdist mcxtrace-tools-python-mxdisplay-webgl 1.x-dev tools/Python/mcdisplay/webgl/ "" deb64 "" -- justinst -./mkdist mcxtrace-tools-python-mxplot-pyqtgraph 1.x-dev tools/Python/mcplot/pyqtgraph/ "" deb64 "" -- justinst -./mkdist mcxtrace-tools-python-mxplot-matplotlib 1.x-dev tools/Python/mcplot/matplotlib/ "" deb64 "" -- justinst - -export MCINSTALL_PREFIX=$HOME/McXtrace/mcxtrace/1.x-dev/ -./mkdist mcxtrace-mcpl 1.x-dev 3rdparty/mcpl-package "" deb64 "" -- justinst - -cd 3rdparty/xraylib -make distclean -autoreconf -i -./configure --prefix=$MCINSTALL_PREFIX -make install -cd $WORK - -# Ensure we are configured for 10 node MPI runs -sed -i s/\'4\'/\'10\'/g $HOME/McXtrace/mcxtrace/1.x-dev/tools/Python/mccodelib/mccode_config.py