Merge remote-tracking branch 'remotes/local/dev' into superslicer_variant

Author: supermerill

BuildMacOS.sh

@@ -73,7 +73,7 @@ then
     exit -1
 fi
 
-while getopts ":idaxbhcsltwrv" opt; do
+while getopts ":idaxbhcsltwrvz" opt; do
   case ${opt} in
     i )
         BUILD_IMAGE="1"
@@ -113,7 +113,10 @@ while getopts ":idaxbhcsltwrv" opt; do
     r )
         BUILD_CLEANDEPEND="1"
         ;;
-    h ) echo "Usage: ./BuildMacOS.sh [-h][-w][-d][-r][-a][-x][-b][-c][-s][-t][-i]"
+    z )
+        BUILD_DOWNLOAD_DEP="1"
+        ;;
+    h ) echo "Usage: ./BuildMacOS.sh [-h][-w][-d][-r][-a][-x][-b][-c][-s][-t][-i][-z]"
         echo "   -h: this message"
         echo "   -w: wipe build directories before building"
         echo "   -d: build dependencies"
@@ -126,6 +129,7 @@ while getopts ":idaxbhcsltwrv" opt; do
         echo "   -t: build tests (in combination with -s)"
         echo "   -i: generate DMG image (optional)\n"
 		echo "   -v: change the version 'UNKNOWN' to the date of the day"
+		echo "   -z: download libraries to package in the dmg (libzstd)"
         exit 0
         ;;
   esac
@@ -165,7 +169,6 @@ echo "\nbrew --prefix libiconv:\n"
 brew --prefix libiconv
 echo "\nbrew --prefix zstd:\n"
 brew --prefix zstd
-export LIBRARY_PATH=$LIBRARY_PATH:$(brew --prefix zstd)/lib/
 # not enough to fix the issue on cross-compiling
 #if [[ -n "$BUILD_ARCH" ]]
 #then
@@ -334,7 +337,12 @@ then
     chmod 755 $ROOT/build/src/BuildMacOSImage.sh
     pushd build  > /dev/null
     echo "> $ROOT/build/src/BuildMacOSImage.sh -i ${BUILD_IMG_ARCH}"
-    $ROOT/build/src/BuildMacOSImage.sh -i $BUILD_IMG_ARCH
+    if [[ -n "$BUILD_DOWNLOAD_DEP" ]]
+    then
+        $ROOT/build/src/BuildMacOSImage.sh -i $BUILD_IMG_ARCH
+    else
+        $ROOT/build/src/BuildMacOSImage.sh -i $BUILD_IMG_ARCH -z
+    fi
     popd  > /dev/null
     echo "> ls ROOT"
     ls -al $ROOT

resources/ui_layout/default/printer_fff.ui

@@ -37,7 +37,7 @@ group:silent_mode_event:filename_format_event:Firmware
 	end_line
 	line:Processing limit
 		setting:max_gcode_per_second
-		setting:gcode_command_buffer
+#		setting:gcode_command_buffer
 	end_line
 	line:G2/G3 generation
 		setting:arc_fitting

src/platform/osx/BuildMacOSImage.sh.in

@@ -13,7 +13,7 @@
 
 export OS_NAME="macOS"
 VERSION_NUMBER=""
-while getopts ":ixavh" opt; do
+while getopts ":ixavhz" opt; do
   case ${opt} in
     i )
         export BUILD_IMAGE="1"
@@ -27,10 +27,14 @@ while getopts ":ixavh" opt; do
     v )
         export VERSION_NUMBER="-@SLIC3R_VERSION_FULL@"
         ;;
-    h ) echo "Usage: ./BuildLinuxImage.sh [-i][-a][-h]"
+    z )
+        BUILD_DOWNLOAD_DEP="1"
+        ;;
+    h ) echo "Usage: ./BuildLinuxImage.sh [-i][-a][-h][-z]"
         echo "   -i: generate Appimage (optional)"
         echo "   -x: set output name for intel (optional)"
         echo "   -a: set output name for arm (optional)"
+        echo "   -z: download libs to package (libzstd) (optional)"
         echo "   -h: help"
         exit 0
         ;;
@@ -76,8 +80,19 @@ done
         # copy bin and do not let it lower case
         cp -f bin/@SLIC3R_APP_CMD@ pack/@SLIC3R_APP_KEY@/@[email protected]/Contents/MacOS/@SLIC3R_APP_KEY@
         chmod u+x pack/@SLIC3R_APP_KEY@/@[email protected]/Contents/MacOS/@SLIC3R_APP_KEY@
-        cp /usr/local/opt/zstd/lib/libzstd.1.dylib pack/@SLIC3R_APP_KEY@/@[email protected]/Contents/MacOS/libzstd.1.dylib
-
+        
+        #copy libzstd
+        echo "libzstd:\n"
+        ls /usr/local/opt/zstd/lib/libzstd*
+        ls /usr/local/opt/zstd/lib/libzstd*.dylib
+        cp /usr/local/opt/zstd/lib/libzstd* pack/@SLIC3R_APP_KEY@/@[email protected]/Contents/MacOS/Frameworks/
+
+        if [[ -n "$BUILD_DOWNLOAD_DEP" ]]
+        then
+            echo "downloading libzstd\n"
+            ZSTDURL="https://github.com/supermerill/SuperSlicer_deps/releases/download/1.8/libzstd.1.5.6.dylib"
+            wget ${ZSTDURL} -O pack/@SLIC3R_APP_KEY@/@[email protected]/Contents/MacOS/Frameworks/libzstd.1.5.6.dylib
+        fi
 #     } &> $ROOT/Build.log # Capture all command output
     echo -e "\n ... done\n"