From 790757d77dc621c6eef41b8735c6bc537e43e81b Mon Sep 17 00:00:00 2001 From: hollorol Date: Tue, 15 Jan 2019 20:31:55 +0100 Subject: [PATCH] Fixing The namespace problems --- RBBGCMuso/DESCRIPTION | 2 +- RBBGCMuso/NAMESPACE | 9 +-------- RBBGCMuso/R/musoExample.R | 6 ++---- 3 files changed, 4 insertions(+), 13 deletions(-) diff --git a/RBBGCMuso/DESCRIPTION b/RBBGCMuso/DESCRIPTION index f5a2d8b..e46d954 100644 --- a/RBBGCMuso/DESCRIPTION +++ b/RBBGCMuso/DESCRIPTION @@ -27,7 +27,7 @@ Imports: LinkingTo: Rcpp SystemRequirements: C++11 Maintainer: Roland Hollo's -RoxygenNote: 6.1.0 +RoxygenNote: 6.1.1 Suggests: knitr, rmarkdown, VignetteBuilder: knitr diff --git a/RBBGCMuso/NAMESPACE b/RBBGCMuso/NAMESPACE index 86d844f..041393c 100644 --- a/RBBGCMuso/NAMESPACE +++ b/RBBGCMuso/NAMESPACE @@ -26,6 +26,7 @@ export(spinupMuso) export(supportedMuso) export(updateMusoMapping) import(ggplot2) +import(tcltk) import(utils) importFrom(Rcpp,evalCpp) importFrom(digest,digest) @@ -56,15 +57,7 @@ importFrom(limSolve,xsample) importFrom(magrittr,'%<>%') importFrom(rmarkdown,render) importFrom(scales,percent) -importFrom(tcltk,tcl) -importFrom(tcltk,tclRequire) -importFrom(tcltk,tclVar) -importFrom(tcltk,tclvalue) -importFrom(tcltk,tk_choose.dir) importFrom(tcltk,tk_choose.files) -importFrom(tcltk,tktitle) -importFrom(tcltk,tktoplevel) -importFrom(tcltk,tkwidget) importFrom(tibble,rownames_to_column) importFrom(tidyr,separate) useDynLib(RBBGCMuso) diff --git a/RBBGCMuso/R/musoExample.R b/RBBGCMuso/R/musoExample.R index f908689..64c491c 100644 --- a/RBBGCMuso/R/musoExample.R +++ b/RBBGCMuso/R/musoExample.R @@ -47,11 +47,9 @@ copyMusoExamleTo <- function(example = NULL, destination = NULL){ currDir <- getwd() setwd(cExample) if(!WindowsP){ - file.copy("./bin/muso", destination) + file.copy(grep("(exe|dll)$", list.files(), value = TRUE, invert = TRUE),destination) } else { - file.copy("./bin/muso.exe", destination) - file.copy("./bin/cygwin1.dll", destination) + file.copy(grep("^muso$", list.files(), value = TRUE, invert = TRUE),destination) } - file.copy(grep("bin", list.files(), value = TRUE, invert = TRUE),destination) setwd(currDir) }