Commit ea4d7e72 authored by Dirk Eddelbuettel's avatar Dirk Eddelbuettel

Import Upstream version 2.4.0

parent 13e89a53

Too many changes to show.

To preserve performance only 1000 of 1000+ files are displayed.

......@@ -19,7 +19,7 @@ CC = @CC@
DISTDIR_TAR_EXCLUDE = --exclude=.svn --exclude=CVS --exclude=Makefile --exclude="*.o" --exclude="*$(SHLIB_EXT)"
......@@ -43,7 +43,7 @@ INSTALL_DIR = ${INSTALL} -d
......@@ -100,7 +100,7 @@ install: installdirs svnonly
@if test ! -f "$(srcdir)/doc/FAQ" || test -f non-tarball ; then \
(cd doc/manual && $(MAKE) front-matter) ; \
(cd doc/manual && $(MAKE) front-matter html-non-svn) ; \
touch non-tarball ; \
(cd $(srcdir); LC_ALL=C TZ=GMT svn info || echo "Revision: unknown") 2> /dev/null \
| sed -n -e '/^Revision/p' -e '/^Last Changed Date/'p \
......@@ -157,7 +157,10 @@ distclean: clean
for d in $${rsd}; do (cd $${d} && $(MAKE) $@); done)
-@rm -rf bin include lib library modules gnome
@if test -f non-tarball ; then \
rm -f $(NON_SVN_INSTFILES) non-tarball ; \
rm -f $(NON_SVN_INSTFILES) non-tarball doc/FAQ doc/RESOURCES doc/html/resources.html ; \
@if test "$(BUILDDIR_IS_SRCDIR)" = no ; then \
-@rm -f Makeconf Makefile Makefile.bak Makefrag.* \
config.cache config.log config.status libtool \
......@@ -238,29 +241,30 @@ install-R-framework:
@## the resulting libR will point dyld to the fat libR regardless of its origin
@(cd "$(R_FRAMEWORK_DIR)/Resources/lib" && \
install_name_tool -id "$(R_FRAMEWORK_DIR)/Versions/$(FW_VERSION)/Resources/lib/libR.dylib" $(Rexeclibdir)/libR.dylib)
@(if test -e $(Rexeclibdir)/libRlapack.dylib; then \
find "$(R_FRAMEWORK_DIR)/Versions/$(FW_VERSION)/Resources/" -name '*.so' -or -name '*.dylib' | \
xargs -n 1 install_name_tool -change \
`otool -L $(Rexeclibdir)/libRlapack.dylib |sed -n -e '2 s/.\(.*\) (compat.*/\1/p'` \
"$(R_FRAMEWORK_DIR)/Versions/$(FW_VERSION)/Resources/lib/libRlapack.dylib" ; \
install_name_tool -id "$(R_FRAMEWORK_DIR)/Versions/$(FW_VERSION)/Resources/lib/libRlapack.dylib" \
$(Rexeclibdir)/libRlapack.dylib; \
@(for lib in Rlapack Rblas R; do \
if test -e "$(Rexeclibdir)/lib$${lib}.dylib"; then echo " lib$${lib}"; \
find "$(R_FRAMEWORK_DIR)/Versions/$(FW_VERSION)/Resources/" -name '*.so' -or -name '*.dylib' | \
xargs -n 1 install_name_tool -change \
`otool -L $(Rexeclibdir)/lib$${lib}.dylib |sed -n -e '2 s/.\(.*\) (compat.*/\1/p'` \
"$(R_FRAMEWORK_DIR)/Versions/$(FW_VERSION)/Resources/lib/lib$${lib}.dylib" ; \
find "$(R_FRAMEWORK_DIR)/Versions/$(FW_VERSION)/Resources/" -name '*.so' -or -name '*.dylib' | \
xargs -n 1 install_name_tool -change lib$${lib}.dylib \
"$(R_FRAMEWORK_DIR)/Versions/$(FW_VERSION)/Resources/lib/lib$${lib}.dylib" ; \
install_name_tool -id "$(R_FRAMEWORK_DIR)/Versions/$(FW_VERSION)/Resources/lib/lib$${lib}.dylib" \
"$(Rexeclibdir)/lib$${lib}.dylib"; \
if [ "$(Rexeclibdir)" != "$(R_FRAMEWORK_DIR)/Versions/$(FW_VERSION)/Resources/lib" ]; then \
$(srcdir)/tools/updatefat "$(R_FRAMEWORK_DIR)/Versions/$(FW_VERSION)/Resources/lib/lib$${lib}.dylib" "$(Rexeclibdir)/lib$${lib}.dylib"; \
install_name_tool -id "$(R_FRAMEWORK_DIR)/Versions/$(FW_VERSION)/Resources/lib/lib$${lib}.dylib" \
"$(R_FRAMEWORK_DIR)/Versions/$(FW_VERSION)/Resources/lib/lib$${lib}.dylib"; \
fi; \
fi; \
@(cp -R $(srcdir)/src/include $(R_FRAMEWORK_DIR)/Versions/Current/PrivateHeaders && \
cp src/include/config.h $(R_FRAMEWORK_DIR)/Versions/Current/PrivateHeaders/ && \
find $(R_FRAMEWORK_DIR)/Versions/Current/PrivateHeaders -name .svn | xargs rm -rf)
@(install_name_tool -change libR.dylib \
"$(R_FRAMEWORK_DIR)/Versions/$(FW_VERSION)/Resources/lib/libR.dylib" \
@(find "$(R_FRAMEWORK_DIR)/Versions/$(FW_VERSION)/Resources/" -name '*.so' -exec install_name_tool \
-change libR.dylib "$(R_FRAMEWORK_DIR)/Versions/$(FW_VERSION)/Resources/lib/libR.dylib" \{\} \;)
@(if [ "$(Rexeclibdir)" != "$(R_FRAMEWORK_DIR)/Versions/$(FW_VERSION)/Resources/lib" ]; then \
$(srcdir)/tools/updatefat "$(R_FRAMEWORK_DIR)/Versions/$(FW_VERSION)/Resources/lib/libR.dylib" "$(Rexeclibdir)/libR.dylib"; \
if [ -e "$(Rexeclibdir)/libRlapack.dylib" ]; then \
$(srcdir)/tools/updatefat "$(R_FRAMEWORK_DIR)/Versions/$(FW_VERSION)/Resources/lib/libRlapack.dylib" "$(Rexeclibdir)/libRlapack.dylib"; \
fi \
fi )
@(if [ -n "${R_ARCH}" ]; then \
if [ "${R_ARCH}" != /ppc -a "${R_ARCH}" != /i386 -a "${R_ARCH}" != /ppc64 ]; then \
echo "\
......@@ -269,7 +273,8 @@ install-R-framework:
for f in `ls "$(R_FRAMEWORK_DIR)/Versions/$(FW_VERSION)/Headers/${R_ARCH}/"*.h|xargs basename`; do \
echo "/* This is an automatically generated universal stub for architecture-dependent headers. */~#ifdef __i386__~#include <i386/$$f>~#else~#ifdef __ppc__~#include <ppc/$$f>~#else~#ifdef __ppc64__~#include <ppc64/$$f>~#else~#error Cannot determine the correct architecture. To force a certain configuration, include architecture-specific include path *before* general R headers path.~#endif~#endif~#endif" |sed -e 'y/~/\n/' > "$(R_FRAMEWORK_DIR)/Versions/$(FW_VERSION)/Headers/$$f"; \
done; \
fi \
fi; \
fi )
@( echo "<?xml version=\"1.0\" encoding=\"UTF-8\"?>~<!DOCTYPE plist PUBLIC \"-//Apple Computer//DTD PLIST 1.0//EN\" \"\">~<plist version=\"1.0\">~<dict>~ <key>CFBundleIdentifier</key>~ <string>org.r-project.R-framework</string>~ <key>CFBundleInfoDictionaryVersion</key>~ <string>6.0</string>~ <key>CFBundleName</key>~ <string>R</string>~ <key>CFBundlePackageType</key>~ <string>FMWK</string>~ <key>CFBundleVersion</key>~ <string>$(VERSION)</string>~</dict>~</plist>" |sed -e 'y/~/\n/' > $(R_FRAMEWORK_DIR)/Versions/$(FW_VERSION)/Resources/Info.plist)
This diff is collapsed.
Revision: 38247
Last Changed Date: 2006-06-01
Revision: 39566
Last Changed Date: 2006-10-03
......@@ -48,10 +48,15 @@
## Debugging and optimization options for the C compiler.
## Use this to specify CFLAGS for the version of the C compiler
## specified above.
## If unspecified, defaults to '-g -O2 -std=c99' for gcc,
## If unspecified, defaults to '-g -O2 -std=gnu99' for gcc,
## and '-g' in all other cases except icc (for which see R-admin.html).
## Defines for C compilation.
## Use this to specify defines to be used in the compilation of R,
## DEFS=
## The following additional CFLAGS to be used only in the main
## compilation and only in building shared libraries respectively.
## For example, on some systems one needs 'MAIN_CFLAGS=-pg' when
This diff is collapsed.
This diff is collapsed.
......@@ -22,7 +22,7 @@ Martyn Plummer <>
Brian Ripley <>
Duncan Temple Lang <>
Luke Tierney <>
Simon Urbanek <>
Simon Urbanek <>
plus Heiner Schwarte <> up to October 1999
and Guido Masarotto <> up to June 2003.
......@@ -9,9 +9,9 @@ redistribute it.
The public header files and import libraries are distributed under the
more permissive terms of the file COPYING.LIB. This applies only to
the files
The some of the public header files are distributed under the more
permissive terms of the file COPYING.LIB. This applies only to the
......@@ -20,7 +20,6 @@ src/include/Rinternals.h
src/main/R.exp, generated by tools/ldAIX4 whilst building R on AIX.
From the announcement of the change (2001-Feb-05)
......@@ -43,7 +42,8 @@ From the announcement of the change (2001-Feb-05)
As from R 2.3.0 import libraries are no longer used under Windows.
As from R 2.3.0 import libraries are no longer used under Windows, and
as from R 2.4.0 export files are no longer used under AIX.
Some of the code contains different copyright statements. It is used
......@@ -244,7 +244,7 @@ src/main/apse.h
Copyright (c) 1997-2005 University of Cambridge
Copyright (c) 1997-2006 University of Cambridge
All rights reserved.
See file src/extra/pcre/LICENCE. For binary builds of R that requires
"Australia (QLD)",Australia,Brisbane,,"PlanetMirror, Brisbane",
"Australia (VIC)",Australia,Melbourne,,"University of Melbourne",
Austria,Austria,Wien,,"Technische Universitaet Wien",
Austria,Austria,Wien,,"Wirtschaftsuniversitaet Wien",
"Brazil (PR)",Brazil,Curitiba,,"Universidade Federal do Parana","Paulo J. Ribeiro Jr <>"
"Brazil (MG)",Brazil,Vicosa,,"Federal University of Vicosa",
"Brazil (RJ)",Brazil,"Rio de Janeiro",,"Oswaldo Cruz Foundation, Rio de Janeiro",
......@@ -10,15 +10,17 @@ Austria,Austria,Wien,,"Technische Universitaet Wien
"Canada (BC)",Canada,Burnaby,,"Simon Fraser University, Burnaby","Brad McNeney <>"
"Canada (ON)",Canada,Toronto,,"University of Toronto","Jeffrey S. Rosenthal <jeff at>"
China,China,Nanjing,,"Southeast University, Nanjing",
Croatia,Croatia,Zagreb,,"Rudjer Boskovic Institute",
Denmark,Denmark,Aalborg,,", Aalborg",
"France (Toulouse)",France,Toulouse,,"CICT, Toulouse","David Allouche <>"
"France (Lyon)",France,Lyon,,"Dept. of Biometry & Evol. Biology, University of Lyon","Jean Thioulouse <>"
"France (Paris)",France,Paris,,"Boese Internet, Paris","Pelle Boese <>"
"Germany (Frankfurt)",Germany,Frankfurt,,xedio.mediastudios,"Carsten Zedler <>"
"Germany (Hamburg)",Germany,Hamburg,,"Pangora GmbH, Hamburg",
"Germany (Hannover)",Germany,Hannover,,"Maske & Glembotzky Opensource Mirroring GbR, Hannover",
"Germany (Koeln)",Germany,Koeln,,", Koeln","Simon Hardy-Francis <>"
"Germany (Mainz)",Germany,Mainz,,"University of Mainz",
"Germany (Muenchen)",Germany,Muenchen,,", Muenchen",
"Germany (Muenchen)",Germany,Muenchen,,", Muenchen","Carsten Zedler <>"
Hungary,Hungary,Budapest,,"Semmelweis University","Laszlo L Tornoci <>"
"Italy (Arezzo 1)",Italy,Arezzo,,"Ars Machinandi, Arezzo",
"Italy (Arezzo 2)",Italy,Arezzo,,"Ars Machinandi, Arezzo",
......@@ -28,9 +30,11 @@ Hungary,Hungary,Budapest,,"Semmelweis University","
"Italy (Palermo)",Italy,Palermo,,"Universita degli Studi di Palermo",","
Israel,Israel,Tel-Aviv,,"Activetech Ltd, Tel-Aviv","""Rami Addady"" <>"
"Japan (Aizu)",Japan,Aizu,,"University of Aizu",
"Japan (Tokyo)",Japan,Tokyo,,"University of Tokyo","Teru KAMOGASHIRA <>"
"Japan (Tsukuba)",Japan,Tsukuba,,"University of Tsukuba",
Korea,Korea,Seoul,,"Seoul National University","SungGON Yi <>"
Netherlands,Netherlands,Amsterdam,,"Nedmirror, Amsterdam",
Norway,Norway,Bergen,,"University of Bergen",
"Poland (Lublin)",Poland,Lublin,,"Skubiszewski Medical University, Lublin","Lukasz Komsta <>"
"Poland (Wroclaw)",Poland,Wroclaw,,"University of Wroclaw","Pawel Netzel <>"
Portugal,Portugal,Porto,,"Universidade do Porto",
......@@ -38,7 +42,7 @@ Portugal,Portugal,Porto,,"Universidade do Porto",ne
"Slovenia (Ljubljana)",Slovenia,Ljubljana,,", Ljubljana",
"South Africa (Cape Town)","South Africa","Cape Town",,"University of Cape Town",
"South Africa (Grahamstown)","South Africa",Grahamstown,,"Rhodes University","Jeremy Baxter <J.Baxter at>"
"Spain (Alicante)",Spain,Alicante,,"NumismaticProject, Alicante","Mundo Numismatico Monedas del Mundo <>"
"Spain (Alicante)",Spain,Alicante,,"NumismaticProject, Alicante","Mundo Numismatico Monedas del Mundo <>"
"Spain (Madrid)",Spain,Madrid,,"Spanish National Research Network, Madrid","Jose Manuel Macias <>"
"Switzerland (Zuerich)",Switzerland,Zuerich,,"ETH Zuerich",
"Switzerland (Bern 1)",Switzerland,Bern,,"Universitaet Bern","Thomas Schweizer <>"
......@@ -52,6 +56,7 @@ Turkey,Turkey,Istanbul,,"Istanbul Bilgi
"USA (CA 2)",USA,"Los Angeles",,"University of California, Los Angeles, CA","Jose Hales-Garcia <>"
"USA (CA 3)",USA,Davis,,"University of California, Davis, CA","Jeff Gill <>"
"USA (IA)",USA,Ames,,"Iowa State University, Ames, IA","Dave Edsall <>"
"USA (IL)",USA,Chicago,,"Stathy, Inc., Chicago, IL",
"USA (MI)",USA,Houghton,,"Michigan Technological University, Houghton, MI","Robert Froese <>"
"USA (MO)",USA,"St. Louis",,"Washington University, St. Louis, MO",
"USA (NC)",USA,"Chapel Hill",,"University of North Carolina, Chapel Hill, NC","""Nancy C. Wilson"" <>"
This diff is collapsed.
......@@ -89,17 +89,15 @@ distclean: clean
@for d in $(SUBDIRS); do \
(cd $${d} && $(MAKE) $@) || exit 1; \
@if test -f non-tarball ; then \
rm -f $(NON_SVN_INSTFILES) non-tarball ; \
@if test "$(BUILDDIR_IS_SRCDIR)" = no ; then \
-@rm -f Makefile R.1
maintainer-clean: distclean
@if test ! -f "$(srcdir)/FAQ" ; then \
touch non-tarball ; \
else \
@if test -f "$(srcdir)/FAQ" ; then \
if test "$(BUILDDIR_IS_SRCDIR)" = no ; then \
for f in $(NON_SVN_INSTFILES); do \
$(INSTALL_DATA) $(srcdir)/$${f} .; \
......@@ -6,9 +6,6 @@ which contains a number of control-flow constructions for iteration and
alternation. It allows users to add additional functionality by
defining new functions.
On platforms which support the \fBdlopen\fP(3) interface, Fortran and C
code can be linked and called at run time.
On systems which have the GNU \fBreadline\fP(3) library, R will maintain
a command history, so that commands can be recalled, edited and
......@@ -29,12 +26,19 @@ Start R and type \fB?\fP\fItopic\fP at the R prompt to obtain on-line
information for `\fItopic\fP'.
If the processed manuals have been installed they will be available as
DVI and/or PDF files in the directory `R RHOME`/doc/manual.
DVI and/or PDF files in the doc/manual subdirectory of the documentation
directory tree (default `R RHOME`).
If the \fBinfo\fP program and the R manuals are installed on your
system, typing \fBinfo -f R-intro\fP, \fBinfo -f R-data\fP,
\fBinfo -f R-exts\fP,\fBinfo
-f R-FAQ\fP and \fBinfo -f R-lang\fP should give you access to
``An Introduction to R'' (the basic manual), the ``R Data Import/Export''
Guide, the ``R Extension Writer's Guide'', the ``R FAQ''
and the ``The R Language Definition''.
system, typing
\fBinfo -f R-intro\fP,
\fBinfo -f R-data\fP,
\fBinfo -f R-exts\fP,
\fBinfo -f R-FAQ\fP,
\fBinfo -f R-lang\fP and