From 15fcaa0828e68125e60feb89bd585c1ee7cea48a Mon Sep 17 00:00:00 2001
From: Alex Beregszaszi <alex@rtfs.hu>
Date: Fri, 15 May 2020 18:23:58 +0100
Subject: [PATCH] Introduce build directory for artifacts (#31)

---
 .gitignore |  1 +
 Makefile   | 18 +++++++-----------
 circle.yml |  5 +++--
 3 files changed, 11 insertions(+), 13 deletions(-)
 create mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000..378eac25d
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+build
diff --git a/Makefile b/Makefile
index 739396aba..55d672105 100644
--- a/Makefile
+++ b/Makefile
@@ -1,26 +1,22 @@
 all: compile
 
 clean:
-	@rm -f DepositContract.abi DepositContract.bin IDepositContract.abi IDepositContract.bin deposit_contract.json
-	@rm -f DepositContractTest.abi DepositContractTest.bin
-	@rm -f VyperSetup.abi VyperSetup.bin
-	@rm -f DSTest.abi DSTest.bin
-	@rm -rf combined.json
+	@rm -rf build
+	@rm -f deposit_contract.json
 
+# Note: using /bin/echo for macOS support
 compile: clean
-	@# Note: using /bin/echo for macOS
 	@git submodule update --recursive --init
-	@solc --metadata-literal --optimize --optimize-runs 5000000 --bin --abi --combined-json=abi,bin,bin-runtime,srcmap,srcmap-runtime,ast,metadata,storage-layout --overwrite -o . deposit_contract.sol tests/deposit_contract.t.sol
+	@solc --metadata-literal --optimize --optimize-runs 5000000 --bin --abi --combined-json=abi,bin,bin-runtime,srcmap,srcmap-runtime,ast,metadata,storage-layout --overwrite -o build deposit_contract.sol tests/deposit_contract.t.sol
 	@/bin/echo -n '{"abi": ' > deposit_contract.json
-	@cat DepositContract.abi >> deposit_contract.json
+	@cat build/DepositContract.abi >> deposit_contract.json
 	@/bin/echo -n ', "bytecode": "0x' >> deposit_contract.json
-	@cat DepositContract.bin >> deposit_contract.json
+	@cat build/DepositContract.bin >> deposit_contract.json
 	@/bin/echo -n '"}' >> deposit_contract.json
 
-
 export DAPP_SKIP_BUILD:=1
 export DAPP_SRC:=.
-export DAPP_JSON:=combined.json
+export DAPP_JSON:=build/combined.json
 
 test:
 	dapp test -v --fuzz-runs 5
diff --git a/circle.yml b/circle.yml
index b86a89aa2..03922e13c 100644
--- a/circle.yml
+++ b/circle.yml
@@ -18,7 +18,7 @@ jobs:
           root: .
           paths:
             - deposit_contract.json
-            - combined.json
+            - build/combined.json
             - lib
 
   spectest:
@@ -56,7 +56,8 @@ jobs:
       - run:
           name: Test the contract
           command: |
-            cp /tmp/combined.json .
+            mkdir build
+            cp -r /tmp/build/* build
             cp -r /tmp/lib/* lib
             nix-shell --command 'make test'