From 9993d95fa0d175a6a2e23fa50409b963ca70916f Mon Sep 17 00:00:00 2001 From: ice0 Date: Sep 17 2018 10:07:37 +0000 Subject: Fixed synfisgstudio-release script --- diff --git a/autobuild/synfigstudio-release.sh b/autobuild/synfigstudio-release.sh index 3a638bc..31bfc5c 100755 --- a/autobuild/synfigstudio-release.sh +++ b/autobuild/synfigstudio-release.sh @@ -33,6 +33,12 @@ echo "CORE_VERSION=$CORE_VERSION" export STUDIO_VERSION=`cat $SRCPREFIX/synfig-studio/configure.ac |egrep "AC_INIT\(\[Synfig Studio\],"| sed "s|.*Studio\],\[||" | sed "s|\],\[.*||"` echo "STUDIO_VERSION=$STUDIO_VERSION" +# Colored output +RED='\033[0;31m' +YLW='\033[1;33m' +GRN='\033[0;32m' +NC='\033[0m' # No Color + if [ -e /etc/debian_version ] && [ -z $with_boost_libdir ]; then # Debian/Ubuntu multiarch MULTIARCH_LIBDIR="/usr/lib/`uname -m`-linux-gnu/" @@ -46,30 +52,50 @@ if [ -z $THREADS ]; then export THREADS=4 fi -l10n() +start_stage() { - cd $SRCPREFIX/synfig-core/po - OUTPUT=`intltool-update -m 2>&1` - cd $SRCPREFIX/synfig-studio/po + echo -e "Starting ${YLW}$1${NC} stage" +} + +end_stage() { + echo "$1 complete." +} + +l10n_check() +{ + cd $2 OUTPUT=`intltool-update -m 2>&1` if [ ! -z "${OUTPUT}" ]; then - echo "${OUTPUT}" - exit 1 -fi + echo -e "Checking $1 translations... ${RED}Error${NC}" + echo "${OUTPUT}" + exit 1 + fi + echo -e "Checking $1 translations... ${GRN}Done${NC}" +} + +l10n() +{ + start_stage "l10n" + l10n_check "Synfig Core" "$SRCPREFIX/synfig-core/po" + l10n_check "Synfig Studio" "$SRCPREFIX/synfig-studio/po" + end_stage "l10n" } pack-etl() { + start_stage "Pack ETL" cd $SRCPREFIX/ETL autoreconf -if ./configure --prefix="$PREFIX" make distcheck -j${THREADS} mv ETL-${ETL_VERSION}.tar.gz ../../ + end_stage "Pack ETL" } test-etl() { + start_stage "Test ETL" cd $SRCPREFIX/../ tar xf ETL-${ETL_VERSION}.tar.gz cd ETL-${ETL_VERSION} @@ -77,27 +103,32 @@ test-etl() make install -j${THREADS} cd .. rm -rf $SRCPREFIX/../ETL-${ETL_VERSION} + end_stage "Test ETL" } etl() { + start_stage "ETL" pack-etl test-etl + end_stage "ETL" } pack-core() { + start_stage "Pack Synfig Core" cd $SRCPREFIX/synfig-core ./bootstrap.sh ./configure --prefix="$PREFIX" -echo "------------------------------------- pack-core make" + echo "------------------------------------- pack-core make" make distcheck -j${THREADS} mv synfig-${CORE_VERSION}.tar.gz ../../ + end_stage "Pack Synfig Core" } test-core() { -echo "------------------------------------- test-core" + start_stage "Test Synfig Core" cd $SRCPREFIX/../ tar xf synfig-${CORE_VERSION}.tar.gz cd synfig-${CORE_VERSION} @@ -105,25 +136,31 @@ echo "------------------------------------- test-core" make install -j${THREADS} cd .. rm -rf $SRCPREFIX/../synfig-${CORE_VERSION} + end_stage "Test Synfig Core" } core() { + start_stage "Synfig Core" pack-core test-core + end_stage "Synfig Core" } pack-studio() { + start_stage "Pack Synfig Studio" cd $SRCPREFIX/synfig-studio ./bootstrap.sh ./configure --prefix="$PREFIX" make distcheck -j${THREADS} mv synfigstudio-${STUDIO_VERSION}.tar.gz ../.. + end_stage "Pack Synfig Studio" } test-studio() { + start_stage "Test Synfig Studio" cd $SRCPREFIX/../ tar xf synfigstudio-${STUDIO_VERSION}.tar.gz cd synfigstudio-${STUDIO_VERSION} @@ -131,12 +168,15 @@ test-studio() make install -j${THREADS} cd .. rm -rf $SRCPREFIX/../synfigstudio-${STUDIO_VERSION} + end_stage "Test Synfig Studio" } studio() { + start_stage "Synfig Studio" pack-studio test-studio + end_stage "Synfig Studio" } mkall() @@ -149,8 +189,9 @@ mkall() do_cleanup() { - echo "Cleaning up..." - if [ ${PREFIX} != ${DEPSPREFIX} ]; then + start_stage "Clean up" + #echo "Cleaning up..." + if [ "${PREFIX}" != "${DEPSPREFIX}" ]; then [ ! -e ${DEPSPREFIX} ] || mv ${DEPSPREFIX} ${DEPSPREFIX}.off fi [ ! -e ${SYSPREFIX} ] || mv ${SYSPREFIX} ${SYSPREFIX}.off