[Soiltexture-commits] r79 - / pkg pkg/soiltexture/inst/doc prepare
noreply at r-forge.r-project.org
noreply at r-forge.r-project.org
Thu Mar 8 11:35:18 CET 2012
Author: jmoeys
Date: 2012-03-08 11:35:18 +0100 (Thu, 08 Mar 2012)
New Revision: 79
Added:
prepare/
prepare/TT.env.Rd
Removed:
pkg/soiltexture/inst/doc/CC-By-SA-nonported-88x31.PNG
pkg/soiltexture/inst/doc/TT.env.Rd
pkg/soiltexture/inst/doc/julienmoeysmailaddress-382-25.png
Modified:
1_RCMDBUILD.bat
1_RCMDBUILD.sh
2_RCMDcheck_notests.bat
2_RCMDcheck_notests.sh
2_RCMDcheck_notests_novignette.bat
2_RCMDcheck_notests_novignette.sh
3_RCMDINSTALL_build.BAT
3_RCMDINSTALL_build.sh
SoilTexture_changelog.txt
pkg/
pkg/soiltexture/inst/doc/soiltexture_vignette.Rnw
soiltexture_compile.R
soiltexture_transformations_compile.R
soiltexture_vignette_compile.R
Log:
clean up inst/doc and compacted vignette
Modified: 1_RCMDBUILD.bat
===================================================================
--- 1_RCMDBUILD.bat 2012-03-07 16:12:10 UTC (rev 78)
+++ 1_RCMDBUILD.bat 2012-03-08 10:35:18 UTC (rev 79)
@@ -1,5 +1,6 @@
c:
cd \
cd "C:\_R_PACKAGES\soiltexture\pkg"
-R CMD build soiltexture
+echo R_QPDF="qpdf -dPDFSETTINGS=/ebook"
+R CMD build --compact-vignettes soiltexture
pause
Modified: 1_RCMDBUILD.sh
===================================================================
--- 1_RCMDBUILD.sh 2012-03-07 16:12:10 UTC (rev 78)
+++ 1_RCMDBUILD.sh 2012-03-08 10:35:18 UTC (rev 79)
@@ -1,6 +1,6 @@
# cd "/home/jules/Documents/_WORK/R_PACKAGES/soiltexture/pkg/"
cd "/home/jmoeys/Documents/_WORK/R_PACKAGES/soiltexture/pkg/"
-R CMD build soiltexture
+R CMD build --compact-vignettes soiltexture
echo "press any key to continue"; read line
Modified: 2_RCMDcheck_notests.bat
===================================================================
--- 2_RCMDcheck_notests.bat 2012-03-07 16:12:10 UTC (rev 78)
+++ 2_RCMDcheck_notests.bat 2012-03-08 10:35:18 UTC (rev 79)
@@ -1,5 +1,5 @@
c:
cd \
cd "C:\_R_PACKAGES\soiltexture\pkg"
-R CMD check --no-tests soiltexture
+R CMD check --no-tests --as-cran soiltexture
pause
Modified: 2_RCMDcheck_notests.sh
===================================================================
--- 2_RCMDcheck_notests.sh 2012-03-07 16:12:10 UTC (rev 78)
+++ 2_RCMDcheck_notests.sh 2012-03-08 10:35:18 UTC (rev 79)
@@ -1,6 +1,6 @@
# cd "/home/jules/Documents/_WORK/R_PACKAGES/soiltexture/pkg/"
cd "/home/jmoeys/Documents/_WORK/R_PACKAGES/soiltexture/pkg/"
-R CMD check --no-tests soiltexture
+R CMD check --no-tests --as-cran soiltexture
echo "press any key to continue"; read line
Modified: 2_RCMDcheck_notests_novignette.bat
===================================================================
--- 2_RCMDcheck_notests_novignette.bat 2012-03-07 16:12:10 UTC (rev 78)
+++ 2_RCMDcheck_notests_novignette.bat 2012-03-08 10:35:18 UTC (rev 79)
@@ -1,5 +1,5 @@
c:
cd \
cd "C:\_R_PACKAGES\soiltexture\pkg"
-R CMD check --no-tests --no-vignettes soiltexture
+R CMD check --no-tests --no-vignettes --as-cran soiltexture
pause
Modified: 2_RCMDcheck_notests_novignette.sh
===================================================================
--- 2_RCMDcheck_notests_novignette.sh 2012-03-07 16:12:10 UTC (rev 78)
+++ 2_RCMDcheck_notests_novignette.sh 2012-03-08 10:35:18 UTC (rev 79)
@@ -1,5 +1,5 @@
cd "/home/jules/Documents/_WORK/R_PACKAGES/soiltexture/pkg"
-R CMD check --no-tests --no-vignettes soiltexture
+R CMD check --no-tests --no-vignettes --as-cran soiltexture
echo "press any key to continue"; read line
Modified: 3_RCMDINSTALL_build.BAT
===================================================================
--- 3_RCMDINSTALL_build.BAT 2012-03-07 16:12:10 UTC (rev 78)
+++ 3_RCMDINSTALL_build.BAT 2012-03-08 10:35:18 UTC (rev 79)
@@ -1,5 +1,5 @@
c:
cd \
cd "C:\_R_PACKAGES\soiltexture\pkg"
-R CMD INSTALL --build soiltexture
+R CMD INSTALL --build --compact-docs --byte-compile soiltexture
pause
Modified: 3_RCMDINSTALL_build.sh
===================================================================
--- 3_RCMDINSTALL_build.sh 2012-03-07 16:12:10 UTC (rev 78)
+++ 3_RCMDINSTALL_build.sh 2012-03-08 10:35:18 UTC (rev 79)
@@ -1,6 +1,6 @@
# cd "/home/jules/Documents/_WORK/R_PACKAGES/soiltexture/pkg/"
cd "/home/jmoeys/Documents/_WORK/R_PACKAGES/soiltexture/pkg/"
-R CMD INSTALL --build soiltexture
+R CMD INSTALL --build --compact-docs --byte-compile soiltexture
echo "press any key to continue"; read line
Modified: SoilTexture_changelog.txt
===================================================================
--- SoilTexture_changelog.txt 2012-03-07 16:12:10 UTC (rev 78)
+++ SoilTexture_changelog.txt 2012-03-08 10:35:18 UTC (rev 79)
@@ -5,7 +5,8 @@
o version 1.2.9
- 20120307 Removed a useless usage of installed.packages()
+ 20120307 Removed a useless usage of installed.packages()
+ 20120308 Compact the vignettes before R CMD build
o version 1.2.8
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_1.2.6_R_i486-pc-linux-gnu.tar.gz
soiltexture_1.2.8.tar.gz
soiltexture_1.2.8.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
soiltexture_1.2.8.tar.gz
soiltexture_1.2.8.zip
soiltexture_1.2.9.tar.gz
soiltexture_1.2.9.zip
Deleted: pkg/soiltexture/inst/doc/CC-By-SA-nonported-88x31.PNG
===================================================================
(Binary files differ)
Deleted: pkg/soiltexture/inst/doc/TT.env.Rd
===================================================================
--- pkg/soiltexture/inst/doc/TT.env.Rd 2012-03-07 16:12:10 UTC (rev 78)
+++ pkg/soiltexture/inst/doc/TT.env.Rd 2012-03-08 10:35:18 UTC (rev 79)
@@ -1,12 +0,0 @@
-\name{TT.env}
-\alias{TT.env}
-\docType{data}
-\title{TT env}
-\description{Environment for storing, hiding and protecting
-internal variables and functions}
-\usage{TT.env}
-
-
-
-
-
Deleted: pkg/soiltexture/inst/doc/julienmoeysmailaddress-382-25.png
===================================================================
(Binary files differ)
Modified: pkg/soiltexture/inst/doc/soiltexture_vignette.Rnw
===================================================================
--- pkg/soiltexture/inst/doc/soiltexture_vignette.Rnw 2012-03-07 16:12:10 UTC (rev 78)
+++ pkg/soiltexture/inst/doc/soiltexture_vignette.Rnw 2012-03-08 10:35:18 UTC (rev 79)
@@ -237,14 +237,14 @@
At this stage of development, some bugs should still be expected.
The code has been written in 3 years, and tested quite extensively
since then, but it has never been used by other people. If you
-find some bugs, please contact me at:
+find some bugs, please contact me at: \texttt{jules\_78-soiltexture at AT@yahoo.fr}.
-\begin{figure}[h]
-\centering
-\includegraphics[width=108px,viewport=0 0 382 25]{%
- julienmoeysmailaddress-382-25.png}
-\end{figure}
+% \begin{figure}[h]
+% \centering
+% \includegraphics[width=108px,viewport=0 0 382 25]{%
+% julienmoeysmailaddress-382-25.png}
+% \end{figure}
@@ -258,11 +258,11 @@
Commons By-SA 3.0 unported \footnote{\texttt{http://creativecommons.org/licenses/by-sa/3.0/}}}.
-\begin{figure}[h]
-\centering
-\includegraphics[width=88px,viewport=0 0 88 31]{%
- CC-By-SA-nonported-88x31.PNG}
-\end{figure}
+% \begin{figure}[h]
+% \centering
+% \includegraphics[width=88px,viewport=0 0 88 31]{%
+% CC-By-SA-nonported-88x31.PNG}
+% \end{figure}
In short, this means (\textit{extract from the abovementioned url at
Added: prepare/TT.env.Rd
===================================================================
--- prepare/TT.env.Rd (rev 0)
+++ prepare/TT.env.Rd 2012-03-08 10:35:18 UTC (rev 79)
@@ -0,0 +1,12 @@
+\name{TT.env}
+\alias{TT.env}
+\docType{data}
+\title{TT env}
+\description{Environment for storing, hiding and protecting
+internal variables and functions}
+\usage{TT.env}
+
+
+
+
+
Modified: soiltexture_compile.R
===================================================================
--- soiltexture_compile.R 2012-03-07 16:12:10 UTC (rev 78)
+++ soiltexture_compile.R 2012-03-08 10:35:18 UTC (rev 79)
@@ -34,13 +34,17 @@
namespace = TRUE
) #
+# file.copy(
+# from = file.path( pkg.dir, pkg.name, "inst", "doc", "TT.env.Rd" ),
+# to = file.path( pkg.dir, pkg.name, "man", "TT.env.Rd" ),
+# overwrite = TRUE
+# ) #
+
file.copy(
- from = file.path( pkg.dir, pkg.name, "inst", "doc", "TT.env.Rd" ),
+ from = file.path( pkg.dir, "..", "prepare", "TT.env.Rd" ),
to = file.path( pkg.dir, pkg.name, "man", "TT.env.Rd" ),
overwrite = TRUE
) #
-
-
pkg.remove.wrapper( pkg.name = pkg.name )
Modified: soiltexture_transformations_compile.R
===================================================================
--- soiltexture_transformations_compile.R 2012-03-07 16:12:10 UTC (rev 78)
+++ soiltexture_transformations_compile.R 2012-03-08 10:35:18 UTC (rev 79)
@@ -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:/_RTOOLS/SWEAVE_WORK/SOIL_TEXTURES/rforge/pkg/soiltexture/inst"
+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"
-Sweave.wrapper.fun <- "C:/_RTOOLS/SWEAVE_WORK/SOIL_TEXTURES/rforge/Sweave_wrapper.R"
file.name.root <- "transformations"
sweave.ext <- ".Rnw"
inout.dir <- ""
@@ -21,7 +26,14 @@
) #
+file.remove( list.files( file.path( work.wd, subdir1 ), "\\.tex$", full.names = TRUE ) )
+file.remove( list.files( file.path( work.wd, subdir1 ), "\\.bib.bak$", full.names = TRUE ) )
+library("tools")
+res <- compactPDF( paths = file.path( work.wd, subdir1 ), gs_quality = "ebook" ) # paste(sep="",file.name.root,".pdf")
+res
+
+
### If LaTeX failed because the pdf file was open, run:
# res <- texi2dvi.wrapper(
# file.name.root = file.name.root,
Modified: soiltexture_vignette_compile.R
===================================================================
--- soiltexture_vignette_compile.R 2012-03-07 16:12:10 UTC (rev 78)
+++ soiltexture_vignette_compile.R 2012-03-08 10:35:18 UTC (rev 79)
@@ -18,8 +18,25 @@
print("Don't forget to commit the source code to r-forge before compiling the vignette.")
+# library( "tools" )
+# options(error = recover)
+# # buildVignettes(
+# # package = "soiltexture",
+# # dir = "C:/_R_PACKAGES/soiltexture/pkg/soiltexture",
+# # lib.loc = "C:/_R_PACKAGES/soiltexture/pkg/",
+# # quiet = TRUE,
+# # clean = TRUE
+# # ) #
+
+# res <- checkVignettes(
+# package = "soiltexture",
+# dir = "C:/_R_PACKAGES/soiltexture/pkg/soiltexture"
+# ) #
+
+# res
+
eval( parse( Sweave.wrapper.fun ) )
@@ -30,8 +47,15 @@
inout.dir = inout.dir
) #
+file.remove( list.files( file.path( work.wd, subdir1 ), "\\.tex$", full.names = TRUE ) )
+file.remove( list.files( file.path( work.wd, subdir1 ), "\\.bib.bak$", full.names = TRUE ) )
+file.remove( list.files( file.path( work.wd, subdir1 ), "\\.R$", full.names = TRUE ) )
+library("tools")
+res <- compactPDF( paths = file.path( work.wd, subdir1 ), gs_quality = "ebook" ) # paste(sep="",file.name.root,".pdf")
+res
+
### If LaTeX failed because the pdf file was open, run:
# res <- texi2dvi.wrapper(
# file.name.root = file.name.root,
More information about the Soiltexture-commits
mailing list