Permalink
Browse files

start tidying up

git-svn-id: https://svn.r-project.org/R/trunk@56457 00db46b3-68df-0310-9c12-caf00c1e9a41
  • Loading branch information...
1 parent c22e2b1 commit 31abef5b82dbb2411b256991cbee77cce6c44d40 ripley committed Jul 21, 2011
@@ -54,7 +54,6 @@ mkR1:
cat $(RSRC) > "$${f}"; \
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
@@ -143,6 +142,10 @@ mklazy:
mklazycomp: $(top_builddir)/library/$(pkg)/R/$(pkg).rdb
+mkRsimple:
+ @$(INSTALL_DATA) all.R $(top_builddir)/library/$(pkg)/R/$(pkg)
+ @rm -f $(top_builddir)/library/$(pkg)/R/$(pkg).Rd?
+
mkpo:
@if test -d $(srcdir)/inst/po; then \
if test "$(USE_NLS)" = "yes"; then \
@@ -25,11 +25,13 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
R_PKGS_CMP = @BYTE_COMPILE_PACKAGES_TRUE@ base tools
+
## FIXME: do some of this in parallel?
-## beware there is a bootstrapping problem here: tools uses tools to
+## Beware there is a bootstrapping problem here: tools uses tools to
## dump its namespace. So it works initially, but not to update.
-## When base is made we need to use 'date' to set the timestamp,
-## so we remake it before dumping the DESCRIPTION files.
+## When base is made we need to use 'date' to set the timestamp in
+## its DESCRIPTION , so we remake it before dumping the DESCRIPTION files.
+
R:
@$(MKINSTALLDIRS) $(top_builddir)/library
@for pkg in profile base tools compiler; do \
@@ -22,7 +22,8 @@ R_EXE = $(top_builddir)/bin/R --vanilla --slave
all: Makefile DESCRIPTION
@$(ECHO) "building package '$(pkg)'"
@$(MKINSTALLDIRS) $(top_builddir)/library/$(pkg)
- @$(MAKE) mkR mkdesc
+ @$(MAKE) mkR1 mkdesc
+ @$(INSTALL_DATA) all.R $(top_builddir)/library/$(pkg)/R/$(pkg)
@$(MKINSTALLDIRS) $(top_builddir)/library/$(pkg)/data
@for f in $(srcdir)/data/*; do \
$(INSTALL_DATA) $${f} $(top_builddir)/library/$(pkg)/data; \
@@ -25,6 +25,7 @@ update:
@$(MAKE) mklazycomp
## This is deliberately conservative: -nt seems to work differently in some shells
+## We first use mkdesc2 (with date) to install the DESCRIPTION, then re-install
all: Makefile DESCRIPTION
@$(ECHO) "building package '$(pkg)'"
@$(MKINSTALLDIRS) $(top_builddir)/library/$(pkg)
@@ -13,6 +13,7 @@ pkg = tools
RSRC = `LC_COLLATE=C ls $(srcdir)/R/*.R`
+## We first use mkdesc2 (with date) to install the DESCRIPTION, then re-install
all:
@$(ECHO) "building package '$(pkg)'"
@$(MKINSTALLDIRS) $(top_builddir)/library/$(pkg)

0 comments on commit 31abef5

Please sign in to comment.