Thread: [Bugs-r-devel] SF.net SVN: bugs-r:[235] trunk/BRugs (Page 2)

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Revision: 235
          http://bugs-r.svn.sourceforge.net/bugs-r/?rev=235&view=rev
Author:   ligges
Date:     2011-12-30 16:40:33 +0000 (Fri, 30 Dec 2011)
Log Message:
-----------
Windows: 
- adaption in Makefile.win to derive path automagically
- hence we can get rid of non empty configure
- get rid of meaningless exec subdir
- avoid copying of dlls into BRugs but always use the OpenBUGS installation
- dirty hack to set the PATH so that the Helper finds the dll under 64-bit

Modified Paths:
--------------
    trunk/BRugs/R/windows/zzz.i386.R
    trunk/BRugs/R/windows/zzz.x64.R
    trunk/BRugs/configure.win
    trunk/BRugs/src/Makefile.win

Removed Paths:
-------------
    trunk/BRugs/R/windows/zzz.x64.R.in
    trunk/BRugs/configure.win.R
    trunk/BRugs/exec/

Modified: trunk/BRugs/R/windows/zzz.i386.R
===================================================================

--- trunk/BRugs/R/windows/zzz.i386.R	2011-12-30 16:32:10 UTC (rev 234)
+++ trunk/BRugs/R/windows/zzz.i386.R	2011-12-30 16:40:33 UTC (rev 235)
@@ -1,40 +1,39 @@
-".onLoad.i386" <- function(lib, pkg){
-    ob <- findOpenBUGS()
-    loadOpenBUGS(ob$dir)
-    msg <- paste("Welcome to BRugs connected to OpenBUGS")
-    if (!is.na(ob$version))
-        msg <- paste(msg, "version", ob$version)
-    else msg <- paste(msg, "in directory", ob$dir)
-    packageStartupMessage(msg)
-}
-
-".onUnload.i386" <- function(libpath){
-    if(is.loaded("CmdInterpreter")) {
-        libname <- paste(options()$OpenBUGS, "libOpenBUGS.dll", sep="/")
-        dyn.unload(libname)
-    }
-}
-
-## Load OpenBUGS from specified location
-loadOpenBUGS <- function(dir)  {
-    libname <- paste(dir, "libOpenBUGS.dll", sep="/")
-    if (!file.exists(libname))  {
-        warning("Shared library \"libOpenBUGS.dll\" not found in ", dir)
-        return(FALSE)
-    }
-    options(OpenBUGS = dir)
-    dyn.load(libname)
-    len <- nchar(dir)
-    .C("SetWorkingDir", as.character(dir), len)
-    ## Set temporary dir for "buffer.txt" output
-    tempDir <- gsub("\\\\", "/", tempdir())
-    .C("SetTempDir", as.character(tempDir), nchar(tempDir))
-    command <- "BugsMappers.SetDest(2)"
-    .CmdInterpreter(command)
-    if(is.null(getOption("BRugsVerbose")))
-        options("BRugsVerbose" = TRUE)
-    .initGlobals()
-    options(OpenBUGSExamples = paste(dir, "Examples", sep="/"))
-    invisible()
-}
-
+".onLoad.i386" <- function(lib, pkg){
+    ob <- findOpenBUGS()
+    loadOpenBUGS(ob$dir)
+    msg <- paste("Welcome to BRugs connected to OpenBUGS")
+    if (!is.na(ob$version))
+        msg <- paste(msg, "version", ob$version)
+    else msg <- paste(msg, "in directory", ob$dir)
+    packageStartupMessage(msg)
+}
+
+".onUnload.i386" <- function(libpath){
+    if(is.loaded("CmdInterpreter")) {
+        libname <- paste(options()$OpenBUGS, "libOpenBUGS.dll", sep="/")
+        dyn.unload(libname)
+    }
+}
+
+## Load OpenBUGS from specified location
+loadOpenBUGS <- function(dir)  {
+    libname <- paste(dir, "libOpenBUGS.dll", sep="/")
+    if (!file.exists(libname))  {
+        warning("Shared library \"libOpenBUGS.dll\" not found in ", dir)
+        return(FALSE)
+    }
+    options(OpenBUGS = dir)
+    dyn.load(libname)
+    len <- nchar(dir)
+    .C("SetWorkingDir", as.character(dir), len, PACKAGE="libOpenBUGS")
+    ## Set temporary dir for "buffer.txt" output
+    tempDir <- gsub("\\\\", "/", tempdir())
+    .C("SetTempDir", as.character(tempDir), nchar(tempDir), PACKAGE="libOpenBUGS")
+    command <- "BugsMappers.SetDest(2)"
+    .CmdInterpreter(command)
+    if(is.null(getOption("BRugsVerbose")))
+        options("BRugsVerbose" = TRUE)
+    .initGlobals()
+    options(OpenBUGSExamples = paste(dir, "Examples", sep="/"))
+    invisible()
+}

