update to beta.40

Author: remcoros

Makefile

@@ -1,53 +1,81 @@
-PACKAGE_ID := $(shell grep -o "id: '[^']*'" startos/manifest.ts | sed "s/id: '\([^']*\)'/\1/")
-INGREDIENTS := $(shell start-cli s9pk list-ingredients 2> /dev/null)
+PACKAGE_ID := $(shell awk -F"'" '/id:/ {print $$2}' startos/manifest.ts)
+INGREDIENTS := $(shell start-cli s9pk list-ingredients 2>/dev/null)
 
-.PHONY: all clean install check-deps check-init ingredients
+CMD_ARCH_GOAL := $(filter aarch64 x86_64 arm x86, $(MAKECMDGOALS))
+ifeq ($(CMD_ARCH_GOAL),)
+  BUILD := universal
+  S9PK := $(PACKAGE_ID).s9pk
+else
+  RAW_ARCH := $(firstword $(CMD_ARCH_GOAL))
+  ACTUAL_ARCH := $(subst x86,x86_64,$(subst arm,aarch64,$(RAW_ARCH)))
+  BUILD := $(ACTUAL_ARCH)
+  S9PK := $(PACKAGE_ID)_$(BUILD).s9pk
+endif
 
+.PHONY: all aarch64 x86_64 arm x86 clean install check-deps check-init package ingredients
 .DELETE_ON_ERROR:
 
-all: ${PACKAGE_ID}.s9pk
-	@echo " Done!"
-	@echo " Filesize:$(shell du -h $(PACKAGE_ID).s9pk) is ready"
+define SUMMARY
+	@manifest=$$(start-cli s9pk inspect $(1) manifest); \
+	size=$$(du -h $(1) | awk '{print $$1}'); \
+	title=$$(printf '%s' "$$manifest" | jq -r .title); \
+	version=$$(printf '%s' "$$manifest" | jq -r .version); \
+	arches=$$(printf '%s' "$$manifest" | jq -r '.hardwareRequirements?.arch // ["x86_64", "aarch64"] | join(", ")'); \
+	sdkv=$$(printf '%s' "$$manifest" | jq -r .sdkVersion); \
+	gitHash=$$(printf '%s' "$$manifest" | jq -r .gitHash | sed -E 's/(.*-modified)$$/\x1b[0;31m\1\x1b[0m/'); \
+	printf "\n"; \
+	printf "\033[1;32m✅ Build Complete!\033[0m\n"; \
+	printf "\n"; \
+	printf "\033[1;37m📦 $$title\033[0m   \033[36mv$$version\033[0m\n"; \
+	printf "───────────────────────────────\n"; \
+	printf " \033[1;36mFilename:\033[0m   %s\n" "$(1)"; \
+	printf " \033[1;36mSize:\033[0m       %s\n" "$$size"; \
+	printf " \033[1;36mArch:\033[0m       %s\n" "$$arches"; \
+	printf " \033[1;36mSDK:\033[0m        %s\n" "$$sdkv"; \
+	printf " \033[1;36mGit:\033[0m        %s\n" "$$gitHash"; \
+	echo ""
+endef
 
-check-deps:
-	@if ! command -v start-cli > /dev/null; then \
-		echo "Error: start-cli not found. Please install it first."; \
-		exit 1; \
-	fi
-	@if ! command -v npm > /dev/null; then \
-		echo "Error: npm (Node Package Manager) not found. Please install Node.js and npm."; \
-		exit 1; \
-	fi
+all: $(PACKAGE_ID).s9pk
+	$(call SUMMARY,$(S9PK))
 
-check-init:
-	@if [ ! -f ~/.startos/developer.key.pem ]; then \
-		start-cli init; \
-	fi
+$(BUILD): $(PACKAGE_ID)_$(BUILD).s9pk
+	$(call SUMMARY,$(S9PK))
 
-ingredients: $(INGREDIENTS)
-	@echo "Re-evaluating ingredients..."
+x86: x86_64
+arm: aarch64
 
