Modernize Makefile

...

Author: helje5

Makefile

@@ -6,22 +6,29 @@ TOOL_NAME=AvocadoToast
 SWIFT_BUILD=swift build
 SWIFT_CLEAN=swift package clean
 SWIFT_BUILD_DIR=.build
+SWIFT_TEST=swift test
+CONFIGURATION=release
 
 # docker config
-SWIFT_BUILD_IMAGE="helje5/swift-dev:5.2.0"
-CONFIGURATION=debug
 DOCKER_BUILD_DIR=".docker.build"
-SWIFT_DOCKER_BUILD_DIR=$(DOCKER_BUILD_DIR)/x86_64-unknown-linux/$(CONFIGURATION)
-DOCKER_BUILD_PRODUCT="$(DOCKER_BUILD_DIR)/$(CONFIGURATION)/$(TOOL_NAME)"
+#SWIFT_BUILD_IMAGE="swift:5.5.3"
+SWIFT_BUILD_IMAGE="helje5/arm64v8-swift-dev:5.5.3"
+SWIFT_DOCKER_BUILD_DIR="$(DOCKER_BUILD_DIR)/aarch64-unknown-linux/$(CONFIGURATION)"
+#SWIFT_DOCKER_BUILD_DIR="$(DOCKER_BUILD_DIR)/x86_64-unknown-linux/$(CONFIGURATION)"
+DOCKER_BUILD_PRODUCT="$(DOCKER_BUILD_DIR)/$(TOOL_NAME)"
 
 
 SWIFT_SOURCES=\
 	Sources/*/*/*.swift \
 	Sources/*/*/*/*.swift
 
 all:
-	$(SWIFT_BUILD)
+	$(SWIFT_BUILD) -c $(CONFIGURATION)
 
+# Cannot test in `release` configuration?!
+test:
+	$(SWIFT_TEST) 
+	
 clean :
 	$(SWIFT_CLEAN)
 	# We have a different definition of "clean", might be just German
@@ -38,9 +45,10 @@ $(DOCKER_BUILD_PRODUCT): $(SWIFT_SOURCES)
 
 docker-all: $(DOCKER_BUILD_PRODUCT)
 
-docker-clean:
-	rm $(DOCKER_BUILD_PRODUCT)	
 
+docker-clean:
+	rm -rf $(DOCKER_BUILD_PRODUCT)	
+	
 docker-distclean:
 	rm -rf $(DOCKER_BUILD_DIR)
 
@@ -55,8 +63,7 @@ docker-run:
 		  /src/$(SWIFT_BUILD_DIR)/x86_64-unknown-linux/$(CONFIGURATION)/$(TOOL_NAME)
 
 docker-emacs:
-	docker run --rm -it -p "127.0.0.1:1337:1337" \
-		  --name $(TOOL_NAME) \
+	docker run --rm -it \
 	          -v "$(PWD):/src" \
 	          -v "$(PWD)/$(DOCKER_BUILD_DIR):/src/.build" \
 	          "$(SWIFT_BUILD_IMAGE)" \