[Soiltexture-commits] r145 - / pkg/soiltexture pkg/soiltexture/inst pkg/soiltexture/man pkg/soiltexture/vignettes
noreply at r-forge.r-project.org
noreply at r-forge.r-project.org
Fri May 15 14:01:21 CEST 2015
Author: jmoeys
Date: 2015-05-15 14:01:21 +0200 (Fri, 15 May 2015)
New Revision: 145
Modified:
pkg/soiltexture/DESCRIPTION
pkg/soiltexture/NEWS
pkg/soiltexture/inst/SVN_VERSION
pkg/soiltexture/man/soiltexture-package.Rd
pkg/soiltexture/vignettes/soiltexture_vignette.Rnw
soiltexture_2_RCMDcheck_noexamples.bat
soiltexture_3_RCMDINSTALL_build.BAT
soiltexture_4_RCMDRd2pdf.BAT
soiltexture_compile.R
Log:
Modified the vignette (caused r-forge error)
Modified: pkg/soiltexture/DESCRIPTION
===================================================================
--- pkg/soiltexture/DESCRIPTION 2015-04-23 14:19:03 UTC (rev 144)
+++ pkg/soiltexture/DESCRIPTION 2015-05-15 12:01:21 UTC (rev 145)
@@ -1,6 +1,6 @@
Package: soiltexture
-Version: 1.3.2
-Date: 2015-04-23
+Version: 1.3.3
+Date: 2015-05-15
Title: Functions for Soil Texture Plot, Classification and Transformation
Author: Julien Moeys [aut, cre], Wei Shangguan [ctb], Rainer Petzold [ctb], Budiman Minasny [ctb], Bogdan Rosca [ctb], Nic Jelinski [ctb], Wiktor Zelazny [ctb], Rodolfo Marcondes Silva Souza [ctb], Jose Lucas Safanelli [ctb], Alexandre ten Caten [ctb]
Authors at R: c( person( "Julien", "Moeys", role = c("aut", "cre"), email = "jules_m78-soiltexture at yahoo.fr" ), person( "Wei", "Shangguan", role = "ctb" ), person( "Rainer", "Petzold", role = "ctb" ), person( "Budiman", "Minasny", role = "ctb" ), person( "Bogdan", "Rosca", role = "ctb" ), person( "Nic", "Jelinski", role = "ctb" ), person( "Wiktor", "Zelazny", role = "ctb" ), person( "Rodolfo", "Marcondes Silva Souza", role = "ctb" ), person( "Jose Lucas", "Safanelli", role = "ctb" ), person( "Alexandre", "ten Caten", role = "ctb" ) )
Modified: pkg/soiltexture/NEWS
===================================================================
--- pkg/soiltexture/NEWS 2015-04-23 14:19:03 UTC (rev 144)
+++ pkg/soiltexture/NEWS 2015-05-15 12:01:21 UTC (rev 145)
@@ -1,6 +1,15 @@
package: 'soiltexture'
+CHANGES IN VERSION 1.3.3
+
+ 2015/05/15 Minor changes to the package vignette:
+ * Call to require() (xtable, soiltexture) now replaced
+ by call lo library().
+ * Removed a call to .packages()
+ that may cause the package compilation to crash
+ on r-forge (Windows devel).
+
CHANGES IN VERSION 1.3.2
2015/04/23 Replaced shell.exec() by browserURL()
Modified: pkg/soiltexture/inst/SVN_VERSION
===================================================================
--- pkg/soiltexture/inst/SVN_VERSION 2015-04-23 14:19:03 UTC (rev 144)
+++ pkg/soiltexture/inst/SVN_VERSION 2015-05-15 12:01:21 UTC (rev 145)
@@ -1 +1 @@
-122:141M
+122:142M
Modified: pkg/soiltexture/man/soiltexture-package.Rd
===================================================================
--- pkg/soiltexture/man/soiltexture-package.Rd 2015-04-23 14:19:03 UTC (rev 144)
+++ pkg/soiltexture/man/soiltexture-package.Rd 2015-05-15 12:01:21 UTC (rev 145)
@@ -14,9 +14,9 @@
\tabular{ll}{Package: \tab soiltexture\cr
-Version: \tab 1.3.2\cr
+Version: \tab 1.3.3\cr
-Date: \tab 2015-04-23\cr
+Date: \tab 2015-05-15\cr
Title: \tab Functions for Soil Texture Plot, Classification and Transformation\cr
Modified: pkg/soiltexture/vignettes/soiltexture_vignette.Rnw
===================================================================
--- pkg/soiltexture/vignettes/soiltexture_vignette.Rnw 2015-04-23 14:19:03 UTC (rev 144)
+++ pkg/soiltexture/vignettes/soiltexture_vignette.Rnw 2015-05-15 12:01:21 UTC (rev 145)
@@ -108,17 +108,7 @@
# setwd("C:/_RTOOLS/SWEAVE_WORK/SOIL_TEXTURES/rforge/pkg/soiltexture/inst/doc/INOUT")
# And load the xtable package:
-if( !"xtable" %in% .packages(all.available = TRUE) )
-{ #
- message( paste( sep = "",
- "The xtable package is not present in your R install:\n",
- "R will now try to connect to one package server\n",
- "and propose you a list of package to download\n",
- "and install: Choose 'xtable' from the list"
- ) ) #
- utils:::menuInstallPkgs()
-} #
-require( "xtable" )
+library( "xtable" )
@
% \SweaveOpts{width=14,height=14,keep.source=TRUE}
@@ -152,12 +142,14 @@
# ) #
# } #
-require(
- package = "soiltexture",
- character.only = TRUE,
- quietly = TRUE
-)
+suppressPackageStartupMessages( library( "soiltexture" ) )
+# library(
+# package = "soiltexture",
+# character.only = TRUE,
+# quietly = TRUE
+# )
+
# setwd(old.wd)
@
@@ -659,7 +651,7 @@
install.packages(
pkgs = "soiltexture",
repos = "http://R-Forge.R-project.org"
-) #
+)
@
@@ -667,7 +659,7 @@
<<echo=TRUE>>=
-require( soiltexture )
+library( soiltexture )
@
@@ -676,7 +668,7 @@
<<echo=TRUE,eval=FALSE>>=
-detach( package:soiltexture )
+detach( "package:soiltexture" )
remove.packages( "soiltexture" )
@
Modified: soiltexture_2_RCMDcheck_noexamples.bat
===================================================================
--- soiltexture_2_RCMDcheck_noexamples.bat 2015-04-23 14:19:03 UTC (rev 144)
+++ soiltexture_2_RCMDcheck_noexamples.bat 2015-05-15 12:01:21 UTC (rev 145)
@@ -1,5 +1,5 @@
set pkgname=soiltexture
-set version=1.3.2
+set version=1.3.3
cd /D "%rPackagesDir%\%pkgname%\pkg"
Modified: soiltexture_3_RCMDINSTALL_build.BAT
===================================================================
--- soiltexture_3_RCMDINSTALL_build.BAT 2015-04-23 14:19:03 UTC (rev 144)
+++ soiltexture_3_RCMDINSTALL_build.BAT 2015-05-15 12:01:21 UTC (rev 145)
@@ -1,5 +1,5 @@
set pkgname=soiltexture
-set version=1.3.2
+set version=1.3.3
cd /D "%rPackagesDir%\%pkgname%\pkg"
Modified: soiltexture_4_RCMDRd2pdf.BAT
===================================================================
--- soiltexture_4_RCMDRd2pdf.BAT 2015-04-23 14:19:03 UTC (rev 144)
+++ soiltexture_4_RCMDRd2pdf.BAT 2015-05-15 12:01:21 UTC (rev 145)
@@ -1,5 +1,5 @@
set pkgname=soiltexture
-set version=1.3.2
+set version=1.3.3
cd /D "%rPackagesDir%\%pkgname%\pkg"
Modified: soiltexture_compile.R
===================================================================
--- soiltexture_compile.R 2015-04-23 14:19:03 UTC (rev 144)
+++ soiltexture_compile.R 2015-05-15 12:01:21 UTC (rev 145)
@@ -17,7 +17,7 @@
pkgDescription( # Done with R 3.2.0 RC
pkgName = pkgName,
pkgDir = pkgDir,
- pkgVersion = "1.3.2",
+ pkgVersion = "1.3.3",
pkgDepends = "utils", # In Depends because can not importFrom Windows only functions
pkgSuggests = c( "xtable" ), #
pkgImports = c( "sp", "MASS", "tools", "tcltk" ),
More information about the Soiltexture-commits
mailing list