Fix cairo1 & cairo2 builds in Makefile (#1390)

* Remove cairo1 & cairo2 folders in `clean` makefile target * Use conditionals to install cairo2 * Use conditionals to install cairo1 * Fix name used * Use CAIRO_1_VERSION constant * Fix syntax * Fix typo Co-authored-by: Mario Rugiero <mario.rugiero@lambdaclass.com> --------- Co-authored-by: Mario Rugiero <mario.rugiero@lambdaclass.com>
lambdaclass · Aug 22, 2023 · 6828b6a · 6828b6a
1 parent 132da2c
commit 6828b6a
Showing 1 changed file with 32 additions and 34 deletions.
diff --git a/Makefile b/Makefile
@@ -115,22 +115,22 @@ $(CAIRO_1_CONTRACTS_TEST_DIR)/%.casm: $(CAIRO_1_CONTRACTS_TEST_DIR)/%.sierra
 # Setup Cairo 1 Compiler
 # ======================
 
-cairo-repo-1-dir = cairo1
-cairo-repo-1-dir-macos = cairo1-macos
-
-build-cairo-1-compiler-macos: | $(cairo-repo-1-dir-macos)
-
-$(cairo-repo-1-dir-macos):
-	curl -L -o cairo-1.1.1.tar https://github.com/starkware-libs/cairo/releases/download/v1.1.1/release-aarch64-apple-darwin.tar \
-	&& tar -xzvf cairo-1.1.1.tar \
-	&& mv cairo/ cairo1/
-
-build-cairo-1-compiler: | $(cairo-repo-1-dir)
-
-$(cairo-repo-1-dir):
-	curl -L -o cairo-1.1.1.tar https://github.com/starkware-libs/cairo/releases/download/v1.1.1/release-x86_64-unknown-linux-musl.tar.gz \
-	&& tar -xzvf cairo-1.1.1.tar \
-	&& mv cairo/ cairo1/
+CAIRO_1_REPO_DIR = cairo1
+CAIRO_1_VERSION = 1.1.1
+
+build-cairo-1-compiler-macos:
+	@if [ ! -d "$(CAIRO_1_REPO_DIR)" ]; then \
+        	curl -L -o cairo-$(CAIRO_1_VERSION).tar https://github.com/starkware-libs/cairo/releases/download/v$(CAIRO_1_VERSION)/release-aarch64-apple-darwin.tar \
+		&& tar -xzvf cairo-$(CAIRO_1_VERSION).tar \
+		&& mv cairo/ cairo1/; \
+    	fi
+
+build-cairo-1-compiler:
+	@if [ ! -d "$(CAIRO_1_REPO_DIR)" ]; then \
+		curl -L -o cairo-$(CAIRO_1_VERSION).tar https://github.com/starkware-libs/cairo/releases/download/v$(CAIRO_1_VERSION)/release-x86_64-unknown-linux-musl.tar.gz \
+		&& tar -xzvf cairo-$(CAIRO_1_VERSION).tar \
+		&& mv cairo/ cairo1/; \
+	fi
 
 # ======================
 # Test Cairo 2 Contracts
@@ -152,24 +152,22 @@ $(CAIRO_2_CONTRACTS_TEST_DIR)/%.casm: $(CAIRO_2_CONTRACTS_TEST_DIR)/%.sierra
 # Setup Cairo 2 Compiler
 # ======================
 
-cairo-repo-2-dir = cairo2
-cairo-repo-2-dir-macos = cairo2-macos
-
-build-cairo-2-compiler-macos: | $(cairo-repo-2-dir-macos)
-
-CAIRO_2_VERSION=2.1.0-rc1
-
-$(cairo-repo-2-dir-macos):
-	curl -L -o cairo-${CAIRO_2_VERSION}.tar https://github.com/starkware-libs/cairo/releases/download/v${CAIRO_2_VERSION}/release-aarch64-apple-darwin.tar \
-	&& tar -xzvf cairo-${CAIRO_2_VERSION}.tar \
-	&& mv cairo/ cairo2/
-
-build-cairo-2-compiler: | $(cairo-repo-2-dir)
-
-$(cairo-repo-2-dir):
-	curl -L -o cairo-${CAIRO_2_VERSION}.tar https://github.com/starkware-libs/cairo/releases/download/v${CAIRO_2_VERSION}/release-x86_64-unknown-linux-musl.tar.gz \
-	&& tar -xzvf cairo-${CAIRO_2_VERSION}.tar \
-	&& mv cairo/ cairo2/
+CAIRO_2_REPO_DIR = cairo2
+CAIRO_2_VERSION = 2.1.0-rc1
+
+build-cairo-2-compiler-macos:
+	@if [ ! -d "$(CAIRO_2_REPO_DIR)" ]; then \
+        	curl -L -o cairo-${CAIRO_2_VERSION}.tar https://github.com/starkware-libs/cairo/releases/download/v${CAIRO_2_VERSION}/release-aarch64-apple-darwin.tar \
+	 	&& tar -xzvf cairo-${CAIRO_2_VERSION}.tar \
+	 	&& mv cairo/ cairo2/; \
+	fi
+
+build-cairo-2-compiler:
+	@if [ ! -d "$(CAIRO_2_REPO_DIR)" ]; then \
+		curl -L -o cairo-${CAIRO_2_VERSION}.tar https://github.com/starkware-libs/cairo/releases/download/v${CAIRO_2_VERSION}/release-x86_64-unknown-linux-musl.tar.gz \
+		&& tar -xzvf cairo-${CAIRO_2_VERSION}.tar \
+		&& mv cairo/ cairo2/; \
+	fi
 
 cargo-deps:
 	cargo install --version 0.3.1 iai-callgrind-runner