-${PACKAGE_ID}.s9pk: $(INGREDIENTS) $(shell git ls-files assets) | check-deps check-init
+$(S9PK): $(INGREDIENTS) .git/HEAD .git/index
 	@$(MAKE) --no-print-directory ingredients
-	start-cli s9pk pack
+	@echo "   Packing '$(S9PK)'..."
+	BUILD=$(BUILD) start-cli s9pk pack -o $(S9PK)
 
-x86: $(INGREDIENTS) $(shell git ls-files assets) | check-deps check-init
-	@$(MAKE) --no-print-directory ingredients
-	BUILD=x86 start-cli s9pk pack
-	@echo " Done!"
-	@echo " Filesize:$(shell du -h $(PACKAGE_ID).s9pk) is ready"
+ingredients: $(INGREDIENTS)
+	@echo "   Re-evaluating ingredients..."
 
-arm: $(INGREDIENTS) $(shell git ls-files assets) | check-deps check-init
-	@$(MAKE) --no-print-directory ingredients
-	BUILD=arm start-cli s9pk pack
-	@echo " Done!"
-	@echo " Filesize:$(shell du -h $(PACKAGE_ID).s9pk) is ready"
+install: package | check-deps check-init
+	@HOST=$$(awk -F'/' '/^host:/ {print $$3}' ~/.startos/config.yaml); \
+	if [ -z "$$HOST" ]; then \
+		echo "Error: You must define \"host: http://server-name.local\" in ~/.startos/config.yaml"; \
+		exit 1; \
+	fi; \
+	echo "\n🚀 Installing to $$HOST ..."; \
+	start-cli package install -s $(S9PK)
 
-javascript/index.js: $(shell git ls-files startos) tsconfig.json node_modules package.json
-	npm run build
+check-deps:
+	@command -v start-cli >/dev/null || \
+		(echo "Error: start-cli not found. Please see https://docs.start9.com/latest/developer-guide/sdk/installing-the-sdk" && exit 1)
+	@command -v npm >/dev/null || \
+		(echo "Error: npm not found. Please install Node.js and npm." && exit 1)
 
-assets:
-	mkdir -p assets
+check-init:
+	@if [ ! -f ~/.startos/developer.key.pem ]; then \
+		echo "Initializing StartOS developer environment..."; \
+		start-cli init; \
+	fi
+
+javascript/index.js: $(shell find startos -type f) tsconfig.json node_modules
+	npm run build
 
 node_modules: package-lock.json
 	npm ci
@@ -56,12 +84,5 @@ package-lock.json: package.json
 	npm i
 
 clean:
-	rm -rf ${PACKAGE_ID}.s9pk
-	rm -rf javascript
-	rm -rf node_modules
-
-install: ${PACKAGE_ID}.s9pk
-	@if [ ! -f ~/.startos/config.yaml ]; then echo "You must define \"host: http://server-name.local\" in ~/.startos/config.yaml config file first."; exit 1; fi
-	@echo "\nInstalling to $$(grep -v '^#' ~/.startos/config.yaml | cut -d'/' -f3) ...\n"
-	@[ -f $(PACKAGE_ID).s9pk ] || ( $(MAKE) && echo "\nInstalling to $$(grep -v '^#' ~/.startos/config.yaml | cut -d'/' -f3) ...\n" )
-	@start-cli package install -s $(PACKAGE_ID).s9pk
+	@echo "Cleaning up build artifacts..."
+	@rm -rf $(PACKAGE_ID).s9pk $(PACKAGE_ID)_x86_64.s9pk $(PACKAGE_ID)_aarch64.s9pk javascript node_modules

package-lock.json

@@ -6,10 +6,10 @@
     "check": "tsc --noEmit"
   },
   "dependencies": {
-    "@start9labs/start-sdk": "^0.4.0-beta.36"
+    "@start9labs/start-sdk": "^0.4.0-beta.40"
   },
   "devDependencies": {
-    "@types/node": "^22.17.1",
+    "@types/node": "^22.18.1",
     "@vercel/ncc": "^0.38.3",
     "prettier": "^3.6.2",
     "typescript": "^5.9.2"