Merge pull request #47 from ProjectTorreyPines/make

makefile clones without .jl in .julia/dev and more
ProjectTorreyPines · Mar 11, 2024 · e2c8cb8 · e2c8cb8
2 parents a4a8e74 + 8e2b0a5
commit e2c8cb8
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 7 deletions.
diff --git a/makefile b/makefile
@@ -8,15 +8,20 @@ help:
 	@echo
 
 env_with_cloned_repo r:
+	@echo "Pulling sample files using dvc"
+	-dvc pull
 	@echo "Creating Julia environment by creating local clones of dependent repositories"
-	@echo "Cloning the repositories"
-	-cd ..; git clone "git@github.com:ProjectTorreyPines/OMAS.jl.git"
-	-cd ..; git clone "git@github.com:ProjectTorreyPines/GGDUtils.jl.git"
-	-cd ..; git clone "git@github.com:ProjectTorreyPines/SOLPS2IMAS.jl.git"
-	@echo "Generating Project.toml and Manifest.toml"
-	julia --project=. -e 'using Pkg; Pkg.rm(["OMAS", "GGDUtils", "SOLPS2IMAS", "EFIT"]); Pkg.develop(path="../OMAS.jl"); Pkg.develop(path="../GGDUtils.jl"); Pkg.develop(path="../SOLPS2IMAS.jl"); Pkg.add(url="git@github.com:JuliaFusion/EFIT.jl.git", rev="master"); Pkg.instantiate()'
+	@echo "Cloning the repositories and generating Manifest.toml"
+	-dn=$(shell dirname $(shell pwd)); \
+	if [[ "$${dn:(-10)}" == ".julia/dev" ]]; then ext="" ; else ext=".jl";fi; \
+	git clone "git@github.com:ProjectTorreyPines/OMAS.jl.git" ../OMAS$${ext}; \
+	git clone "git@github.com:ProjectTorreyPines/GGDUtils.jl.git" ../GGDUtils$${ext}; \
+	git clone "git@github.com:ProjectTorreyPines/SOLPS2IMAS.jl.git" ../SOLPS2IMAS$${ext}; \
+	julia --project=. -e 'using Pkg; Pkg.rm(["OMAS", "GGDUtils", "SOLPS2IMAS", "EFIT"]); Pkg.develop(path="../OMAS'$${ext}'"); Pkg.develop(path="../GGDUtils'$${ext}'"); Pkg.develop(path="../SOLPS2IMAS'$${ext}'"); Pkg.add(url="git@github.com:JuliaFusion/EFIT.jl.git", rev="master"); Pkg.instantiate()'
 
 env_with_git_url u:
+	@echo "Pulling sample files using dvc"
+	-dvc pull
 	@echo "Creating Julia environment with the git urls without creating local clones"
 	@echo "Generating Project.toml and Manifest.toml"
 	julia --project=. -e 'using Pkg; Pkg.rm(["OMAS", "GGDUtils", "SOLPS2IMAS", "EFIT"]); Pkg.add(url="git@github.com:ProjectTorreyPines/OMAS.jl.git", rev="master"); Pkg.add(url="git@github.com:ProjectTorreyPines/GGDUtils.jl.git", rev="master"); Pkg.add(url="git@github.com:ProjectTorreyPines/SOLPS2IMAS.jl.git", rev="master"); Pkg.add(url="git@github.com:JuliaFusion/EFIT.jl.git", rev="master"); Pkg.instantiate()'

diff --git a/src/supersize_profile.jl b/src/supersize_profile.jl
@@ -878,7 +878,7 @@ function cached_mesh_extension!(
     clear_cache=false,
 )
     path = "$(@__DIR__)/../data/"
-    cached_ext_name = path * string(hash(eqdsk_file*b2fgmtry)) * ".mesh_ext.json"
+    cached_ext_name = path * string(hash(eqdsk_file * b2fgmtry)) * ".mesh_ext.json"
     if clear_cache
         rm(cached_ext_name; force=true)
         return cached_ext_name