Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

tweaks to the build process on Windows

git-svn-id: https://svn.r-project.org/R/trunk@56471 00db46b3-68df-0310-9c12-caf00c1e9a41
  • Loading branch information...
commit 1e461df3cd5cefa5b2e390ce4a57b412c43f3ff8 1 parent 222d982
ripley authored
View
13 share/make/lazycomp.mk
@@ -1,12 +1,17 @@
## ${R_HOME}/share/make/lazycomp.mk
-## Use for all packages except base, tools, datasets, methods
+## Used for all packages except base, tools, datasets, methods
$(top_builddir)/library/$(pkg)/R/$(pkg).rdb: all.R
@$(INSTALL_DATA) all.R $(top_builddir)/library/$(pkg)/R/$(pkg)
- @$(ECHO) "byte-compiling package '$(pkg)'"
- @$(ECHO) "tools:::makeLazyLoading(\"$(pkg)\")" | \
+ @if test -n "$(R_NO_BASE_COMPILE)"; then \
+ $(ECHO) "tools:::makeLazyLoading(\"$(pkg)\")" | \
+ R_DEFAULT_PACKAGES=$(DEFPKGS) LC_ALL=C $(R_EXE) > /dev/null; \
+ else \
+ $(ECHO) "byte-compiling package '$(pkg)'"; \
+ $(ECHO) "tools:::makeLazyLoading(\"$(pkg)\")" | \
R_COMPILE_PKGS=1 R_COMPILER_SUPPRESS_ALL=1 \
- R_DEFAULT_PACKAGES=$(DEFPKGS) LC_ALL=C $(R_EXE) > /dev/null
+ R_DEFAULT_PACKAGES=$(DEFPKGS) LC_ALL=C $(R_EXE) > /dev/null; \
+ fi
Rsimple: mkR mkRsimple
Rlazy: mkR mkRsimple mklazy
View
18 src/library/Makefile.win
@@ -32,11 +32,19 @@ R:
R_OSTYPE=windows VERSION=$(RVER) BINDIR=$(BINDIR) \
all install-tests || exit 1; \
done
- @for pkg in base tools; do \
- $(MAKE) -C $${pkg} -f Makefile.win R_ARCH=$(R_ARCH) \
- R_OSTYPE=windows VERSION=$(RVER) BINDIR=$(BINDIR) \
- mklazycomp || exit 1; \
- done
+ @if test -z "$(R_NO_BASE_COMPILE)"; then \
+ for pkg in base tools; do \
+ $(MAKE) -C $${pkg} -f Makefile.win R_ARCH=$(R_ARCH) \
+ R_OSTYPE=windows VERSION=$(RVER) BINDIR=$(BINDIR) \
+ mklazycomp || exit 1; \
+ done; \
+ else \
+ for pkg in base tools; do \
+ $(MAKE) -C $${pkg} -f Makefile.win R_ARCH=$(R_ARCH) \
+ R_OSTYPE=windows VERSION=$(RVER) BINDIR=$(BINDIR) \
+ Rlazy || exit 1; \
+ done; \
+ fi
@for pkg in $(R_PKGS_BASE1); do \
$(MAKE) -C $${pkg} -f Makefile.win R_ARCH=$(R_ARCH) \
R_OSTYPE=windows VERSION=$(RVER) BINDIR=$(BINDIR) \
View
12 src/library/Recommended/Makefile.win
@@ -28,7 +28,7 @@ stamp-recommended: $(OBJECTS)
@touch $@
## allow parallel installs, modulo dependencies below
-INSTALL_OPTS=--pkglock --install-tests --data-compress=xz --byte-compile
+INSTALL_OPTS=--pkglock --install-tests --data-compress=xz
RCMD = $(top_builddir)/$(BINDIR)/Rcmd
@@ -37,9 +37,15 @@ RCMD = $(top_builddir)/$(BINDIR)/Rcmd
.tgz.ts:
@echo
@echo "----- installing recommended package" `basename $< .tgz`
- @R_INSTALL_TAR='tar.exe --no-same-owner --no-same-permissions' \
+ @if test -n "$(R_NO_BASE_COMPILE)"; then \
+ R_INSTALL_TAR='tar.exe --no-same-owner --no-same-permissions' \
R_LIBS_USER= R_LIBS_SITE= \
- $(RCMD) INSTALL $(INSTALL_OPTS) -l $(top_builddir)/library `basename $< .tgz`_*.tar.gz
+ $(RCMD) INSTALL $(INSTALL_OPTS) -l $(top_builddir)/library `basename $< .tgz`_*.tar.gz; \
+ else \
+ R_INSTALL_TAR='tar.exe --no-same-owner --no-same-permissions' \
+ R_LIBS_USER= R_LIBS_SITE= \
+ $(RCMD) INSTALL $(INSTALL_OPTS) --byte-compile -l $(top_builddir)/library `basename $< .tgz`_*.tar.gz; \
+ fi
@touch $@
clean:
View
6 src/library/methods/Makefile.win
@@ -19,7 +19,11 @@ all:
@$(MKINSTALLDIRS) $(top_builddir)/library/$(pkg)
@$(MAKE) -f Makefile.win mkR2 front mkdesc mkpo
@$(MAKE) -f Makefile.win mksrc-win2
- @$(MAKE) -f Makefile.win RfilesLazy EXTRAS2=$(EXTRAS)
+ @if test -n "$(R_NO_BASE_COMPILE)"; then \
+ $(MAKE) -f Makefile.win RfilesLazy; \
+ else \
+ $(MAKE) -f Makefile.win RfilesLazy EXTRAS2=$(EXTRAS); \
+ fi
include $(top_srcdir)/share/make/basepkg.mk
View
6 src/library/tools/Makefile.win
@@ -33,3 +33,9 @@ $(top_builddir)/library/$(pkg)/R/$(pkg).rdb: all.R
$(ECHO) "makeLazyLoading(\"$(pkg)\")") | \
R_COMPILE_PKGS=1 R_COMPILER_SUPPRESS_ALL=1 \
R_DEFAULT_PACKAGES=NULL LC_ALL=C $(R_EXE) > /dev/null
+
+Rlazy: mkR mkRsimple
+ @$(INSTALL_DATA) all.R $(top_builddir)/library/$(pkg)/R/$(pkg)
+ @(cat $(srcdir)/R/makeLazyLoad.R; \
+ $(ECHO) "makeLazyLoading(\"$(pkg)\")") | \
+ R_DEFAULT_PACKAGES=NULL LC_ALL=C $(R_EXE) > /dev/null
Please sign in to comment.
Something went wrong with that request. Please try again.