[rkward] /: Purge ver.R from git, as it will lead to conflicts in automated builds, after updating version numbers

[Thomas Friedrichsmeier]

Git commit 98d5626efd2912d51df819b72d0ef56a72ac6798 by Thomas Friedrichsmeier.
Committed on 20/04/2018 at 09:10.
Pushed by tfry into branch 'master'.

Purge ver.R from git, as it will lead to conflicts in automated builds, after updating version numbers

M  +1    -0    .gitignore
M  +1    -1    rkward/rbackend/rpackages/rkward/DESCRIPTION
D  +0    -6    rkward/rbackend/rpackages/rkward/R/ver.R
M  +1    -1    scripts/makedist.sh
M  +9    -2    scripts/roxygenize.sh

https://commits.kde.org/rkward/98d5626efd2912d51df819b72d0ef56a72ac6798

diff --git a/.gitignore b/.gitignore
index a7b60105..46a93114 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,6 +6,7 @@ rkward/plugins/po/
 # Generated from cmake
 rkward/resource.ver
 rkward/version.h
+rkward/rbackend/rpackages/rkward/R/ver.R
 # Log files from testing
 tests/make_plugintests.txt
 # Message templates and imported translations should not be in the repo
diff --git a/rkward/rbackend/rpackages/rkward/DESCRIPTION b/rkward/rbackend/rpackages/rkward/DESCRIPTION
index a770b10e..f32ce516 100644
--- a/rkward/rbackend/rpackages/rkward/DESCRIPTION
+++ b/rkward/rbackend/rpackages/rkward/DESCRIPTION
@@ -19,7 +19,7 @@ Authors at R: c(person(given="Thomas", family="Friedrichsmeier",
     person(given="RKWard-devel", family="mailing list",
     email="rkward-devel at kde.org", role=c("cre","ctb")))
 Version: 0.7.1
-Date: 2018-04-12
+Date: 2018-04-20
 Collate:
     'base_overrides.R'
     'internal.R'
diff --git a/rkward/rbackend/rpackages/rkward/R/ver.R b/rkward/rbackend/rpackages/rkward/R/ver.R
deleted file mode 100644
index 4be5c508..00000000
--- a/rkward/rbackend/rpackages/rkward/R/ver.R
+++ /dev/null
@@ -1,6 +0,0 @@
-# DO NOT CHANGE THIS FILE MANUALLY!
-# version number will be updated by cmake, see
-# rkward/SetVersionNumber.cmake
-
-#' @export
-".rk.app.version" <- "0.7.0z+0.7.1+devel1"
diff --git a/scripts/makedist.sh b/scripts/makedist.sh
index 1c423a2e..6631fc2b 100755
--- a/scripts/makedist.sh
+++ b/scripts/makedist.sh
@@ -18,7 +18,7 @@ mkdir $DISTDIR
 $BASEDIR/scripts/set_dist_version.sh $VERSION
 
 # update roxygen documentation just in case we forgot:
-$BASEDIR/scripts/roxygenize.sh
+$BASEDIR/scripts/roxygenize.sh || exit 1
 
 cp -a AUTHORS CMakeLists.txt COPYING ChangeLog TODO INSTALL NOTES README configure VERSION.cmake $DISTDIR
 mkdir $DISTDIR/doc
diff --git a/scripts/roxygenize.sh b/scripts/roxygenize.sh
index 9e0bb69b..dd199c58 100755
--- a/scripts/roxygenize.sh
+++ b/scripts/roxygenize.sh
@@ -3,16 +3,23 @@
 
 cd `dirname $0`/..
 BASEDIR=`pwd`
+PACKAGESDIR="${BASEDIR}/rkward/rbackend/rpackages"
+
 
 if [ "$#" = 0 ]; then
-	PACKAGES="'${BASEDIR}/rkward/rbackend/rpackages/rkward/'"
+	PACKAGES="'${PACKAGESDIR}/rkward/'"
 	# currently excluded due to missing support for slots in roxygen2:
-	# '${BASEDIR}/rkward/rbackend/rpackages/rkwardtests/'
+	# '${PACKAGESDIR}/rkward/tests/'
 else
 	PACKAGES="'$1'"
 	shift
 fi
 
+if [ ! -f "${PACKAGESDIR}/rkward/R/ver.R" ]; then
+	echo "ver.R does not exist in rkward package. Run cmake, first."
+	exit 1
+fi
+
 while (( "$#" )); do
 	PACKAGES="${PACKAGES}, '$1'"
 	shift