Permalink
Browse files

add some Windows encodingssrc/library/tools/R/Vignettes.R

git-svn-id: https://svn.r-project.org/R/trunk@56359 00db46b3-68df-0310-9c12-caf00c1e9a41
  • Loading branch information...
1 parent f0d4644 commit b00534a5aa78d92810905e11542e35180f5ee440 ripley committed Jul 11, 2011
View
@@ -1024,6 +1024,8 @@ MAIN_CFLAGS
R_BATCHSAVE
R_PAPERSIZE
R_PRINTCMD
+BYTE_COMPILE_PACKAGES_FALSE
+BYTE_COMPILE_PACKAGES_TRUE
BUILD_HTML_FALSE
BUILD_HTML_TRUE
MAINTAINER_MODE_FALSE
@@ -1123,6 +1125,7 @@ with_system_xz
with_valgrind_instrumentation
with_recommended_packages
with_ICU
+enable_byte_compiled_packages
enable_static
enable_shared
with_pic
@@ -1834,6 +1837,8 @@ Optional Features:
--enable-strict-barrier provoke compile error on write barrier violation
[no]
--enable-prebuilt-html build static HTML help pages [no]
+ --enable-byte-compiled-packages
+ byte-compile base and recommended packages [yes]
--enable-static[=PKGS] (libtool) build static libraries [default=no]
--enable-shared[=PKGS] (libtool) build shared libraries [default=yes]
@@ -4151,6 +4156,23 @@ else
fi
+## Byte-compilation of packages.
+# Check whether --enable-byte-compiled-packages was given.
+if test "${enable_byte_compiled_packages+set}" = set; then :
+ enableval=$enable_byte_compiled_packages; want_byte_compiled_packages="${enableval}"
+else
+ want_byte_compiled_packages=yes
+fi
+
+ if test "x${want_byte_compiled_packages}" = xyes; then
+ BYTE_COMPILE_PACKAGES_TRUE=
+ BYTE_COMPILE_PACKAGES_FALSE='#'
+else
+ BYTE_COMPILE_PACKAGES_TRUE='#'
+ BYTE_COMPILE_PACKAGES_FALSE=
+fi
+
+
### ** Precious variables.
@@ -8775,13 +8797,13 @@ if test "${lt_cv_nm_interface+set}" = set; then :
else
lt_cv_nm_interface="BSD nm"
echo "int some_variable = 0;" > conftest.$ac_ext
- (eval echo "\"\$as_me:8778: $ac_compile\"" >&5)
+ (eval echo "\"\$as_me:8800: $ac_compile\"" >&5)
(eval "$ac_compile" 2>conftest.err)
cat conftest.err >&5
- (eval echo "\"\$as_me:8781: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+ (eval echo "\"\$as_me:8803: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
(eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
cat conftest.err >&5
- (eval echo "\"\$as_me:8784: output\"" >&5)
+ (eval echo "\"\$as_me:8806: output\"" >&5)
cat conftest.out >&5
if $GREP 'External.*some_variable' conftest.out > /dev/null; then
lt_cv_nm_interface="MS dumpbin"
@@ -11629,11 +11651,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:11632: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:11654: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:11636: \$? = $ac_status" >&5
+ echo "$as_me:11658: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -11968,11 +11990,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:11971: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:11993: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:11975: \$? = $ac_status" >&5
+ echo "$as_me:11997: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -12073,11 +12095,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:12076: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:12098: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:12080: \$? = $ac_status" >&5
+ echo "$as_me:12102: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -12128,11 +12150,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:12131: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:12153: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:12135: \$? = $ac_status" >&5
+ echo "$as_me:12157: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -14495,7 +14517,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 14498 "configure"
+#line 14520 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -14591,7 +14613,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 14594 "configure"
+#line 14616 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -16540,11 +16562,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16543: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16565: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:16547: \$? = $ac_status" >&5
+ echo "$as_me:16569: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -16639,11 +16661,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16642: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16664: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:16646: \$? = $ac_status" >&5
+ echo "$as_me:16668: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -16691,11 +16713,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16694: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16716: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:16698: \$? = $ac_status" >&5
+ echo "$as_me:16720: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -18071,11 +18093,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:18074: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:18096: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:18078: \$? = $ac_status" >&5
+ echo "$as_me:18100: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -18170,11 +18192,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:18173: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:18195: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:18177: \$? = $ac_status" >&5
+ echo "$as_me:18199: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -18222,11 +18244,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:18225: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:18247: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:18229: \$? = $ac_status" >&5
+ echo "$as_me:18251: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -22816,7 +22838,7 @@ _ACEOF
# flags.
r_save_CFLAGS=$CFLAGS
CFLAGS="$CFLAGS $r_verb"
-(eval echo $as_me:22819: \"$ac_link\") >&5
+(eval echo $as_me:22841: \"$ac_link\") >&5
r_c_v_output=`eval $ac_link 5>&1 2>&1 | grep -v 'Driving:'`
echo "$r_c_v_output" >&5
CFLAGS=$r_save_CFLAGS
@@ -22891,7 +22913,7 @@ _ACEOF
# flags.
r_save_CFLAGS=$CFLAGS
CFLAGS="$CFLAGS $r_cv_prog_c_v"
-(eval echo $as_me:22894: \"$ac_link\") >&5
+(eval echo $as_me:22916: \"$ac_link\") >&5
r_c_v_output=`eval $ac_link 5>&1 2>&1 | grep -v 'Driving:'`
echo "$r_c_v_output" >&5
CFLAGS=$r_save_CFLAGS
@@ -35604,11 +35626,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:35607: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:35629: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:35611: \$? = $ac_status" >&5
+ echo "$as_me:35633: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -35703,11 +35725,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:35706: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:35728: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:35710: \$? = $ac_status" >&5
+ echo "$as_me:35732: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -35755,11 +35777,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:35758: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:35780: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:35762: \$? = $ac_status" >&5
+ echo "$as_me:35784: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -42406,6 +42428,10 @@ if test -z "${BUILD_HTML_TRUE}" && test -z "${BUILD_HTML_FALSE}"; then
as_fn_error "conditional \"BUILD_HTML\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
+if test -z "${BYTE_COMPILE_PACKAGES_TRUE}" && test -z "${BYTE_COMPILE_PACKAGES_FALSE}"; then
+ as_fn_error "conditional \"BYTE_COMPILE_PACKAGES\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
if test -z "${CROSS_COMPILING_TRUE}" && test -z "${CROSS_COMPILING_FALSE}"; then
as_fn_error "conditional \"CROSS_COMPILING\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
View
@@ -436,6 +436,15 @@ AC_ARG_WITH([ICU],
[R_ARG_USE(ICU)],
[use_ICU=yes])
+## Byte-compilation of packages.
+AC_ARG_ENABLE([byte-compiled-packages],
+[AS_HELP_STRING([--enable-byte-compiled-packages],
+ [byte-compile base and recommended packages @<:@yes@:>@])],
+[want_byte_compiled_packages="${enableval}"],
+[want_byte_compiled_packages=yes])
+AM_CONDITIONAL(BYTE_COMPILE_PACKAGES,
+ [test "x${want_byte_compiled_packages}" = xyes])
+
### ** Precious variables.
AC_ARG_VAR([R_PRINTCMD],
View
@@ -437,8 +437,11 @@
\subsection{INSTALLATION}{
\itemize{
- \item The base and recommended packages are now always
- byte-compiled (equivalent to \command{make bytecode} in \R 2.13.x).
+ \item The base and recommended packages are now byte-compiled
+ (equivalent to \command{make bytecode} in \R 2.13.x). On a
+ Unix-alike this can be disabled by configuring with
+ \option{--disable-byte-compiled-packages} (although this is intended
+ only for expert use and is not supported).
\item Configure option \option{--with-system-zlib} now only makes
use of the basic interface of \code{zlib} and not the
View
@@ -135,11 +135,11 @@ mkexec:
done; \
fi
-## not currently used
+## only use if byte-compilation is disabled
mklazy:
@$(INSTALL_DATA) all.R $(top_builddir)/library/$(pkg)/R/$(pkg)
@$(ECHO) "tools:::makeLazyLoading(\"$(pkg)\")" | \
- R_DEFAULT_PACKAGES=NULL LC_ALL=C $(R_EXE) > /dev/null
+ R_DEFAULT_PACKAGES=$(DEFPKGS) LC_ALL=C $(R_EXE) > /dev/null
mklazycomp: $(top_builddir)/library/$(pkg)/R/$(pkg).rdb
@@ -163,11 +163,12 @@ mksrc-win2:
(cd src && $(MAKE) -f Makefile.win) || exit 1; \
fi
-
+## install man/figures: currently only used for graphics
mkfigs:
@if test -d $(srcdir)/man/figures; then \
mkdir -p $(top_builddir)/library/$(pkg)/help/figures; \
- cp $(srcdir)/man/figures/* $(top_builddir)/library/$(pkg)/help/figures; \
+ cp $(srcdir)/man/figures/* \
+ $(top_builddir)/library/$(pkg)/help/figures; \
fi
install-tests:
View
@@ -24,6 +24,7 @@ all: Makefile R
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
## dump its namespace. So it works initially, but not to update.
@@ -34,7 +35,7 @@ R:
@for pkg in profile base tools compiler; do \
(cd $${pkg} && $(MAKE) all) || exit 1; \
done
- @for pkg in base tools; do \
+ @for pkg in $(R_PKGS_CMP); do \
(cd $${pkg} && $(MAKE) mklazycomp) || exit 1; \
done
@for pkg in $(R_PKGS_BASE1); do \
@@ -40,7 +40,7 @@ stamp-recommended: $(OBJECTS)
@touch $@
## need to allow parallel installs
-INSTALL_OPTS=--pkglock --data-compress=xz --byte-compile
+INSTALL_OPTS=--pkglock --data-compress=xz@BYTE_COMPILE_PACKAGES_TRUE@ --byte-compile
.tgz.ts:
@$(ECHO) "begin installing recommended package" `basename $< .tgz`
@@ -24,7 +24,8 @@ all: Makefile DESCRIPTION @MAINTAINER_MODE_TRUE@ from-noweb
@$(ECHO) "building package '$(pkg)'"
@$(MKINSTALLDIRS) $(top_builddir)/library/$(pkg)
@$(MAKE) mkR1 mkdesc mkpo
- @$(MAKE) mklazycomp
+@BYTE_COMPILE_PACKAGES_FALSE@ @$(MAKE) mklazy
+@BYTE_COMPILE_PACKAGES_TRUE@ @$(MAKE) mklazycomp
NOTANGLE = @NOTANGLE@
from-noweb: $(srcdir)/R/cmp.R
Oops, something went wrong.

0 comments on commit b00534a

Please sign in to comment.