From d8ebd3d8a0bc9e7acdf02a1b1acdb11c3e0c0a06 Mon Sep 17 00:00:00 2001
From: Jan Halfar <jan@bestbytes.com>
Date: Fri, 19 Apr 2024 18:11:36 +0200
Subject: [PATCH] feat: better var naming in Makefile

---
 Makefile | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/Makefile b/Makefile
index a1c5aa5..a9b21bd 100644
--- a/Makefile
+++ b/Makefile
@@ -1,11 +1,10 @@
 RELEASE_TAG=`git describe --tags || echo "dev"`
 ABS_MAKEFILE=$(realpath $(MAKEFILE_LIST))
 BUILD_DIR=`dirname ${ABS_MAKEFILE}`/.build
-DOWNLOAD_PACKAGE_DIR=${BUILD_DIR}/downloadpackage
+RELEASE_DIR=${BUILD_DIR}/coreml-service-yolov8m-release
 MODEL_EXPORT_DIR=${BUILD_DIR}/model-export
 ZIP_NAME=coreml-service-yolov8m-${RELEASE_TAG}.zip
-DOWNLOAD_PACKAGE_ZIP=${DOWNLOAD_PACKAGE_DIR}/${ZIP_NAME}
-SERVER_FILE_IN_PACKAGE=${DOWNLOAD_PACKAGE_DIR}/coreml-service-yolov8m
+SERVER_FILE_IN_PACKAGE=${RELEASE_DIR}/coreml-service-yolov8m
 
 
 test-identity:
@@ -16,9 +15,9 @@ test-identity:
 clean: test-identity
 	@echo "------- CLEANING -------"
 	mkdir -p ${BUILD_DIR} 
-	mkdir -p ${DOWNLOAD_PACKAGE_DIR} 
+	mkdir -p ${RELEASE_DIR} 
 	mkdir -p ${MODEL_EXPORT_DIR}
-	rm -Rvf ${DOWNLOAD_PACKAGE_DIR}/* 
+	rm -Rvf ${RELEASE_DIR}/* 
 	rm -Rvf ${MODEL_EXPORT_DIR}/*
 
 build-server:
@@ -29,18 +28,18 @@ transform-model-to-core-ml:
 	@echo "------- transforming model for core ml use -------"
 	MODEL_EXPORT_DIR=${MODEL_EXPORT_DIR} ./transform-model-to-core-ml.sh
 
-move-to-download-package:
+move-to-release-dir:
 	@echo "--------- moving things into place ---------"
-	mv ${MODEL_EXPORT_DIR}/yolov8m-oiv7.mlmodelc ${DOWNLOAD_PACKAGE_DIR}/.
+	mv ${MODEL_EXPORT_DIR}/yolov8m-oiv7.mlmodelc ${RELEASE_DIR}/.
 	mv ${BUILD_DIR}/release/app ${SERVER_FILE_IN_PACKAGE}
 
 codesign:
 	@echo "--------- todo sign app ---------"
 	echo "TODO: code sign ${SERVER_FILE_IN_PACKAGE}"
 
-release: clean build-server transform-model-to-core-ml move-to-download-package codesign
+release: clean build-server transform-model-to-core-ml move-to-release-dir codesign
 	@echo "--------- building download pkg ---------"
-	cd ${DOWNLOAD_PACKAGE_DIR} && zip -r ${ZIP_NAME} . && shasum -a 256 ${ZIP_NAME}
+	cd ${RELEASE_DIR} && zip -r ${ZIP_NAME} . && shasum -a 256 ${ZIP_NAME}