From d7964d923f1b99362314d916560c8fae6f15548b Mon Sep 17 00:00:00 2001 From: Yuri D'Elia Date: Sun, 18 Dec 2022 14:10:48 +0100 Subject: [PATCH 1/2] build: Use the cached path for the build environment --- build.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/build.sh b/build.sh index 8b09fde77..5ef79de8e 100755 --- a/build.sh +++ b/build.sh @@ -8,15 +8,15 @@ if [ ! -d "build-env" ]; then fi cd build-env || exit 2 -if [ ! -d "../../PF-build-env-$BUILD_ENV-build" ]; then +if [ ! -d "../../PF-build-env/$BUILD_ENV-build" ]; then if [ ! -f "PF-build-env-Linux64-$BUILD_ENV.zip" ]; then #wget https://github.com/3d-gussner/PF-build-env-1/releases/download/$BUILD_ENV-Linux64/PF-build-env-Linux64-$BUILD_ENV.zip || exit 3 wget https://github.com/prusa3d/PF-build-env/releases/download/$BUILD_ENV-Linux64/PF-build-env-Linux64-$BUILD_ENV.zip || exit 3 fi - unzip -q PF-build-env-Linux64-$BUILD_ENV.zip -d ../../PF-build-env-$BUILD_ENV-build || exit 4 + unzip -q PF-build-env-Linux64-$BUILD_ENV.zip -d ../../PF-build-env/$BUILD_ENV-build || exit 4 fi -cd ../../PF-build-env-$BUILD_ENV-build || exit 5 +cd ../../PF-build-env/$BUILD_ENV-build || exit 5 BUILD_ENV_PATH="$( pwd -P )" cd .. @@ -42,6 +42,7 @@ fi $BUILD_ENV_PATH/arduino $SCRIPT_PATH/Firmware/Firmware.ino --verify --board PrusaResearch:avr:prusa_einsy_rambo --pref build.path=$BUILD_PATH --pref compiler.warning_level=all || exit 9 export ARDUINO=$BUILD_ENV_PATH +export OUTDIR=$BUILD_PATH if [ -z $LANGUAGES ]; then cd $SCRIPT_PATH/lang From c5cb8f77e6d43d3b5fe6741d3facd4d265ccd08f Mon Sep 17 00:00:00 2001 From: Yuri D'Elia Date: Sun, 18 Dec 2022 14:22:34 +0100 Subject: [PATCH 2/2] build: Add a deprecation warning in build.sh --- build.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/build.sh b/build.sh index 5ef79de8e..ec4d5329b 100755 --- a/build.sh +++ b/build.sh @@ -1,4 +1,9 @@ #!/bin/bash +echo "***************************************************" +echo "WARNING: build.sh will be removed soon, do not use!" +echo "Switch your build to cmake or use PF-build.sh " +echo "***************************************************" + BUILD_ENV="1.0.8" SCRIPT_PATH="$( cd "$(dirname "$0")" ; pwd -P )" LANGUAGES=$1