Permalink
Browse files

add some cleanup of symbols.rds

git-svn-id: https://svn.r-project.org/R/trunk@58742 00db46b3-68df-0310-9c12-caf00c1e9a41
  • Loading branch information...
1 parent 7f75f5e commit 4c5faa623fdf57ed3c27c6605d51f68b4c304561 ripley committed Mar 14, 2012
Showing with 6 additions and 4 deletions.
  1. +1 −1 share/make/shlib.mk
  2. +1 −1 share/make/winshlib.mk
  3. +4 −2 src/library/tools/R/build.R
View
@@ -12,7 +12,7 @@ $(SHLIB): $(OBJECTS)
shlib-clean:
@rm -rf .libs _libs
- @rm -f $(OBJECTS)
+ @rm -f $(OBJECTS) symbols.rds
## FIXME: why not Rscript?
View
@@ -23,7 +23,7 @@ $(SHLIB): $(OBJECTS)
.PHONY: all shlib-clean
shlib-clean:
- @rm -f $(OBJECTS)
+ @rm -f $(OBJECTS) symbols.rds
## FIXME: why not Rscript?
symbols.rds: $(OBJECTS)
@@ -448,7 +448,8 @@ get_exclude_patterns <- function()
}
## Also cleanup possible Unix leftovers ...
unlink(c(Sys.glob(c("*.o", "*.sl", "*.so", "*.dylib")),
- paste0(pkgname, c(".a", ".dll", ".def"))))
+ paste0(pkgname, c(".a", ".dll", ".def")),
+ "symbols.rds"))
if (dir.exists(".libs")) unlink(".libs", recursive = TRUE)
if (dir.exists("_libs")) unlink("_libs", recursive = TRUE)
}
@@ -471,7 +472,8 @@ get_exclude_patterns <- function()
}
## Also cleanup possible Windows leftovers ...
unlink(c(Sys.glob(c("*.o", "*.sl", "*.so", "*.dylib")),
- paste0(pkgname, c(".a", ".dll", ".def"))))
+ paste0(pkgname, c(".a", ".dll", ".def")),
+ "symbols.rds"))
if (dir.exists(".libs")) unlink(".libs", recursive = TRUE)
if (dir.exists("_libs")) unlink("_libs", recursive = TRUE)
}

0 comments on commit 4c5faa6

Please sign in to comment.