Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

PR_refact/json_opt_naming-convention #7

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

PR_refact/json_opt_naming-convention #7

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ ligo_compiler?=docker run --rm -v "$(PWD)":"$(PWD)" -w "$(PWD)" ligolang/ligo:st
# ^ Override this variable when you run make command by make <COMMAND> ligo_compiler=<LIGO_EXECUTABLE>
# ^ Otherwise use default one (you'll need docker)
protocol_opt?=
JSON_OPT?=--michelson-format json
json_opt?=--michelson-format json
tsc=npx tsc
help:
@echo 'Usage:'
Expand Down Expand Up @@ -34,7 +34,7 @@ indice.tz: contracts/indice/main.mligo
indice.json: contracts/indice/main.mligo
@mkdir -p compiled
@echo "Compiling Indice smart contract to Michelson in JSON format"
@$(ligo_compiler) compile contract $^ $(JSON_OPT) -e indiceMain $(protocol_opt) > compiled/$@
@$(ligo_compiler) compile contract $^ $(json_opt) -e indiceMain $(protocol_opt) > compiled/$@

advisor.tz: contracts/advisor/main.mligo
@mkdir -p compiled
Expand All @@ -44,7 +44,7 @@ advisor.tz: contracts/advisor/main.mligo
advisor.json: contracts/advisor/main.mligo
@mkdir -p compiled
@echo "Compiling Advisor smart contract to Michelson in JSON format"
@$(ligo_compiler) compile contract $^ $(JSON_OPT) -e advisorMain $(protocol_opt) > compiled/$@
@$(ligo_compiler) compile contract $^ $(json_opt) -e advisorMain $(protocol_opt) > compiled/$@

clean:
@echo "Removing Michelson files"
Expand Down