[CHNOSZ-commits] r24 - in pkg/Rpad: . inst/basehtml inst/localversion

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

Author: jedick
Date: 2012-09-26 04:05:06 +0200 (Wed, 26 Sep 2012)
New Revision: 24

Added:
   pkg/Rpad/inst/basehtml/RpadStartup.R
Removed:
   pkg/Rpad/inst/basehtml/.RpadStartup.R
   pkg/Rpad/inst/localversion/.Rprofile
Modified:
   pkg/Rpad/DESCRIPTION
Log:
Rpad: remove/rename hidden files. increment version number


Modified: pkg/Rpad/DESCRIPTION
===================================================================
--- pkg/Rpad/DESCRIPTION	2012-09-25 02:38:33 UTC (rev 23)
+++ pkg/Rpad/DESCRIPTION	2012-09-26 02:05:06 UTC (rev 24)
@@ -1,6 +1,6 @@
 Package: Rpad
 Title: Workbook-style, web-based interface to R
-Version: 1.3.0
+Version: 1.3.1
 Author: Tom Short (EPRI), Philippe Grosjean (UMH EcoNum)
 Description: A workbook-style user interface to R through a web
         browser.  Provides convenient plotting, HTML GUI generation,

Deleted: pkg/Rpad/inst/basehtml/.RpadStartup.R
===================================================================
--- pkg/Rpad/inst/basehtml/.RpadStartup.R	2012-09-25 02:38:33 UTC (rev 23)
+++ pkg/Rpad/inst/basehtml/.RpadStartup.R	2012-09-26 02:05:06 UTC (rev 24)
@@ -1,48 +0,0 @@
-## Enter R commands that you want to execute
-## upon loading of all Rpad pages in this
-## directory.
-##
-## This loads after R has started and after
-## all of the default packages have loaded,
-## including the Rpad package.
-
-## Uncomment the following to load R2HTML
-## by default. Add other packages as
-## needed.
-
-# require(R2HTML)
-
-
-## Uncomment the following to switch the
-## default graphics from the ghostscript-based
-## png generation to R's builtin png device.
-
-# graphoptions(type="Rpng")
-
-## Uncomment the following to switch the
-## default graphics from the ghostscript-based
-## png generation to Simon Urbanek's GDD driver
-## (see http://www.rosuda.org/R/GDD/).
-
-# if (require(GDD)) graphoptions(type = GDD)
-
-
-## Uncomment the following line to switch the
-## Rpad directory. This is needed on
-## several platforms where Rpad (the R part)
-## cannot figure out it's own path names
-## correctly. Change the root
-## directory appropriately.
-## With apache and apache2 (and IIS), you shouldn't
-## need this, but with other servers, you might.
-
-# assign("RpadDir", envir = Rpad:::.RpadEnv,
-#        gsub("c:/Inetpub/wwwroot","", getwd(), ignore.case = TRUE) )
-
-## The following is the server timeout setting in 
-## minutes for the server version of Rpad.
-## If not specified, it defaults to 30 minutes.
-
-.RPADTIMEOUTMINUTES = 20
-
-

Copied: pkg/Rpad/inst/basehtml/RpadStartup.R (from rev 12, pkg/Rpad/inst/basehtml/.RpadStartup.R)
===================================================================
--- pkg/Rpad/inst/basehtml/RpadStartup.R	                        (rev 0)
+++ pkg/Rpad/inst/basehtml/RpadStartup.R	2012-09-26 02:05:06 UTC (rev 24)
@@ -0,0 +1,48 @@
+## Enter R commands that you want to execute
+## upon loading of all Rpad pages in this
+## directory.
+##
+## This loads after R has started and after
+## all of the default packages have loaded,
+## including the Rpad package.
+
+## Uncomment the following to load R2HTML
+## by default. Add other packages as
+## needed.
+
+# require(R2HTML)
+
+
+## Uncomment the following to switch the
+## default graphics from the ghostscript-based
+## png generation to R's builtin png device.
+
+# graphoptions(type="Rpng")
+
+## Uncomment the following to switch the
+## default graphics from the ghostscript-based
+## png generation to Simon Urbanek's GDD driver
+## (see http://www.rosuda.org/R/GDD/).
+
+# if (require(GDD)) graphoptions(type = GDD)
+
+
+## Uncomment the following line to switch the
+## Rpad directory. This is needed on
+## several platforms where Rpad (the R part)
+## cannot figure out it's own path names
+## correctly. Change the root
+## directory appropriately.
+## With apache and apache2 (and IIS), you shouldn't
+## need this, but with other servers, you might.
+
+# assign("RpadDir", envir = Rpad:::.RpadEnv,
+#        gsub("c:/Inetpub/wwwroot","", getwd(), ignore.case = TRUE) )
+
+## The following is the server timeout setting in 
+## minutes for the server version of Rpad.
+## If not specified, it defaults to 30 minutes.
+
+.RPADTIMEOUTMINUTES = 20
+
+

Deleted: pkg/Rpad/inst/localversion/.Rprofile
===================================================================
--- pkg/Rpad/inst/localversion/.Rprofile	2012-09-25 02:38:33 UTC (rev 23)
+++ pkg/Rpad/inst/localversion/.Rprofile	2012-09-26 02:05:06 UTC (rev 24)
@@ -1,6 +0,0 @@
-.First <- function() {
-  cat("\n  Launching Rpad...\n \n")
-  require(Rpad)
-  cat("\n  Rpad should start in your browser.\n")
-  Rpad()
-}