Modified: trunk/BRugs/R/windows/zzz.x64.R
===================================================================
--- trunk/BRugs/R/windows/zzz.x64.R	2011-12-30 16:32:10 UTC (rev 234)
+++ trunk/BRugs/R/windows/zzz.x64.R	2011-12-30 16:40:33 UTC (rev 235)
@@ -4,19 +4,23 @@
         ## TODO any need for these to be user specifiable?
         options("BRugsTmpdir" = gsub("\\\\", "/", tempdir()))
         options("BRugsExtFile" = paste(basename(tempfile()), ".bug", sep=""))
-        options(OpenBUGS = "C:/Program Files (x86)/OpenBUGS/OpenBUGS321")
-        options(OpenBUGSdoc = "C:/Program Files (x86)/OpenBUGS/OpenBUGS321")
-        options(OpenBUGSExamples = paste(options()$OpenBUGSdoc, "Examples", sep="/"))
+        ob <- findOpenBUGS()
+        options(OpenBUGS = ob$dir)
+        options(OpenBUGSdoc = ob$dir)
+        options(OpenBUGSExamples = paste(ob$dir, "Examples", sep="/"))
 
         if(is.null(getOption("BRugsVerbose")))
             options("BRugsVerbose" = TRUE)
         .initGlobals()
-        ob <- findOpenBUGS()
         msg <- paste("Welcome to BRugs connected to OpenBUGS")
         if (!is.na(ob$version))
             msg <- paste(msg, " version ", ob$version)
         else msg <- paste(msg, " in directory ", ob$dir)
         packageStartupMessage(msg)
