From b8df68cce3a3702ffed2285281e21b945af4ee21 Mon Sep 17 00:00:00 2001 From: Anchal Gupta Date: Wed, 20 Mar 2024 11:27:13 -0700 Subject: [PATCH] Added back OMAS in makefile OMAS was replaced with IMASDD in makefile but since the currently we are simply importing OMAS as IMASDD, we need to add back OMAS in the makefile. I have left IMASDD in the makefile as well, so that we can easily switch between the two in future. I've tested this make version on my machine. --- makefile | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/makefile b/makefile index 55fbb5c..4052b2a 100644 --- a/makefile +++ b/makefile @@ -13,16 +13,17 @@ env_with_cloned_repo r: @echo "Creating Julia environment by creating local clones of dependent repositories" @echo "Cloning the repositories and generating Manifest.toml" -dn=$(shell dirname $(shell pwd)); \ - if [[ "$${dn:(-10)}" == ".julia/dev" ]]; then rn="IMASDD" ; else rn="IMASDD.jl"; fi; \ - git clone "git@github.com:ProjectTorreyPines/IMASDD.jl.git" ../$${rn}; \ - julia --project=. -e 'using Pkg; Pkg.rm("IMASDD"); Pkg.develop(path="../'$${rn}'"); Pkg.instantiate()' + 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/IMASDD.jl.git" ../IMASDD$${ext}; \ + julia --project=. -e 'using Pkg; Pkg.rm(["OMAS", "IMASDD"]); Pkg.develop(path="../OMAS'$${ext}'"); Pkg.develop(path="../IMASDD'$${ext}'"); 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("IMASDD"); Pkg.add(url="git@github.com:ProjectTorreyPines/IMASDD.jl.git", rev="master"); Pkg.instantiate()' + julia --project=. -e 'using Pkg; Pkg.rm(["OMAS", "IMASDD"]); Pkg.add(url="git@github.com:ProjectTorreyPines/OMAS.jl.git", rev="master"); Pkg.add(url="git@github.com:ProjectTorreyPines/IMASDD.jl.git", rev="master"); Pkg.instantiate()' clean: @echo "Deleting Manifest.toml"