Merge branch 'development' of github.com:dannagle/PacketSender into d…

…evelopment
dannagle · Aug 20, 2023 · 0c89dfb · 0c89dfb
2 parents b6f0cad + 5915ce8
commit 0c89dfb
Show file tree

Hide file tree

Showing 13 changed files with 690 additions and 663 deletions.
diff --git a/ci_cd/mac/mac-build.sh b/ci_cd/mac/mac-build.sh
@@ -43,10 +43,13 @@ echo "Replacing Info.plist with $BUILD_VERSION"
 sed -i '' 's/<string>1.0<\/string>/<string>'$BUILD_VERSION'<\/string>/' Info.plist
 
 # "/Users/dannagle/Qt/6.5.2/macos/bin/qmake" PacketSender.pro -spec macx-clang CONFIG+=qtquickcompiler
-"/Users/dannagle/Qt/6.5.2/macos/bin//qmake" PacketSender.pro -spec macx-clang CONFIG+=x86_64
-make
+"/Users/dannagle/Qt/6.5.2/macos/bin/qmake" PacketSender.pro -spec macx-clang CONFIG+=qtquickcompiler QMAKE_APPLE_DEVICE_ARCHS="x86_64 arm64"
+
+# /Users/dannagle/Qt/6.5.2/macos/bin/qmake /Users/dannagle/github/PacketSender/src/PacketSender.pro -spec macx-clang CONFIG+=qtquickcompiler QMAKE_APPLE_DEVICE_ARCHS="x86_64 arm64" && /usr/bin/make qmake_all
+
+make 
 # /Users/dannagle/Qt/6.5.2/macos/bin/macdeployqt packetsender.app -appstore-compliant
-/Users/dannagle/Qt/6.5.2/macos/bin//macdeployqt packetsender.app -appstore-compliant
+/Users/dannagle/Qt/6.5.2/macos/bin/macdeployqt packetsender.app -appstore-compliant
 
 /usr/bin/codesign --option runtime --deep --force --sign  38E41C6C66CCA827750A10E26539E038F033E933 --timestamp packetsender.app
 mv packetsender.app PacketSender.app

diff --git a/ci_cd/windows/makeall.bat b/ci_cd/windows/makeall.bat
@@ -14,5 +14,5 @@ POPD
 GOTO End1
 
 :No1
-  ECHO Need build version param (such as 8.0.3)
+  ECHO Need build version param (such as 8.4.3)
 :End1
diff --git a/ci_cd/windows/win-prebuild.bat b/ci_cd/windows/win-prebuild.bat
@@ -6,5 +6,5 @@ wsl php ci_cd/windows/win-prebuild.php
 GOTO End1
 
 :No1
-  ECHO Need build version param (such as 8.0.3)
+  ECHO Need build version param (such as 8.4.3)
 :End1
diff --git a/src/globals.h b/src/globals.h
@@ -11,11 +11,11 @@
 #define GLOBALS_H
 
 //BEGIN SW VERSION
-#define SW_VERSION "8.0.6"
+#define SW_VERSION "8.4.3"
 //END SW VERSION
 
 //BEGIN FILE VERSION
-#define VER_FILEVERSION 8,0,6,0
+#define VER_FILEVERSION 8,4,3,0
 //END FILE VERSION
 
 #define QDEBUG() qDebug() << __FILE__ << "/" <<__LINE__  <<"(" << __FUNCTION__ << "):"

diff --git a/src/languages/packetsender_de.qm b/src/languages/packetsender_de.qm