[Soiltexture-commits] r67 - / pkg pkg/soiltexture/inst pkg/soiltexture/inst/doc

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

Author: jmoeys
Date: 2011-11-21 21:46:34 +0100 (Mon, 21 Nov 2011)
New Revision: 67

Modified:
   1_RCMDBUILD_novignette.sh
   2_RCMDcheck_notests_novignette.sh
   pkg/
   pkg/soiltexture/inst/doc/
   pkg/soiltexture/inst/polish_language_ANSI.r
   soiltexture_vignette_compile.R
Log:
Try to get the vignette compiled on Linux

Modified: 1_RCMDBUILD_novignette.sh
===================================================================
--- 1_RCMDBUILD_novignette.sh	2011-11-21 17:08:54 UTC (rev 66)
+++ 1_RCMDBUILD_novignette.sh	2011-11-21 20:46:34 UTC (rev 67)
@@ -1,4 +1,4 @@
-cd "/home/jules/_WORK/R_PACKAGES/soiltexture/pkg"
+cd "/home/jules/Documents/_WORK/R_PACKAGES/soiltexture/pkg"
 R CMD build --no-vignettes soiltexture 
 echo "press any key to continue"; read line
 

Modified: 2_RCMDcheck_notests_novignette.sh
===================================================================
--- 2_RCMDcheck_notests_novignette.sh	2011-11-21 17:08:54 UTC (rev 66)
+++ 2_RCMDcheck_notests_novignette.sh	2011-11-21 20:46:34 UTC (rev 67)
@@ -1,4 +1,4 @@
-cd "/home/jules/_WORK/R_PACKAGES/soiltexture/pkg" 
+cd "/home/jules/Documents/_WORK/R_PACKAGES/soiltexture/pkg"
 R CMD check --no-tests --no-vignettes soiltexture 
 echo "press any key to continue"; read line
 


Property changes on: pkg
___________________________________________________________________
Modified: svn:ignore
   - soiltexture.Rcheck
soiltexture.Rcheck.zip
soiltexture_1.2.3.tar.gz
soiltexture_1.2.3_R_i486-pc-linux-gnu.tar.gz
soiltexture_1.2.4.tar.gz
soiltexture_1.2.4.zip
soiltexture_1.2.5.tar.gz
soiltexture_1.2.5.zip
soiltexture_1.2.6.tar.gz
soiltexture_1.2.6.zip

   + soiltexture.Rcheck
soiltexture.Rcheck.zip
soiltexture_1.2.3.tar.gz
soiltexture_1.2.3_R_i486-pc-linux-gnu.tar.gz
soiltexture_1.2.4.tar.gz
soiltexture_1.2.4.zip
soiltexture_1.2.5.tar.gz
soiltexture_1.2.5.zip
soiltexture_1.2.6.tar.gz
soiltexture_1.2.6.zip
soiltexture_1.2.6_R_i486-pc-linux-gnu.tar.gz



Property changes on: pkg/soiltexture/inst/doc
___________________________________________________________________
Modified: svn:ignore
   - Rplots.pdf
Sweave.sty
soiltexture_vignette.R
soiltexture_vignette.bib.bak
soiltexture_vignette.pdf
soiltexture_vignette.tex
transformations.R
transformations.pdf
transformations.tex
version.txt

   + Rplots.pdf
Sweave.sty
soiltexture_vignette.R
soiltexture_vignette.bib.bak
soiltexture_vignette.pdf
soiltexture_vignette.tex
transformations.R
transformations.pdf
transformations.tex
version.txt
fancyvrb.sty


Modified: pkg/soiltexture/inst/polish_language_ANSI.r
===================================================================
--- pkg/soiltexture/inst/polish_language_ANSI.r	2011-11-21 17:08:54 UTC (rev 66)
+++ pkg/soiltexture/inst/polish_language_ANSI.r	2011-11-21 20:46:34 UTC (rev 67)
@@ -3,7 +3,8 @@
     "CLAY"  = "\"Il\"", 
     "SILT"  = "\"Pyl\"", 
     "SAND"  = "\"Piasek\"", 
-    "TT"    = "\"Trójkat Fereta\"", 
+    "TT"    = "\"Trojkat Fereta\"", 
     stringsAsFactors    = FALSE  
 )   #
 
+

Modified: soiltexture_vignette_compile.R
===================================================================
--- soiltexture_vignette_compile.R	2011-11-21 17:08:54 UTC (rev 66)
+++ soiltexture_vignette_compile.R	2011-11-21 20:46:34 UTC (rev 67)
@@ -1,9 +1,14 @@
 # Running the latest part of this script (zipMe) requires to have 
 # 7zip installed and available on Windows path.
 rm(list=ls(all=TRUE)) 
-work.wd             <- "C:/_R_PACKAGES/soiltexture/pkg/soiltexture/inst"  
-subdir1             <- "doc" 
-Sweave.wrapper.fun  <- "C:/_R_PACKAGES/soiltexture/Sweave_wrapper.R" 
+if( tolower(Sys.info()["sysname"]) == "windows" ){ 
+    work.wd             <- "C:/_R_PACKAGES/soiltexture/pkg/soiltexture/inst"  
+    Sweave.wrapper.fun  <- "C:/_R_PACKAGES/soiltexture/Sweave_wrapper.R" 
+}else{ # Linux 
+    work.wd             <- "/home/jules/Documents/_WORK/R_PACKAGES/soiltexture/pkg/soiltexture/inst"  
+    Sweave.wrapper.fun  <- "/home/jules/Documents/_WORK/R_PACKAGES/soiltexture/Sweave_wrapper.R"        
+}   #
+subdir1             <- "doc"
 file.name.root      <- "soiltexture_vignette"  
 sweave.ext          <- ".Rnw"  
 inout.dir           <- ""