From 483439257619dbd75afcea74f2d155906154b7cb Mon Sep 17 00:00:00 2001 From: Jerry Ling Date: Wed, 23 Mar 2022 00:07:08 -0400 Subject: [PATCH 1/2] create julia dummy files first launch --- cmake/scripts/create_lcg_view_setup_csh.in | 4 ++++ cmake/scripts/create_lcg_view_setup_sh.in | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/cmake/scripts/create_lcg_view_setup_csh.in b/cmake/scripts/create_lcg_view_setup_csh.in index 6e43115c6..34e19e7e0 100644 --- a/cmake/scripts/create_lcg_view_setup_csh.in +++ b/cmake/scripts/create_lcg_view_setup_csh.in @@ -472,6 +472,10 @@ if ( -d $thisdir/lib/julia ) then set __julia_proj_dir=`find $thisdir/share/julia/environments -maxdepth 1 -type d -name "v*"` setenv JULIA_LOAD_PATH :$__julia_proj_dir setenv JULIA_DEPOT_PATH :$thisdir/share/julia + if ( ! -d $HOME/.julia/ ) then + mkdir -p $HOME/.julia/environments/v1.7 + touch $HOME/.julia/environments/v1.7/Project.toml + endif endif #---then nxcals and hepak diff --git a/cmake/scripts/create_lcg_view_setup_sh.in b/cmake/scripts/create_lcg_view_setup_sh.in index 99996251d..d26c09ed7 100644 --- a/cmake/scripts/create_lcg_view_setup_sh.in +++ b/cmake/scripts/create_lcg_view_setup_sh.in @@ -393,6 +393,10 @@ if [ -d $thisdir/lib/julia ]; then __julia_proj_dir=`find $thisdir/share/julia/environments -maxdepth 1 -type d -name "v*"` JULIA_LOAD_PATH=:$__julia_proj_dir; export JULIA_LOAD_PATH JULIA_DEPOT_PATH=:$thisdir/share/julia; export JULIA_DEPOT_PATH + if [ ! -d $HOME/.julia/ ]; then + mkdir -p $HOME/.julia/environments/v1.7 + touch $HOME/.julia/environments/v1.7/Project.toml + fi fi #---then nxcals and hepak -- GitLab From 7f177367d7bd7e7d3f0965efb0ec406abf11b8e4 Mon Sep 17 00:00:00 2001 From: Jerry Ling Date: Wed, 30 Mar 2022 10:57:55 -0400 Subject: [PATCH 2/2] use JULIA_PROJECT env instead --- cmake/scripts/create_lcg_view_setup_csh.in | 5 +---- cmake/scripts/create_lcg_view_setup_sh.in | 5 +---- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/cmake/scripts/create_lcg_view_setup_csh.in b/cmake/scripts/create_lcg_view_setup_csh.in index 34e19e7e0..31093f036 100644 --- a/cmake/scripts/create_lcg_view_setup_csh.in +++ b/cmake/scripts/create_lcg_view_setup_csh.in @@ -472,10 +472,7 @@ if ( -d $thisdir/lib/julia ) then set __julia_proj_dir=`find $thisdir/share/julia/environments -maxdepth 1 -type d -name "v*"` setenv JULIA_LOAD_PATH :$__julia_proj_dir setenv JULIA_DEPOT_PATH :$thisdir/share/julia - if ( ! -d $HOME/.julia/ ) then - mkdir -p $HOME/.julia/environments/v1.7 - touch $HOME/.julia/environments/v1.7/Project.toml - endif + setenv JULIA_PROJECT ${HOME}.julia/${__julia_proj_dir#*/julia/}/ endif #---then nxcals and hepak diff --git a/cmake/scripts/create_lcg_view_setup_sh.in b/cmake/scripts/create_lcg_view_setup_sh.in index d26c09ed7..492991df5 100644 --- a/cmake/scripts/create_lcg_view_setup_sh.in +++ b/cmake/scripts/create_lcg_view_setup_sh.in @@ -393,10 +393,7 @@ if [ -d $thisdir/lib/julia ]; then __julia_proj_dir=`find $thisdir/share/julia/environments -maxdepth 1 -type d -name "v*"` JULIA_LOAD_PATH=:$__julia_proj_dir; export JULIA_LOAD_PATH JULIA_DEPOT_PATH=:$thisdir/share/julia; export JULIA_DEPOT_PATH - if [ ! -d $HOME/.julia/ ]; then - mkdir -p $HOME/.julia/environments/v1.7 - touch $HOME/.julia/environments/v1.7/Project.toml - fi + JULIA_PROJECT=${HOME}.julia/${__julia_proj_dir#*/julia/}/; export JULIA_PROJECT fi #---then nxcals and hepak -- GitLab