Cleanup Makefile

Author: juliandescottes

Makefile

@@ -9,16 +9,19 @@ ROOT_UPDATE_URL=https://ftp.mozilla.org/$(ROOT_PATH)
 S3_BASE_URL=s3://net-mozaws-prod-delivery-contrib/$(ROOT_PATH)
 
 define build-xpis
-	cd extension; \
+	pushd extension; \
 	for arch in $(ARCHS); do \
-		echo "build dist/$$arch-$(VERSION).xpi"; \
+		echo "[release-$$arch] Create manifest.json"; \
 		sed \
 			-e "s#@@UPDATE_URL@@#$(ROOT_UPDATE_URL)/$$arch/update.json#" \
 			-e "s#@@VERSION@@#$(VERSION)#" \
 			template-manifest.json > manifest.json; \
+		echo "[release-$$arch] ZIP to $(XPI_NAME)-$$arch.xpi"; \
 		zip ../dist/$(XPI_NAME)-$$arch.xpi -r $$arch adb.json manifest.json; \
+		echo "[release-$$arch] Delete temporary manifest.json"; \
 		rm manifest.json; \
-	done
+	done; \
+	popd
 endef
 
 define clean
@@ -28,36 +31,31 @@ define clean
 endef
 
 define release
-	cd dist;                                                                     \
-	for arch in $(ARCHS); do                                                     \
-                                                                               \
-		echo "[release-$$arch] Sign .xpi";                                         \
-		../sign.sh $(XPI_NAME)-$$arch.xpi;                                         \
-                                                                               \
-		echo "[release-$$arch] Upload .xpi";                                       \
-		aws s3 cp                                                                  \
-			$(XPI_NAME)-$$arch.xpi                                                   \
-			$(S3_BASE_URL)/$$arch/$(XPI_NAME)-$$arch.xpi;                            \
-                                                                               \
-		echo "[release-$$arch] Copy to 'latest' .xpi";                             \
-		aws s3 cp                                                                  \
-			$(S3_BASE_URL)/$$arch/$(XPI_NAME)-$$arch.xpi                             \
-			$(S3_BASE_URL)/$$arch/adb-extension-latest-$$arch.xpi;                   \
-                                                                               \
-		echo "[release-$$arch] Create update.json";                                \
-		sed                                                                        \
+	pushd dist; \
+	for arch in $(ARCHS); do \
+		echo "[release-$$arch] Sign .xpi"; \
+		../sign.sh $(XPI_NAME)-$$arch.xpi; \
+		echo "[release-$$arch] Upload .xpi"; \
+		aws s3 cp \
+			$(XPI_NAME)-$$arch.xpi \
+			$(S3_BASE_URL)/$$arch/$(XPI_NAME)-$$arch.xpi; \
+		echo "[release-$$arch] Copy to 'latest' .xpi"; \
+		aws s3 cp \
+			$(S3_BASE_URL)/$$arch/$(XPI_NAME)-$$arch.xpi \
+			$(S3_BASE_URL)/$$arch/adb-extension-latest-$$arch.xpi; \
+		echo "[release-$$arch] Create update.json"; \
+		sed \
 			-e "s#@@UPDATE_LINK@@#$(ROOT_UPDATE_URL)/$$arch/$(XPI_NAME)-$$arch.xpi#" \
-			-e "s#@@VERSION@@#$(VERSION)#"                                           \
-			../template-update.json > update.json;                                   \
-                                                                               \
-		echo "[release-$$arch] Upload update.json";                                \
-		aws s3 cp --cache-control max-age=3600                                     \
-			update.json                                                              \
-			$(S3_BASE_URL)/$$arch/update.json;                                       \
-                                                                               \
-		echo "[release-$$arch] Delete temporary update.json";                      \
-		rm update.json;                                                            \
-	done
+			-e "s#@@VERSION@@#$(VERSION)#" \
+			../template-update.json > update.json; \
+		echo "[release-$$arch] Upload update.json"; \
+		aws s3 cp --cache-control max-age=3600 \
+			update.json \
+			$(S3_BASE_URL)/$$arch/update.json; \
+		echo "[release-$$arch] Delete temporary update.json"; \
+		rm update.json; \
+	done; \
+	popd
 endef
 
 package: