Permalink
Browse files

datasets does not need to make R code

git-svn-id: https://svn.r-project.org/R/trunk@56478 00db46b3-68df-0310-9c12-caf00c1e9a41
  • Loading branch information...
1 parent 2a13292 commit 9cd6b7ab9e06878846e166201a0ce42db9bfeab0 ripley committed Jul 22, 2011
Showing with 11 additions and 31 deletions.
  1. +2 −4 share/make/basepkg.mk
  2. +5 −5 src/library/datasets/Makefile.in
  3. +4 −5 src/library/datasets/Makefile.win
  4. +0 −17 src/library/datasets/R/zzz.R
View
@@ -20,7 +20,7 @@ instdirs:
done; \
fi; done
-## does not install all.R
+## used for base on Windows. Every package except base has a namespace
mkR1:
@$(MKINSTALLDIRS) $(top_builddir)/library/$(pkg)/R
@(f=$${TMPDIR:-/tmp}/R$$$$; \
@@ -53,9 +53,7 @@ mkR2:
fi; \
$(SHELL) $(top_srcdir)/tools/move-if-change "$${f}" all.R)
@rm -f $(top_builddir)/library/$(pkg)/Meta/nsInfo.rds
- @if test -f $(srcdir)/NAMESPACE; then \
- $(INSTALL_DATA) $(srcdir)/NAMESPACE $(top_builddir)/library/$(pkg); \
- fi
+ @$(INSTALL_DATA) $(srcdir)/NAMESPACE $(top_builddir)/library/$(pkg)
@rm -f $(top_builddir)/library/$(pkg)/Meta/nsInfo.rds
## version for base on Unix, substitutes for @which@
@@ -15,15 +15,12 @@ DISTFILES = DESCRIPTION.in Makefile.in Makefile.win NAMESPACE
pkg = datasets
-RSRC = $(srcdir)/R/zzz.R
-
R_EXE = $(top_builddir)/bin/R --vanilla --slave
all: Makefile DESCRIPTION
@$(ECHO) "building package '$(pkg)'"
@$(MKINSTALLDIRS) $(top_builddir)/library/$(pkg)
- @$(MAKE) mkR1 mkdesc
- @$(INSTALL_DATA) all.R $(top_builddir)/library/$(pkg)/R/$(pkg)
+ @$(MAKE) mkR mkdesc
@$(MKINSTALLDIRS) $(top_builddir)/library/$(pkg)/data
@for f in $(srcdir)/data/*; do \
$(INSTALL_DATA) $${f} $(top_builddir)/library/$(pkg)/data; \
@@ -36,7 +33,10 @@ all: Makefile DESCRIPTION
include $(top_srcdir)/share/make/basepkg.mk
-mkR: mkR1
+mkR:
+ @$(INSTALL_DATA) $(srcdir)/NAMESPACE $(top_builddir)/library/$(pkg)
+ @rm -f $(top_builddir)/library/$(pkg)/Meta/nsInfo.rds
+
# dummy targets
Rsimple Rlazy Rlazycomp:
@@ -11,13 +11,10 @@ include $(top_builddir)/Makeconf
pkg = datasets
-RSRC = $(srcdir)/R/zzz.R
-
all:
@$(ECHO) "building package '$(pkg)'"
@$(MKINSTALLDIRS) $(top_builddir)/library/$(pkg)
- @$(MAKE) -f Makefile.win mkR1 mkdesc
- @$(INSTALL_DATA) all.R $(top_builddir)/library/$(pkg)/R/$(pkg)
+ @$(MAKE) -f Makefile.win mkR mkdesc
@$(MKINSTALLDIRS) $(top_builddir)/library/$(pkg)/data
@for f in $(srcdir)/data/*; do \
$(INSTALL_DATA) $${f} $(top_builddir)/library/$(pkg)/data; \
@@ -30,7 +27,9 @@ all:
include $(top_srcdir)/share/make/basepkg.mk
-mkR: mkR1
+mkR:
+ @$(INSTALL_DATA) $(srcdir)/NAMESPACE $(top_builddir)/library/$(pkg)
+ @rm -f $(top_builddir)/library/$(pkg)/Meta/nsInfo.rds
# dummy targets
Rsimple Rlazy Rlazycomp:
@@ -1,17 +0,0 @@
-# File src/library/datasets/R/zzz.R
-# Part of the R package, http://www.R-project.org
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# A copy of the GNU General Public License is available at
-# http://www.r-project.org/Licenses/
-
-.noGenerics <- TRUE

0 comments on commit 9cd6b7a

Please sign in to comment.