Skip to content
This repository was archived by the owner on Jun 10, 2026. It is now read-only.

Windows 10 compatibility #11

Open
crystalgreen wants to merge 10 commits into
base: dc_9x
Choose a base branch
from
Open

Windows 10 compatibility #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
8121e54
Add include directory of installation of Microsoft R Open 3.3.2.
Mar 24, 2017
a7a0d11
Fix R package built: disable call of configure.win that threw error.
Mar 24, 2017
ffb77d0
Creation of child process failed because socket duplication was done …
Mar 24, 2017
3d96024
Use double quotes around path of Rserve.exe when starting within R to…
Mar 27, 2017
793fe57
When starting Rserve from within R, always pass the port as parameter.
Mar 27, 2017
b7ad711
Enhance include path for release build target.
Mar 27, 2017
7f1289a
Ignore Visual Studio artifacts
Mar 27, 2017
d10def3
Merge remote-tracking branch 'remotes/Microsoft/dc_9x' into dc_9x
Apr 14, 2017
86e5283
Merge branch 'dc_9x' of https://github.com/Microsoft/deployr-rserve i…
May 5, 2017
99f7e60
Fixed setup of stdout pipe.
May 11, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,10 @@
*.esproj
*.sublime-workspace
*.sublime-project

# Visual Studio artifacts
.vs/
*.exe
x64/
Debug/
*.vcxproj.user
3 changes: 2 additions & 1 deletion Rserve/R/conn.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@ Rserve <- function(debug=FALSE, port=6311, args=NULL) {
if (!nchar(fn) || !file.exists(fn))
stop("Cannot find ", ffn)
else {
if ( port != 6311 ) fn <- paste( fn, "--RS-port", port )
fn <- paste("\"", fn, "\"", sep='');
fn <- paste( fn, "--RS-port", port )
if ( !is.null(args) ) fn <- paste(fn, paste(args, collapse=' '))

pad <- paste(R.home(),"\\bin;",sep='')
Expand Down
Loading