diff --git a/build-opentoonz-testing.sh b/build-opentoonz-testing.sh index 0d2ccc7..f21116f 100755 --- a/build-opentoonz-testing.sh +++ b/build-opentoonz-testing.sh @@ -24,10 +24,10 @@ run_appimage() { export ARCH="$2" echo "" - echo "Update opentoonz for $PLATFORM-$ARCH" + echo "Update and build opentoonz for $PLATFORM-$ARCH" echo "" - $SCRIPT update opentoonz-testing - $SCRIPT clean_before_do install_release opentoonz-testingappimage + $SCRIPT chain update opentoonz-testing \ + chain clean_before_do install_release opentoonz-testingappimage local TEMPLATE=`gen_name_template "OpenToonz" "$OPENTOONZ_TESTING_TAG" "$PLATFORM" "$ARCH" ".appimage"` "$PUBLISH_DIR/publish.sh" \ @@ -43,10 +43,10 @@ run_nsis() { export ARCH="$2" echo "" - echo "Update opentoonz for $PLATFORM-$ARCH" + echo "Update and build opentoonz for $PLATFORM-$ARCH" echo "" - $SCRIPT update opentoonz-testing - $SCRIPT clean_before_do install_release opentoonz-testingnsis + $SCRIPT chain update opentoonz-testing \ + chain clean_before_do install_release opentoonz-testingnsis local TEMPLATE=`gen_name_template "OpenToonz" "$OPENTOONZ_TESTING_TAG" "$PLATFORM" "$ARCH" ".exe"` "$PUBLISH_DIR/publish.sh" \ diff --git a/build-opentoonz.sh b/build-opentoonz.sh index 8a2502a..adf38e8 100755 --- a/build-opentoonz.sh +++ b/build-opentoonz.sh @@ -23,10 +23,10 @@ run_appimage() { export ARCH="$2" echo "" - echo "Update opentoonz for $PLATFORM-$ARCH" + echo "Update and build opentoonz for $PLATFORM-$ARCH" echo "" - $SCRIPT update opentoonz-master - $SCRIPT clean_before_do install_release opentoonz-appimage + $SCRIPT chain update opentoonz-master \ + chain clean_before_do install_release opentoonz-appimage local TEMPLATE=`gen_name_template "OpenToonz" "" "$PLATFORM" "$ARCH" ".appimage"` "$PUBLISH_DIR/publish.sh" \ @@ -42,10 +42,10 @@ run_nsis() { export ARCH="$2" echo "" - echo "Update opentoonz for $PLATFORM-$ARCH" + echo "Update and build opentoonz for $PLATFORM-$ARCH" echo "" - $SCRIPT update opentoonz-master - $SCRIPT clean_before_do install_release opentoonz-nsis + $SCRIPT chain update opentoonz-master \ + chain clean_before_do install_release opentoonz-nsis local TEMPLATE=`gen_name_template "OpenToonz" "" "$PLATFORM" "$ARCH" ".exe"` "$PUBLISH_DIR/publish.sh" \ diff --git a/build-papagayong.sh b/build-papagayong.sh index 8e069e0..a4cafae 100755 --- a/build-papagayong.sh +++ b/build-papagayong.sh @@ -23,10 +23,10 @@ run_appimage() { export ARCH="$2" echo "" - echo "Update papagayong for $PLATFORM-$ARCH" + echo "Update and build papagayong for $PLATFORM-$ARCH" echo "" - $SCRIPT update papagayong-testing - $SCRIPT clean_before_do install_release papagayong-appimage + $SCRIPT chain update papagayong-testing \ + chain clean_before_do install_release papagayong-appimage local TEMPLATE=`gen_name_template "PapagayoNG" "" "$PLATFORM" "$ARCH" ".appimage"` "$PUBLISH_DIR/publish.sh" \ @@ -42,13 +42,12 @@ run_nsis() { export ARCH="$2" echo "" - echo "Update papagayong for $PLATFORM-$ARCH" + echo "Update and build papagayong for $PLATFORM-$ARCH" echo "" - $SCRIPT update papagayong-testing - $SCRIPT clean_before_do unpack papagayong-testing - # QUICK HACK: - $SCRIPT shell papagayong-testing "/build/script/packet/papagayong-testing.files/build-win.sh" + $SCRIPT chain update papagayong-testing \ + chain clean_before_do unpack papagayong-testing \ + chain shell papagayong-testing "/build/script/packet/papagayong-testing.files/build-win.sh" local TEMPLATE=`gen_name_template "PapagayoNG" "" "$PLATFORM" "$ARCH" ".exe"` "$PUBLISH_DIR/publish.sh" \ diff --git a/build-synfigstudio.sh b/build-synfigstudio.sh index 6226431..35625d5 100755 --- a/build-synfigstudio.sh +++ b/build-synfigstudio.sh @@ -24,12 +24,15 @@ run_appimage() { export ARCH="$2" echo "" - echo "Update synfigstudio for $PLATFORM-$ARCH" + echo "Update and build synfigstudio for $PLATFORM-$ARCH" echo "" - $SCRIPT update synfigetl-master - $SCRIPT update synfigcore-master - $SCRIPT update synfigstudio-master - $SCRIPT clean_before_do install_release synfigstudio-appimage + $SCRIPT chain native update synfigetl-master \ + chain native update synfigcore-master \ + chain native update synfigstudio-master \ + chain update synfigetl-master \ + chain update synfigcore-master \ + chain update synfigstudio-master \ + chain clean_before_do install_release synfigstudio-appimage local TEMPLATE=`gen_name_template "SynfigStudio" "$SYNFIGSTUDIO_TESTING_TAG" "$PLATFORM" "$ARCH" ".appimage"` "$PUBLISH_DIR/publish.sh" \ @@ -45,12 +48,15 @@ run_nsis() { export ARCH="$2" echo "" - echo "Update synfigstudio for $PLATFORM-$ARCH" + echo "Update and build synfigstudio for $PLATFORM-$ARCH" echo "" - $SCRIPT update synfigetl-master - $SCRIPT update synfigcore-master - $SCRIPT update synfigstudio-master - $SCRIPT clean_before_do install_release synfigstudio-nsis + $SCRIPT chain native update synfigetl-master \ + chain native update synfigcore-master \ + chain native update synfigstudio-master \ + chain update synfigetl-master \ + chain update synfigcore-master \ + chain update synfigstudio-master \ + chain clean_before_do install_release synfigstudio-nsis local TEMPLATE=`gen_name_template "SynfigStudio" "$SYNFIGSTUDIO_TESTING_TAG" "$PLATFORM" "$ARCH" ".exe"` "$PUBLISH_DIR/publish.sh" \ diff --git a/docker-builder-data/build/script/common/manager.sh b/docker-builder-data/build/script/common/manager.sh index 327f7e5..a08e5d6 100755 --- a/docker-builder-data/build/script/common/manager.sh +++ b/docker-builder-data/build/script/common/manager.sh @@ -1085,6 +1085,18 @@ foreach_packet() { done } +chain() { + local ARG + local CNT=1 + for ARG in "$@"; do + if [ "${@:CNT:1}" = "chain" ]; then + break; + fi + CNT=$((CNT+1)) + done + if ! "${@:0:CNT}"; then return 1; fi + if ! "${@:CNT}"; then return 1; fi +} set_toolchain "$@"