From c093bac4bcbd04e2e365ee745398fe085f6060b1 Mon Sep 17 00:00:00 2001 From: Yuri D'Elia Date: Thu, 29 Dec 2022 14:12:22 +0100 Subject: [PATCH] build: Update variant names in the legacy build system Fix rebase conflicts --- .github/travis/legacy-build.sh | 48 ++++++++++++++++++---------------- build.sh | 2 +- 2 files changed, 27 insertions(+), 23 deletions(-) diff --git a/.github/travis/legacy-build.sh b/.github/travis/legacy-build.sh index 2368fc298..8679f0a4a 100755 --- a/.github/travis/legacy-build.sh +++ b/.github/travis/legacy-build.sh @@ -1,30 +1,34 @@ #!/bin/sh set -xe -cp Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h Firmware/Configuration_prusa.h -bash -x build.sh || { echo "1_75mm_MK3S-EINSy10a-E3Dv6full variant failed" && false; } -bash -x build.sh EN_FARM || { echo "1_75mm_MK3S-EINSy10a-E3Dv6full EN_FARM failed" && false; } +cp Firmware/variants/MK3S.h Firmware/Configuration_prusa.h +bash -x build.sh || { echo "MK3S variant failed" && false; } +bash -x build.sh EN_FARM || { echo "MK3S EN_FARM failed" && false; } rm Firmware/Configuration_prusa.h -cp Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h Firmware/Configuration_prusa.h -bash -x build.sh || { echo "1_75mm_MK3-EINSy10a-E3Dv6full variant failed" && false; } -bash -x build.sh EN_FARM || { echo "1_75mm_MK3-EINSy10a-E3Dv6full EN_FARM failed" && false; } +cp Firmware/variants/MK3.h Firmware/Configuration_prusa.h +bash -x build.sh || { echo "MK3 variant failed" && false; } +bash -x build.sh EN_FARM || { echo "MK3 EN_FARM failed" && false; } rm Firmware/Configuration_prusa.h -cp Firmware/variants/1_75mm_MK25S-RAMBo13a-E3Dv6full.h Firmware/Configuration_prusa.h -bash -x build.sh || { echo "1_75mm_MK25S-RAMBo13a-E3Dv6full variant failed" && false; } +cp Firmware/variants/MK25S-RAMBo13a.h Firmware/Configuration_prusa.h +bash -x build.sh || { echo "MK25S-RAMBo13a variant failed" && false; } rm Firmware/Configuration_prusa.h -cp Firmware/variants/1_75mm_MK25S-RAMBo10a-E3Dv6full.h Firmware/Configuration_prusa.h -bash -x build.sh || { echo "1_75mm_MK25S-RAMBo10a-E3Dv6full variant failed" && false; } +cp Firmware/variants/MK25S-RAMBo10a.h Firmware/Configuration_prusa.h +bash -x build.sh || { echo "MK25S-RAMBo10a variant failed" && false; } rm Firmware/Configuration_prusa.h -cp Firmware/variants/1_75mm_MK25-RAMBo13a-E3Dv6full.h Firmware/Configuration_prusa.h -bash -x build.sh || { echo "1_75mm_MK25-RAMBo13a-E3Dv6full variant failed" && false; } +cp Firmware/variants/MK25-RAMBo13a.h Firmware/Configuration_prusa.h +bash -x build.sh || { echo "MK25-RAMBo13a variant failed" && false; } rm Firmware/Configuration_prusa.h -cp Firmware/variants/1_75mm_MK25-RAMBo10a-E3Dv6full.h Firmware/Configuration_prusa.h -bash -x build.sh || { echo "1_75mm_MK25-RAMBo10a-E3Dv6full variant failed" && false; } -cp Firmware/variants/1_75mm_MK3S-EINSy10a-E3DREVO.h Firmware/Configuration_prusa.h -bash -x build.sh || { echo "1_75mm_MK3S-EINSy10a-E3DREVO variant failed" && false; } -cp Firmware/variants/1_75mm_MK3-EINSy10a-E3DREVO.h Firmware/Configuration_prusa.h -bash -x build.sh || { echo "1_75mm_MK3-EINSy10a-E3DREVO variant failed" && false; } -cp Firmware/variants/1_75mm_MK3S-EINSy10a-E3DREVO_HF_60W.h Firmware/Configuration_prusa.h -bash -x build.sh || { echo "1_75mm_MK3S-EINSy10a-E3DREVO_HF_60W variant failed" && false; } -cp Firmware/variants/1_75mm_MK3-EINSy10a-E3DREVO_HF_60W.h Firmware/Configuration_prusa.h -bash -x build.sh || { echo "1_75mm_MK3-EINSy10a-E3DREVO_HF_60W variant failed" && false; } +cp Firmware/variants/MK25-RAMBo10a.h Firmware/Configuration_prusa.h +bash -x build.sh || { echo "MK25-RAMBo10a variant failed" && false; } +rm Firmware/Configuration_prusa.h +cp Firmware/variants/MK3S-E3DREVO.h Firmware/Configuration_prusa.h +bash -x build.sh || { echo "MK3S-E3DREVO variant failed" && false; } +rm Firmware/Configuration_prusa.h +cp Firmware/variants/MK3-E3DREVO.h Firmware/Configuration_prusa.h +bash -x build.sh || { echo "MK3-E3DREVO variant failed" && false; } +rm Firmware/Configuration_prusa.h +cp Firmware/variants/MK3S-E3DREVO_HF_60W.h Firmware/Configuration_prusa.h +bash -x build.sh || { echo "MK3S-E3DREVO_HF_60W variant failed" && false; } +rm Firmware/Configuration_prusa.h +cp Firmware/variants/MK3-E3DREVO_HF_60W.h Firmware/Configuration_prusa.h +bash -x build.sh || { echo "MK3-E3DREVO_HF_60W variant failed" && false; } rm Firmware/Configuration_prusa.h diff --git a/build.sh b/build.sh index ec4d5329b..856c80361 100755 --- a/build.sh +++ b/build.sh @@ -34,7 +34,7 @@ cd Prusa-Firmware-build || exit 7 BUILD_PATH="$( pwd -P )" if [ ! -f "$SCRIPT_PATH/Firmware/Configuration_prusa.h" ]; then - cp $SCRIPT_PATH/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h $SCRIPT_PATH/Firmware/Configuration_prusa.h || exit 8 + cp $SCRIPT_PATH/Firmware/variants/MK3.h $SCRIPT_PATH/Firmware/Configuration_prusa.h || exit 8 fi if [[ ! -z $LANGUAGES && $LANGUAGES == "EN_FARM" ]]; then