From: Thomas F. <tho...@ru...> - 2015-01-15 13:55:36
|
Git commit 4688b078bace070aa311bd2b003fbdee53bec4ff by Thomas Friedrichsmeier. Committed on 15/01/2015 at 13:45. Pushed by tfry into branch 'master'. Some small tweaks to packaging scripts: - Roxygenize only distribution packages by default - Check if translations are present when creating tarball M +5 -0 scripts/makedist.sh M +10 -5 scripts/roxygenize.sh http://commits.kde.org/rkward/4688b078bace070aa311bd2b003fbdee53bec4ff diff --git a/scripts/makedist.sh b/scripts/makedist.sh index 01733de..c9d28e2 100755 --- a/scripts/makedist.sh +++ b/scripts/makedist.sh @@ -5,6 +5,11 @@ BASEDIR=`pwd` OLDVERSION=`${BASEDIR}/scripts/getversion.sh` VERSION=`${BASEDIR}/scripts/getversion.sh ${1}` +if [ ! -d "$BASEDIR/i18n/po" ]; then + echo "Translations are missing!" + exit 1 +fi + mkdir $BASEDIR/disttemp DISTDIRREL=rkward-$VERSION DISTDIR=$BASEDIR/disttemp/$DISTDIRREL diff --git a/scripts/roxygenize.sh b/scripts/roxygenize.sh index b95bfc5..0b65c83 100755 --- a/scripts/roxygenize.sh +++ b/scripts/roxygenize.sh @@ -3,13 +3,18 @@ cd `dirname $0`/.. BASEDIR=`pwd` +PACKAGES="'${BASEDIR}/rkward/rbackend/rpackages/rkward/'" + # currently excluded due to missing support for slots in roxygen2: + # '${BASEDIR}/rkward/rbackend/rpackages/rkwardtests/' +if [ "$1" = "--all" ]; then +PACKAGES="${PACKAGES}, \ + '${BASEDIR}/packages/XiMpLe/', + '${BASEDIR}/packages/rkwarddev/'" +fi + echo " library (roxygen2) - packages <- c ( '${BASEDIR}/rkward/rbackend/rpackages/rkward/', - # '${BASEDIR}/rkward/rbackend/rpackages/rkwardtests/', # currently excluded due to missing support for slots in roxygen2 - '${BASEDIR}/packages/XiMpLe/', - '${BASEDIR}/packages/rkwarddev/' - ) + packages <- c ($PACKAGES) for (package in packages) { dummy <- roxygen2:::source_package (package) # See https://github.com/klutometis/roxygen/issues/167 roxygenize (package) |