[Genabel-commits] r1647 - pkg/GenABEL-general/scripts

[noreply at r-forge.r-project.org]

Author: lckarssen
Date: 2014-03-18 10:07:49 +0100 (Tue, 18 Mar 2014)
New Revision: 1647

Modified:
   pkg/GenABEL-general/scripts/makedistrib_DatABEL.sh
Log:
In the makedistrib.DatABEL.sh script: first build the tar.gz file, then run the R CMD checks. This is recommended in the "Writing R extensions" manual and having the order wrong just gave me the following warning: "Package vignette without corresponding PDF/HTML". Now that the checks are done on the .tar.gz file the warning is gone.


Modified: pkg/GenABEL-general/scripts/makedistrib_DatABEL.sh
===================================================================
--- pkg/GenABEL-general/scripts/makedistrib_DatABEL.sh	2014-03-18 09:01:08 UTC (rev 1646)
+++ pkg/GenABEL-general/scripts/makedistrib_DatABEL.sh	2014-03-18 09:07:49 UTC (rev 1647)
@@ -123,9 +123,16 @@
 errwarn=0
 echo
 echo "--------------------------------------------------"
-echo "Running normal R checks..."
+echo "Building the package..."
 echo "--------------------------------------------------"
-R --vanilla CMD check $PKG
+R --vanilla CMD build $PKG
+PKGFILE=${PKG}_${DESCVERSION}.tar.gz
+
+echo
+echo "--------------------------------------------------"
+echo "Running normal R check on $PKGFILEs..."
+echo "--------------------------------------------------"
+R --vanilla CMD check $PKGFILE
 if grep -qE "NOTE|WARNING|ERROR" $PKG.Rcheck/00check.log; then
     errwarn=1
 fi
@@ -133,9 +140,9 @@
 if [ $CRANCHECK == true ]; then
     echo
     echo "--------------------------------------------------"
-    echo "Check with --as-cran..."
+    echo "Check $PKGFILE with --as-cran..."
     echo "--------------------------------------------------"
-    R --vanilla CMD check --as-cran $PKG
+    R --vanilla CMD check --as-cran $PKGFILE
     if sed -e 's/feasibility ... WARNING/feasibility ... WRNNG/' \
         -e 's/^WARNING/WRNNG/' $PKG.Rcheck/00check.log | \
         grep -qE "NOTE|WARNING|ERROR"; then
@@ -143,12 +150,7 @@
     fi
 fi
 
-echo
-echo "--------------------------------------------------"
-echo "Building the package for distribution..."
-echo "--------------------------------------------------"
-R --vanilla CMD build $PKG
-
+## Report whether warnings, errors, notes where found
 if [ $errwarn -eq 1 ]; then
     echo
     echo "NOTEs, WARNINGs or ERRORs found!" 1>&2