From 28e525a3d37473f960953314b8f1f98f275ed950 Mon Sep 17 00:00:00 2001 From: Pliable Pixels Date: Wed, 2 Dec 2020 14:53:52 -0500 Subject: #1017 linux arm64 bit support --- make_desktop.sh | 2 +- package.json | 8 +++++--- prepare_desktop.sh | 4 ++-- www/js/NVR.js | 2 +- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/make_desktop.sh b/make_desktop.sh index 60d7c240..2139ca4f 100755 --- a/make_desktop.sh +++ b/make_desktop.sh @@ -62,7 +62,7 @@ APPVER=`cat config.xml | grep "widget " | sed 's/.* version=\"\([^\"]*\)\" xmlns APPVER+="D" echo "Application version:$APPVER" -declare -a app_ports=("desktop/zmNinja-mac.app/Contents/Resources" "desktop/zmNinja-linux32bit/resources" "desktop/zmNinja-linux64bit/resources" "desktop/zmNinja-win64bit/resources" "desktop/zmNinja-win32bit/resources" "desktop/zmNinja-linuxarmv7l/resources") +declare -a app_ports=("desktop/zmNinja-mac.app/Contents/Resources" "desktop/zmNinja-linux32bit/resources" "desktop/zmNinja-linux64bit/resources" "desktop/zmNinja-win64bit/resources" "desktop/zmNinja-win32bit/resources" "desktop/zmNinja-linuxarmv7l/resources" "desktop/zmNinja-linuxarm64/resources") for i in "${app_ports[@]}" do diff --git a/package.json b/package.json index 23882444..7383cbd9 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "zmninjapro", "description": "Home security mobile app for ZoneMinder", - "version": "1.6.002", + "version":"1.6.003", "displayName": "zmNinja", "author": "Pliable Pixels", "license": "custom see LICENSE.md", @@ -236,10 +236,12 @@ "arch": [ "x64", "ia32", - "armv7l" + "armv7l", + "arm64" + ] } ] } } -} \ No newline at end of file +} diff --git a/prepare_desktop.sh b/prepare_desktop.sh index 510a2f6d..a7e546c4 100755 --- a/prepare_desktop.sh +++ b/prepare_desktop.sh @@ -30,8 +30,8 @@ mkdir -p desktop 2>/dev/null cd desktop -declare -a release_names=("darwin-x64" "win32-x64" "win32-ia32" "linux-arm" "linux-x64" "linux-ia32") -declare -a release_renames=("zmNinja-mac.app" "zmNinja-win64bit" "zmNinja-win32bit" "zmNinja-linuxarmv7l" "zmNinja-linux64bit" "zmNinja-linux32bit") +declare -a release_names=("darwin-x64" "win32-x64" "win32-ia32" "linux-arm" "linux-x64" "linux-ia32" "linux-arm64") +declare -a release_renames=("zmNinja-mac.app" "zmNinja-win64bit" "zmNinja-win32bit" "zmNinja-linuxarmv7l" "zmNinja-linux64bit" "zmNinja-linux32bit" "zmNinja-linuxarm64") for i in "${!release_names[@]}" do diff --git a/www/js/NVR.js b/www/js/NVR.js index b2f9889c..f1ecb3ef 100644 --- a/www/js/NVR.js +++ b/www/js/NVR.js @@ -21,7 +21,7 @@ angular.module('zmApp.controllers') DO NOT TOUCH zmAppVersion It is changed by sync_version.sh */ - var zmAppVersion = "1.6.002"; + var zmAppVersion = "1.6.003"; var isBackground = false; var justResumed = false; -- cgit v1.2.3