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

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

Author: lckarssen
Date: 2014-03-18 10:16:03 +0100 (Tue, 18 Mar 2014)
New Revision: 1649

Modified:
   pkg/GenABEL-general/scripts/makedistrib_MetABEL.sh
   pkg/GenABEL-general/scripts/makedistrib_VariABEL.sh
Log:
Also change the order of making a package and R CMD check-ing it in the makedistrib scripts for MetABEL and VariABEL.


Modified: pkg/GenABEL-general/scripts/makedistrib_MetABEL.sh
===================================================================
--- pkg/GenABEL-general/scripts/makedistrib_MetABEL.sh	2014-03-18 09:15:21 UTC (rev 1648)
+++ pkg/GenABEL-general/scripts/makedistrib_MetABEL.sh	2014-03-18 09:16:03 UTC (rev 1649)
@@ -88,9 +88,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
@@ -98,9 +105,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
@@ -108,12 +115,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

Modified: pkg/GenABEL-general/scripts/makedistrib_VariABEL.sh
===================================================================
--- pkg/GenABEL-general/scripts/makedistrib_VariABEL.sh	2014-03-18 09:15:21 UTC (rev 1648)
+++ pkg/GenABEL-general/scripts/makedistrib_VariABEL.sh	2014-03-18 09:16:03 UTC (rev 1649)
@@ -79,28 +79,32 @@
 errwarn=0
 echo
 echo "--------------------------------------------------"
-echo "Running normal R checks..."
+echo "Building the package..."
 echo "--------------------------------------------------"
-R CMD check $PKG
-if grep -qE "NOTE|WARNING|ERROR" $PKG.Rcheck/00check.log; then
-    errwarn=1
-fi
+R --vanilla CMD build $PKG
+PKGFILE=${PKG}_${DESCVERSION}.tar.gz
 
 echo
 echo "--------------------------------------------------"
-echo "Check with --as-cran..."
+echo "Running normal R check on $PKGFILEs..."
 echo "--------------------------------------------------"
-R CMD check --as-cran $PKG
+R --vanilla CMD check $PKGFILE
 if grep -qE "NOTE|WARNING|ERROR" $PKG.Rcheck/00check.log; then
     errwarn=1
 fi
 
 echo
 echo "--------------------------------------------------"
-echo "Building the package for distribution..."
+echo "Check $PKGFILE with --as-cran..."
 echo "--------------------------------------------------"
-R CMD build $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
+    errwarn=1
+fi
 
+## Report whether warnings, errors, notes where found
 if [ $errwarn -eq 1 ]; then
     echo
     echo "NOTEs, WARNINGs or ERRORs found!" 1>&2