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

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

Author: maksim
Date: 2013-12-23 11:04:09 +0100 (Mon, 23 Dec 2013)
New Revision: 1502

Modified:
   pkg/GenABEL-general/scripts/makedistrib_GenABEL.sh
Log:
Improved some steps

Modified: pkg/GenABEL-general/scripts/makedistrib_GenABEL.sh
===================================================================
--- pkg/GenABEL-general/scripts/makedistrib_GenABEL.sh	2013-12-20 12:25:36 UTC (rev 1501)
+++ pkg/GenABEL-general/scripts/makedistrib_GenABEL.sh	2013-12-23 10:04:09 UTC (rev 1502)
@@ -24,7 +24,7 @@
 
 
 echo
-echo Install the freshest R packages from CRAN and Bioconductor repository...
+echo Install the freshest R packages from CRAN and Bioconductor repositories...
 
 CRAN_repo="\"http://cran.xl-mirror.nl\""
 
@@ -58,10 +58,10 @@
 echo Build and install packages...
 
 R CMD build DatABEL
-R CMD INSTALL DatABEL_*
+R CMD INSTALL DatABEL_*tar.gz
 
 R CMD build MetABEL
-R CMD INSTALL MetABEL_*
+R CMD INSTALL MetABEL_*tar.gz
 
 
 cd ProbABEL
@@ -78,9 +78,9 @@
 cd GenABEL.data
 rm -rf inst R
 cd ../
-R CMD check GenABEL.data
-R CMD INSTALL GenABEL.data
+R CMD check --as-cran GenABEL.data
 R CMD build GenABEL.data
+R CMD INSTALL GenABEL.data_*tar.gz
 
 
 
@@ -108,15 +108,15 @@
 cd ..
 # end cleanup
 
-R CMD check GenABEL
+#R CMD check --ad-cran GenABEL
 R CMD build GenABEL
-R CMD INSTALL GenABEL_*
+R CMD INSTALL GenABEL_*tar.gz
 
 
 
 
 R CMD build MixABEL
-R CMD INSTALL MixABEL_*
+R CMD INSTALL MixABEL_*tar.gz
 
 
 echo
@@ -132,10 +132,11 @@
 #gs -sDEVICE=pdfwrite -dCompatibilityLevel=1.4 -dPDFSETTINGS=/screen -dNOPAUSE -dQUIET -dBATCH -sOutputFile=GenABEL_general/GenABEL-tutorial.pdf_compressed GenABEL_general/GenABEL-tutorial.pdf
 #echo Copying GenABEL_general/GenABEL-tutorial.pdf in GenABEL/inst/doc/...
 cp GenABEL_general/GenABEL-tutorial.pdf GenABEL/inst/doc/
-echo Buildngd the GenABEL...
+echo Building the GenABEL...
+R CMD check --ad-cran GenABEL
 R CMD build GenABEL
 mkdir GenABEL_DISTRIBUTIVE_IS_HERE
-cp GenABEL_*gz GenABEL_DISTRIBUTIVE_IS_HERE
+cp GenABEL_*tar.gz GenABEL_DISTRIBUTIVE_IS_HERE
 echo "The distributive of GenABEL is in $installation_dir/GenABEL_DISTRIBUTIVE_IS_HERE directory. Check out that there were no errors/warnings during running this script."
 echo "GenABEL building DONE!"
 else