notes and cleanup...

Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>

.github/workflows/viewer-build.yml

@@ -4,6 +4,10 @@ name: Viewer build
 on:
   workflow_dispatch:
 
+  #push:
+  #  branches: [ "master" ]
+  #  tags: v**  
+
   release:
     types: [published]
 
@@ -14,8 +18,12 @@ jobs:
 
     strategy:
       matrix:
+        # XXX the mac build is broken for now -- running blind as I do 
+        #     not have a mac to test on, but I will at least fix the 
+        #     build...
         #os: [ ubuntu-latest, windows-latest, macos-latest ]
         os: [ ubuntu-latest, windows-latest ]
+        #os: [ macos-latest ]
 
     runs-on: ${{ matrix.os }}
 
@@ -26,9 +34,9 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
-
     - uses: actions/setup-node@v6
 
+
     - name: Windows-specific
       if: ${{ matrix.os == 'windows-latest' }}
       run: |
@@ -40,8 +48,18 @@ jobs:
         # fixes an issue when running npx sandboxing...
         sudo sysctl -w kernel.apparmor_restrict_unprivileged_userns=0
 
-    #- name: MacOS-specific
+    - name: MacOS-specific
-    #  if: ${{ matrix.os == 'macos-latest' }}
+      if: ${{ matrix.os == 'macos-latest' }}
+      run: |
+        brew install gnu-sed zip
+
+        echo PATH="$HOMEBREW_PREFIX/opt/zip/bin:$PATH" >> $GITHUB_ENV
+
+
+    #- name: Env
+    #  run: |
+    #    echo "VERSION=$(make version)" >> $GITHUB_ENV
+
 
     - name: Pre-Build
       run: make clean-all dev

Viewer/Makefile

@@ -294,12 +294,16 @@ else
 	ifeq ($(shell uname -s),Darwin)
 		TARGET_OS ?= darwin
 		NW_OS ?= osx
+		SED = gsed
 	endif
 
 	# set arch...
 	ifeq ($(shell uname -m),x86_64)
 		ARCH ?= x64
 	endif
+	ifeq ($(shell uname -m),arm64)
+		ARCH ?= arm64
+	endif
 	ifneq ($(filter %86,$(shell uname -p)),)
 		ARCH ?= ia32
 	endif
@@ -338,6 +342,8 @@ RM += -r
 
 MD = @mkdir -p
 
+SED ?= sed
+
 
 #**********************************************************************
 # Paths and lists...
@@ -402,7 +408,7 @@ PATCHES := $(REQUREJS)
 #**********************************************************************
 # dependencies to check...
 #
-DEPENDENCIES_HELP = sed grep printf 
+DEPENDENCIES_HELP = $(SED) grep printf 
 DEPENDENCIES_WEB = node npm npx
 
 DEPENDENCIES = $(DEPENDENCIES_WEB) \
@@ -429,23 +435,23 @@ help:
 	help_lines=(`grep -Fh "##" $(MAKEFILE_LIST) \
 		| grep -Fv grep \
 		| grep -Fv '"##' \
-		| sed -e 's/\\$$//'`); \
+		| $(SED) -e 's/\\$$//'`); \
 	for help_line in $${help_lines[@]}; do \
 		IFS=$$'#' ; \
 		if [ -z "$${help_line/'#'#[#-]*/}" ] ; then \
 			echo ; \
 			echo "$${help_line}" \
-				| sed -e 's/#\+[- ]*//' \
+				| $(SED) -e 's/#\+[- ]*//' \
 					-e 's/\s*\(...\|---\)\s*$$/:/'; \
 		elif [ -z "$${help_line/'#'*/}" ] ; then \
 			echo "$${help_line}" \
-				| sed 's/#\+[- ]*//' ; \
+				| $(SED) 's/#\+[- ]*//' ; \
 		else \
 			help_split=($$help_line) ; \
 			help_command=`echo $${help_split[0]} \