+        pathtoBUGS <- gsub("/", "\\", ob$dir)
+        oldpath <- Sys.getenv("PATH")
+        if(!length(grep(pathtoBUGS, oldpath, fixed=TRUE)))
+            Sys.setenv(PATH=paste(oldpath, pathtoBUGS, sep=";"))
     }
 
     ".onUnload.x64" <- function(libpath){

Deleted: trunk/BRugs/R/windows/zzz.x64.R.in
===================================================================
--- trunk/BRugs/R/windows/zzz.x64.R.in	2011-12-30 16:32:10 UTC (rev 234)
+++ trunk/BRugs/R/windows/zzz.x64.R.in	2011-12-30 16:40:33 UTC (rev 235)
@@ -1,25 +0,0 @@
-if (is.R()){
-
-    ".onLoad" <- function(lib, pkg){
-        ## TODO any need for these to be user specifiable?
-        options("BRugsTmpdir" = gsub("\\\\", "/", tempdir()))
-        options("BRugsExtFile" = paste(basename(tempfile()), ".bug", sep=""))
-        options(OpenBUGS = "@OPENBUGS@")
-        options(OpenBUGSdoc = "@OPENBUGSDOC@")
-        options(OpenBUGSExamples = paste(options()$OpenBUGSdoc, "Examples", sep="/"))
-
-        if(is.null(getOption("BRugsVerbose")))
-            options("BRugsVerbose" = TRUE)
-        .initGlobals()
-        ob <- findOpenBUGS()
-        msg <- paste("Welcome to BRugs connected to OpenBUGS")
-        if (!is.na(ob$version))
-            msg <- paste(msg, "version", ob$version)
-        else msg <- paste(msg, "in directory", ob$dir)
-        packageStartupMessage(msg)
-    }
-
-    ".onUnload" <- function(libpath){
-    }
-
-}

Modified: trunk/BRugs/configure.win
===================================================================
--- trunk/BRugs/configure.win	2011-12-30 16:32:10 UTC (rev 234)
+++ trunk/BRugs/configure.win	2011-12-30 16:40:33 UTC (rev 235)
@@ -1,13 +0,0 @@
-## Configure script only needed for 64 bit Windows, where BRugs calls
-## the 32-bit OpenBUGS library via a helper application.  First find
-## the location of the OpenBUGS installation. 
-
-OPENBUGS=`"${R_HOME}/bin${R_ARCH_BIN}/Rscript.exe" configure.win.R`
-
-## Install the OpenBUGS DLL into the package.  There is no Windows
-## equivalent of $rpath for adding to the dynamic link path, therefore
-## the DLL is installed in the same directory as the helper
-## executable.
-
-OPENBUGSLIB="$OPENBUGS/libOpenBUGS.dll"
-cp "$OPENBUGSLIB" exec

Deleted: trunk/BRugs/configure.win.R
===================================================================
--- trunk/BRugs/configure.win.R	2011-12-30 16:32:10 UTC (rev 234)
+++ trunk/BRugs/configure.win.R	2011-12-30 16:40:33 UTC (rev 235)
@@ -1,20 +0,0 @@
-## Find OpenBUGS installation location
-source("R/windows/findOpenBUGS.R")
-OPENBUGS <- findOpenBUGS()$dir
-OPENBUGS <- gsub("\\\\","/",OPENBUGS)
-
-dummy <- file.copy("src/Makevars.in","src/Makefile.win", overwrite=TRUE)
-x <- readLines("src/Makefile.win")
-x <- gsub("@OPENBUGS@", dQuote(OPENBUGS), x, fixed=TRUE)
-x <- gsub("@DYNLIBEXT@", "dll", x, fixed=TRUE)
-writeLines(x, "src/Makefile.win")
-
-dummy <- file.copy("R/windows/zzz.x64.R.in","R/windows/zzz.x64.R", overwrite=TRUE)
-x <- readLines("R/windows/zzz.x64.R")
-x <- gsub("@OPENBUGS@", OPENBUGS, x, fixed=TRUE)
-x <- gsub("@OPENBUGSDOC@", OPENBUGS, x, fixed=TRUE)
-x <- gsub("\".onLoad\"[[:space:]]*<-[[:space:]]*function", "\".onLoad.x64\" <- function", x)
-x <- gsub("\".onUnload\"[[:space:]]*<-[[:space:]]*function", "\".onUnload.x64\" <- function", x)
-writeLines(x, "R/windows/zzz.x64.R")
-
-cat(OPENBUGS)

Modified: trunk/BRugs/src/Makefile.win
===================================================================
--- trunk/BRugs/src/Makefile.win	2011-12-30 16:32:10 UTC (rev 234)
+++ trunk/BRugs/src/Makefile.win	2011-12-30 16:40:33 UTC (rev 235)
@@ -1,6 +1,7 @@
-BUGS_LIBS = "C:/Program Files (x86)/OpenBUGS/OpenBUGS321"/libOpenBUGS.dll
-BUGS_LDFLAGS = -m32 -Wl,-rpath="C:/Program Files (x86)/OpenBUGS/OpenBUGS321" 
+BUGS_PATH = `"${R_HOME}/bin${R_ARCH_BIN}/Rscript" -e "source('../R/windows/findOpenBUGS.R');cat(findOpenBUGS()[['dir']])"`
+BUGS_LIBS = "$(BUGS_PATH)/libOpenBUGS.dll"
+BUGS_LDFLAGS = -m32 -Wl,-rpath="$(BUGS_PATH)"
 
 BugsHelper:
-	mkdir -p ../exec
-	$(CC) $(CFLAGS) $(LDFLAGS) $(BUGS_LDFLAGS) BugsHelper.c $(BUGS_LIBS) -o ../exec/BugsHelper 
+	mkdir -p $(R_PACKAGE_DIR)/exec
+	$(CC) $(CFLAGS) $(LDFLAGS) $(BUGS_LDFLAGS) BugsHelper.c $(BUGS_LIBS) -o $(R_PACKAGE_DIR)/exec/BugsHelper

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.





Thread: [Bugs-r-devel] SF.net SVN: bugs-r:[235] trunk/BRugs (Page 2)

bugs-r-devel