Skip to content

Commit

Permalink
Added back OMAS in makefile
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
anchal-physics committed Mar 20, 2024
1 parent 62bf3bb commit b8df68c
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit b8df68c

Please sign in to comment.