-				| sed -e 's/^ *//' -e 's/ *$$//'` ; \
+				| $(SED) -e 's/^ *//' -e 's/ *$$//'` ; \
 			help_info=`echo $${help_split[2]} \
-				| sed -e 's/^ *//' -e 's/ *$$//'` ; \
+				| $(SED) -e 's/^ *//' -e 's/ *$$//'` ; \
 			printf "   %-30s %s\n" $$help_command $$help_info ; \
 		fi ; \
 	done
@@ -730,7 +736,7 @@ $(BUILD_INFO): $(CSS_FILES) $(NODE_DIR) $(PROJECT_FILES) \
 # XXX revise $LAUNCHER -- should it be absolute or relative and when???
 %: %.tpl package.json
 	cat $< \
-		| sed -e 's/\$$APP_NAME/$(APP_NAME)/' \
+		| $(SED) -e 's/\$$APP_NAME/$(APP_NAME)/' \
 			-e 's/\$$COMMENT/$(subst \/,\/,$(COMMENT))/' \
 			-e 's/\$$CATEGORIES/$(subst \/,\/,$(CATEGORIES))/' \
 			-e 's/\$$VERSION/$(APP_VERSION)/' \
@@ -821,7 +827,7 @@ $(REQUREJS)$(BACKUP_EXT): $(NODE_DIR)
 	# HACK: for some reason requirejs breaks if we do not do this (see: NOTES)
 	cp -f $(REQUREJS){,$(BACKUP_EXT)}
 	cat $(REQUREJS)$(BACKUP_EXT) \
-		| sed 's/^\(#!\/\)/\/\/\1/' \
+		| $(SED) 's/^\(#!\/\)/\/\/\1/' \
 		> $(REQUREJS)
 
 .PHONY: patched-requirejs
@@ -871,7 +877,7 @@ $(TARGET_DIR)/$(ELECTRON_DIST):
 $(BUILD_DIR)/app.asar: $(PACK_FULL)
 	# update package.json to start electron...
 	cd "$(BUILD_DIR)/$(APP_NAME)/" ; \
-		sed -i 's/"index.html"/"e.js"/g' package.json
+		$(SED) -i 's/"index.html"/"e.js"/g' package.json
 	# remove electron from the dist...
 	rm -rf "$(BUILD_DIR)/$(APP_NAME)/$(NODE_DIR)/electron"
 	cd "$(BUILD_DIR)" ; \
@@ -885,11 +891,14 @@ $(BUILD_DIR)/app.asar: $(PACK_FULL)
 # 	rules...
 # XXX need to take nw/el version part into account...
 # XXX need to setup app icons...
-.PRECIOUS: $(BUILD_DIR)/$(APP_NAME)-%/
+#.PRECIOUS: $(BUILD_DIR)/$(APP_NAME)-%/
-$(BUILD_DIR)/$(APP_NAME)-%/: $(TARGET_DIR)/$(ELECTRON_DIST) \
+#$(BUILD_DIR)/$(APP_NAME)-%/: $(TARGET_DIR)/$(ELECTRON_DIST) \
+.PRECIOUS: $(BUILD_DIR)/$(APP_NAME).app/
+$(BUILD_DIR)/$(APP_NAME).app/: $(TARGET_DIR)/$(ELECTRON_DIST) \
 		$(BUILD_DIR)/app.asar $(BUILD_INFO) $(LICENSE)
 	unzip -u "$<" -d "$@" 
 	cp -r $(BUILD_DIR)/app.asar* "$@/$(ASAR_PATH)/"
+	mv "$@/LICENSE{,.electron}"
 	cp -f "$(BUILD_INFO)" "$(LICENSE)" "$@/"
 	# remove default_app.asar...
 	$(RM) "$@/$(ASAR_PATH)/default_app.asar"
@@ -922,7 +931,7 @@ $(BUILD_DIR)/$(APP_NAME)-%.in-place.zip: $(TARGET_DIR)/$(ELECTRON_DIST) \
 	$(call zipDelFrom,"$(BUILD_DIR)",$@.tmp,"version")
 	# rename electron stuff...
 #	# XXX rename "Electron Helper" on mac builds -- this needs Info.plist changes...
-#		| sed 's/\(^@ \(.*\)Electron Helper\(.*\)\)$$/\1\n@=\2$(APP_NAME) Helper\3/' 
+#		| $(SED) 's/\(^@ \(.*\)Electron Helper\(.*\)\)$$/\1\n@=\2$(APP_NAME) Helper\3/' 
 	unzip -p "$@.tmp" LICENSE > $(BUILD_DIR)/LICENSE.electron
 	# rename app...
 #	# XXX also rename MacOS/Electron -> $(APP_NAME) -- this needs Info.plist changes...