diff --git a/build-all.sh b/build-all.sh index 842617b..e4bd58a 100755 --- a/build-all.sh +++ b/build-all.sh @@ -3,4 +3,5 @@ BASE_DIR=$(cd `dirname "$0"`; pwd) "$BASE_DIR/build-opentoonz.sh" +"$BASE_DIR/build-opentoonz-testing.sh" "$BASE_DIR/build-synfigstudio-linux.sh" diff --git a/build-opentoonz-testing.sh b/build-opentoonz-testing.sh new file mode 100755 index 0000000..4bca475 --- /dev/null +++ b/build-opentoonz-testing.sh @@ -0,0 +1,57 @@ +#!/bin/bash + +set -e + +BASE_DIR=$(cd `dirname "$0"`; pwd) +DATA_DIR="$BASE_DIR/docker-builder-data" +BUILD_DIR=$DATA_DIR/build +PUBLISH_DIR=$BASE_DIR/publish +CONFIG_FILE="$BASE_DIR/config.sh" +PACKET_BUILD_DIR="$BUILD_DIR/packet" +SCRIPT_BUILD_DIR="$BUILD_DIR/script" +if [ -f $CONFIG_FILE ]; then + source $CONFIG_FILE +fi + +SCRIPT="$BASE_DIR/docker/run.sh" + +run_appimage() { + export PLATFORM="$1" + export ARCH="$2" + + echo "" + echo "Update opentoonz for $PLATFORM-$ARCH" + echo "" + $SCRIPT update opentoonz-testing + $SCRIPT clean_before_do install_release opentoonz-testingappimage + + "$PUBLISH_DIR/publish.sh" \ + "opentoonz-testing" \ + "OpenToonz-%VERSION%-%DATE%-%COMMIT%-$PLATFORM-${ARCH}bits.appimage" \ + "$PACKET_BUILD_DIR/$PLATFORM-$ARCH/opentoonz-testingappimage/install_release" \ + "*.appimage" \ + "$PACKET_BUILD_DIR/$PLATFORM-$ARCH/opentoonz-testingappimage/envdeps_release/version-opentoonz-testing" +} + +run_nsis() { + export PLATFORM="$1" + export ARCH="$2" + + echo "" + echo "Update opentoonz for $PLATFORM-$ARCH" + echo "" + $SCRIPT update opentoonz-testing + $SCRIPT clean_before_do install_release opentoonz-testingnsis + + "$PUBLISH_DIR/publish.sh" \ + "opentoonz-testing" \ + "OpenToonz-%VERSION%-%DATE%-%COMMIT%-$PLATFORM-${ARCH}bits.exe" \ + "$PACKET_BUILD_DIR/$PLATFORM-$ARCH/opentoonz-testingnsis/install_release" \ + "*.exe" \ + "$PACKET_BUILD_DIR/$PLATFORM-$ARCH/opentoonz-testingnsis/envdeps_release/version-opentoonz-testing" +} + +run_appimage linux 64 +run_appimage linux 32 +run_nsis win 64 +#run_nsis win 32 diff --git a/build-opentoonz.sh b/build-opentoonz.sh index 99bccb9..37bf460 100755 --- a/build-opentoonz.sh +++ b/build-opentoonz.sh @@ -22,8 +22,8 @@ run_appimage() { echo "" echo "Update opentoonz for $PLATFORM-$ARCH" echo "" - sudo $SCRIPT update opentoonz-master - sudo $SCRIPT clean_before_do install_release opentoonz-appimage + $SCRIPT update opentoonz-master + $SCRIPT clean_before_do install_release opentoonz-appimage "$PUBLISH_DIR/publish.sh" \ "opentoonz" \ @@ -40,8 +40,8 @@ run_nsis() { echo "" echo "Update opentoonz for $PLATFORM-$ARCH" echo "" - sudo $SCRIPT update opentoonz-master - sudo $SCRIPT clean_before_do install_release opentoonz-nsis + $SCRIPT update opentoonz-master + $SCRIPT clean_before_do install_release opentoonz-nsis "$PUBLISH_DIR/publish.sh" \ "opentoonz" \