Minor

Sea2Data · May 23, 2019 · e6c4bab · e6c4bab
1 parent 5635e1c
commit e6c4bab
Show file tree

Hide file tree

Showing 3 changed files with 63 additions and 32 deletions.
diff --git a/Build/build_Rstox.R b/Build/build_Rstox.R
@@ -3,30 +3,35 @@
 
 
 ##### Load devtools: #####
-library("devtools")
-
-# Source the utility functions:
-#source("https://raw.githubusercontent.com/Sea2Data/Rstox_utils/master/Rstox_utils.R")
-
-
-# Define the directory of the working copy:
-dir <- list(
-  arnejh = list(
-    Rstox = "~/Code/Github/Rstox/Rstox", 
-    Rstox_utils = "~/Code/Github/Rstox_utils/Rstox_utils"
-  ), 
-  atlet = list(
-    Rstox = "F:/GIT/Rstox", 
-    Rstox_utils = "F:/GIT/Rstox_utils"
-  ), 
-  edvinf = list(
-		Rstox = "~/code/github/rstox_/", 
-		Rstox_utils = "~/code/github/Rstox_utils/"
-	)
-)
-
-
-source(file.path(dir[[Sys.info()["user"]]]$Rstox_utils, "Rstox_utils.R"))
+#library("RstoxBuild")
+#
+## Source the utility functions:
+##source("https://raw.githubusercontent.com/Sea2Data/Rstox_utils/master/Rstox_utils.R")
+#
+#
+## Define the directory of the working copy:
+##dir <- list(
+##  arnejh = list(
+##    Rstox = "~/Code/Github/Rstox/Rstox", 
+##    Rstox_utils = "~/Code/Github/Rstox_utils/Rstox_utils"
+##  ), 
+##  atlet = list(
+##    Rstox = "F:/GIT/Rstox", 
+##    Rstox_utils = "F:/GIT/Rstox_utils"
+##  ), 
+##  edvinf = list(
+##		Rstox = "~/code/github/rstox_/", 
+##		Rstox_utils = "~/code/github/Rstox_utils/"
+##	)
+##)
+#dir <- list(
+#  arnejh = "~/Code/Github/Rstox/Rstox", 
+#  atlet = "F:/GIT/Rstox", 
+#  edvinf = "~/code/github/rstox_/"
+#)
+
+
+#source(file.path(dir[[Sys.info()["user"]]]$Rstox_utils, "Rstox_utils.R"))
 
 # Build 1.6.2:
 # build_Rstox(dir_Rstox, version="1.6.2", Rversion="3.3.3", official=FALSE, check=FALSE)
@@ -100,4 +105,35 @@ source(file.path(dir[[Sys.info()["user"]]]$Rstox_utils, "Rstox_utils.R"))
 
 
 # Build 1.11.1:
-build_Rstox(dir[[Sys.info()["user"]]]$Rstox, version="1.11.1", Rversion="3.5", pckversion=list(data.table="1.10.4-3"), official=FALSE, suggests=c("ggmap", "ncdf4", "pgirmess", "Reca", "plotrix"), check=FALSE)
+#build_Rstox(dir[[Sys.info()["user"]]]$Rstox, version="1.11.1", Rversion="3.5", pckversion=list(data.table="1.10.4-3"), official=FALSE, suggests=c("ggmap", "ncdf4", "pgirmess", "Reca", "plotrix"), check=FALSE)
+
+
+
+
+
+# Build 1.11.1:
+RstoxBuild::build_Rstox_package("Rstox", version="1.11.1", Rversion="3.5", pckversion=list(data.table="1.10.4-3"), suggests=c("ncdf4", "pgirmess", "Reca", "plotrix"), check=FALSE)
+
+# Before moving to the new account!!!!!!!!!!!!111:
+RstoxBuild::build_Rstox_package("Rstox", version="1.11.1", Rversion="3.5", pckversion=list(data.table="1.10.4-3"), suggests=c("ncdf4", "pgirmess", "Reca", "plotrix"), check=FALSE, githubRoot = "https://github.com/IMR-StoX")
+
+
+
+
+
+RstoxBuild::build_Rstox_package("RstoxFramework", version="1.0", Rversion="3.5", pckversion=list(data.table="1.10.4-3"), check=FALSE)
+
+RstoxBuild::build_Rstox_package("RstoxData", version="1.0", Rversion="3.5", pckversion=list(data.table="1.10.4-3"), check=FALSE)
+
+RstoxBuild::build_Rstox_package("RstoxECA", version="1.0", Rversion="3.5", pckversion=list(data.table="1.10.4-3"), check=FALSE)
+
+RstoxBuild::build_Rstox_package("RstoxSurveyPlanner", version="1.0", Rversion="3.5", pckversion=list(data.table="1.10.4-3"), check=FALSE)
+
+RstoxBuild::build_Rstox_package("RstoxTempdoc", version="1.0", Rversion="3.5", check=FALSE)
+
+RstoxBuild::build_Rstox_package("RstoxBuild", version="1.0", Rversion="3.5", check=FALSE)
+
+
+
+
+# build_Rstox_package("RstoxBuild", version="1.0", Rversion="3.5", check=FALSE, rootDir="~/Code/Github")
diff --git a/Rstox_utils.R b/Rstox_utils.R
@@ -500,7 +500,7 @@ build_Rstox <- function(buildDir, pkgName="Rstox", version="1.0", Rversion="3.3.
 	betaAlpha <- length(gregexpr(".", version, fixed=TRUE)[[1]]) + 1
 	betaAlphaString <- c("", "beta", "alpha")[betaAlpha]
 	# Read the NAMESPACE file and get the package dependencies. This is needed since we are not on CRAN:
-	writeRstoxREADME(READMEfile, NEWSfile, version, Rversion, betaAlpha, betaAlphaString, imports=getImports(buildDir), official=official)
+	writeRstoxREADME(READMEfile, NEWSfile, version, Rversion, betaAlpha, betaAlphaString, imports=getImports(buildDir, version=pckversion), official=official)
 	file.copy(READMEfile, READMEfileExport, overwrite=TRUE)
 	##########
 
@@ -1976,4 +1976,3 @@ now <- function(brackets=FALSE){
 	out
 }
 
-
diff --git a/TestRstox.R b/TestRstox.R
@@ -135,11 +135,7 @@ source("https://raw.githubusercontent.com/Sea2Data/Rstox_utils/master/Rstox_util
 
 # system.time(automatedRstoxTest(dir="~/workspace/stox/project/Automated_testing", copyFromServer=TRUE, process=c("run", "diff"), nlines=50))
 system.time(automatedRstoxTest(copyFromServer=TRUE, process=c("run", "diff"), nlines=50, skipError=TRUE))
-#     user   system  elapsed 
-# 2044.219  394.894 4639.868 
-# New mac
-#     user   system  elapsed 
-# 3030.232  306.394 2742.444 
+