Commit 83635d9a authored by Dirk Eddelbuettel's avatar Dirk Eddelbuettel

Import Upstream version 2.5.0

parent e5673aca

Too many changes to show.

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

......@@ -61,9 +61,13 @@ MAIN_LINK = $(MAIN_LD) $(MAIN_LDFLAGS) $(LDFLAGS)
MAKEINDEX = @MAKEINDEX@
MKINSTALLDIRS = $(SHELL) $(top_srcdir)/src/scripts/mkinstalldirs
PERL = @PERL@
OBJC = @OBJC@
OBJCFLAGS = @OBJCFLAGS@
R_ARCH = @R_ARCH@
R_FRAMEWORK_DIR = $(prefix)/R.framework
R_GZIPCMD = @R_GZIPCMD@
## needed for AIX only
@USE_EXPORTFILES_TRUE@ R_HOME ?= top_builddir
R_MODULES = @R_MODULES@
R_OSTYPE = @R_OSTYPE@
R_PKGS = $(R_PKGS_BASE) @USE_RECOMMENDED_PACKAGES_TRUE@ $(R_PKGS_RECOMMENDED)
......@@ -82,6 +86,7 @@ SHLIB_FFLAGS = @SHLIB_FFLAGS@
SHLIB_LD = @SHLIB_LD@
SHLIB_LDFLAGS = @SHLIB_LDFLAGS@
SHLIB_LINK = $(SHLIB_LD) $(SHLIB_LDFLAGS) $(LDFLAGS)
STRIP_LIBS = @striplib@
TAR = @TAR@
X_CFLAGS = @X_CFLAGS@
X_LIBS = @X_LIBS@
......@@ -96,14 +101,20 @@ ALL_CFLAGS_LO = $(R_XTRA_CFLAGS) $(CPICFLAGS) $(SHLIB_CFLAGS) $(CFLAGS)
ALL_FFLAGS_LO = $(R_XTRA_CFLAGS) $(FPICFLAGS) $(SHLIB_FFLAGS) $(FFLAGS)
.SUFFIXES:
.SUFFIXES: .c .f .d .o
.SUFFIXES: .c .f .m .d .o
@r_cc_rules_frag@
.f.o:
$(F77) $(ALL_FFLAGS) -c $< -o $@
## mainly for OS X to allow us to include Obj-C/Cocoa code if necessary
## the (long-term) goal is to integrate the Obj-C R API in the framework
.m.o:
$(OBJC) $(ALL_CPPFLAGS) $(OBJCFLAGS) -c $< -o $@
prefix = @prefix@
exec_prefix = @exec_prefix@
datarootdir = @datarootdir@
## only used for installing 'R'.
bindir = @bindir@
## not used
......
......@@ -30,7 +30,7 @@ Makeconf: $(srcdir)/Makeconf.in $(top_builddir)/config.status
ACLOCAL_M4 = aclocal.m4
ACINCLUDE_DEPENDENCIES = \
m4/R.m4 \
m4/clibs.m4 m4/c99.m4 \
m4/clibs.m4 \
m4/codeset.m4 \
m4/gettext.m4 m4/gettext-lib.m4 \
m4/java.m4 \
......@@ -72,9 +72,9 @@ stamp-recommended: R docs
@(cd src/library/Recommended && $(MAKE))
vignettes: stamp-recommended
-@(cd src/library && $(MAKE) $@)
@(cd src/library && $(MAKE) $@)
install: installdirs svnonly
install install-strip: installdirs svnonly
@for d in $(SUBDIRS); do \
(cd $${d} && $(MAKE) $@) || exit 1; \
done
......@@ -86,13 +86,12 @@ install: installdirs svnonly
done
@WANT_R_FRAMEWORK_TRUE@ $(MAKE) install-R-framework
@WANT_R_FRAMEWORK_TRUE@ @(sed 's|^LIBR =.*|LIBR = -F$(R_FRAMEWORK_DIR)/.. -framework R|' \
@WANT_R_FRAMEWORK_TRUE@ $(top_builddir)/etc/Makeconf > "$(rhome)/etc/Makeconf")
@WANT_R_FRAMEWORK_TRUE@ $(top_builddir)/etc/Makeconf > "$(rhome)/etc${R_ARCH}/Makeconf")
@WANT_R_FRAMEWORK_TRUE@ @(sed 's/Versions\/$(FW_VERSION)\/Resources/Resources/' \
@WANT_R_FRAMEWORK_TRUE@ $(R_FRAMEWORK_DIR)/Resources/bin/R > \
@WANT_R_FRAMEWORK_TRUE@ $(R_FRAMEWORK_DIR)/Resources/bin/RR)
@WANT_R_FRAMEWORK_TRUE@ @(mv $(R_FRAMEWORK_DIR)/Resources/bin/RR $(R_FRAMEWORK_DIR)/Resources/bin/R)
@WANT_R_FRAMEWORK_TRUE@ @(chmod 755 $(R_FRAMEWORK_DIR)/Resources/bin/R)
@WANT_R_FRAMEWORK_TRUE@ @(cp $(R_FRAMEWORK_DIR)/Resources/bin/R $(R_FRAMEWORK_DIR)/Resources/R)
@WANT_R_FRAMEWORK_TRUE@ @(chmod a+x $(R_FRAMEWORK_DIR)/Resources/bin/R)
@WANT_R_FRAMEWORK_TRUE@ @(chmod -R g+w $(R_FRAMEWORK_DIR))
svnonly:
......@@ -121,8 +120,6 @@ install-libR-exists:
installdirs:
@$(MKINSTALLDIRS) "$(rhome)"
install-strip:
$(MAKE) INSTALL_PROGRAM="${INSTALL_PROGRAM} -s" install
uninstall:
@(for d in $(SUBDIRS); do rsd="$${d} $${rsd}"; done; \
for d in $${rsd}; do (cd $${d} && $(MAKE) $@); done)
......@@ -230,11 +227,12 @@ 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)
@(for lib in Rlapack Rblas R; do \
@( otool=otool ; if otool -D "$(Rexeclibdir)/libR.dylib"|grep 'not an object'>/dev/null; then otool=otool64; fi; \
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'` \
`$${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 \
......@@ -246,6 +244,10 @@ install-R-framework:
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; \
for rexe in `ls "$(R_FRAMEWORK_DIR)/Versions/$(FW_VERSION)"/Resources/bin/exec/*/R "$(R_FRAMEWORK_DIR)/Versions/$(FW_VERSION)/Resources/bin/exec/R" 2>/dev/null`; do \
install_name_tool -change lib$${lib}.dylib \
"$(R_FRAMEWORK_DIR)/Versions/$(FW_VERSION)/Resources/lib/lib$${lib}.dylib" "$$rexe" ; \
done; \
fi; \
done)
@(cp -R $(srcdir)/src/include $(R_FRAMEWORK_DIR)/Versions/Current/PrivateHeaders && \
......@@ -255,15 +257,21 @@ install-R-framework:
"$(R_FRAMEWORK_DIR)/Versions/$(FW_VERSION)/Resources/lib/libR.dylib" \
$(Rexecbindir2)/R)
@(if [ -n "${R_ARCH}" ]; then \
if [ "${R_ARCH}" != /ppc -a "${R_ARCH}" != /i386 -a "${R_ARCH}" != /ppc64 ]; then \
sed -e "s|R_ARCH=${R_ARCH}|R_ARCH=/\`arch\`|" "$(R_FRAMEWORK_DIR)/Versions/$(FW_VERSION)/Resources/bin/R" \
> "$(R_FRAMEWORK_DIR)/Versions/$(FW_VERSION)/Resources/bin/.tmp.R" && \
chmod a+x "$(R_FRAMEWORK_DIR)/Versions/$(FW_VERSION)/Resources/bin/.tmp.R" && \
mv "$(R_FRAMEWORK_DIR)/Versions/$(FW_VERSION)/Resources/bin/.tmp.R" "$(R_FRAMEWORK_DIR)/Versions/$(FW_VERSION)/Resources/bin/R"; \
if [ "${R_ARCH}" != /ppc -a "${R_ARCH}" != /i386 -a "${R_ARCH}" != /ppc64 -a "${R_ARCH}" != /x86_64 ]; then \
echo "\
*** WARNING: The architecture name is incompatible with Apple's naming~ convention. This may prevent applications from using the R~ framework. Please use i386, ppc or ppc64 as architecture~ names to allow universal builds."|sed 'y/~/\n/' >&2; \
*** WARNING: The architecture name is incompatible with Apple's naming~ convention. This may prevent applications from using the R~ framework. Please use i386, x86_64, ppc or ppc64 as architecture~ names to allow universal builds."|sed 'y/~/\n/' >&2; \
else \
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"; \
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~#ifdef __x86_64__~#include <x86_64/$$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~#endif" |sed -e 'y/~/\n/' > "$(R_FRAMEWORK_DIR)/Versions/$(FW_VERSION)/Headers/$$f"; \
done; \
fi; \
fi )
@( rm -f "$(R_FRAMEWORK_DIR)/Versions/$(FW_VERSION)/Resources/R" && \
ln -s bin/R "$(R_FRAMEWORK_DIR)/Versions/$(FW_VERSION)/Resources/R" )
@( echo "<?xml version=\"1.0\" encoding=\"UTF-8\"?>~<!DOCTYPE plist PUBLIC \"-//Apple Computer//DTD PLIST 1.0//EN\" \"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">~<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)
TAGS:
This diff is collapsed.
Revision: 40228
Last Changed Date: 2006-12-18
Revision: 41293
Last Changed Date: 2007-04-23
This diff is collapsed.
This diff is collapsed.
......@@ -7,6 +7,10 @@ Development Core Team.
See the file COPYING for the exact conditions under which you may
redistribute it.
The status of files used only in the Windows port is in file
src/gnuwin32/COPYRIGHTS.win, which is appended to this file in binary
Wndows distributions.
---------------------------------------------------
The some of the public header files are distributed under the more
......@@ -202,7 +206,7 @@ src/main/vsnprintf.c
src/main/regex.c
Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
src/main/Rregex.h
Copyright (C) 1985,1989-93,1995-98,2000,2001,2002,2003
Free Software Foundation, Inc.
......
......@@ -9,8 +9,11 @@ Austria,Austria,Wien,http://cran.at.r-project.org/,"Wirtschaftsuniversitaet Wien
"Brazil (SP 2)",Brazil,"Sao Paulo",http://www.vps.fmvz.usp.br/CRAN/,"University of Sao Paulo, Sao Paulo","Fernando Ferreira <fernando@vps.fmvz.usp.br>"
"Canada (BC)",Canada,Burnaby,http://cran.stat.sfu.ca/,"Simon Fraser University, Burnaby","Brad McNeney <mcneney@sfu.ca>"
"Canada (ON)",Canada,Toronto,http://probability.ca/cran/,"University of Toronto","Jeffrey S. Rosenthal <jeff at math.toronto.edu>"
"Chile (Santiago)",Chile,Santiago,http://dirichlet.mat.puc.cl/,"Pontificia Universidad Catolica de Chile, Santiago","Fernando Quintana <quintana@mat.puc.cl>"
"Chile (Valdivia)",Chile,Valdivia,http://trapananda.homelinux.org/r-project/,"Universidad Austral de Chile","Jorge Cornejo <jorgecornejo@uach.cl>"
China,China,Nanjing,http://www.lmbe.seu.edu.cn/CRAN/,"Southeast University, Nanjing",xsun@seu.edu.cn
Croatia,Croatia,Zagreb,http://june.irb.hr/r/,"Rudjer Boskovic Institute",mislav.malenica@irb.hr
Czech Republic,Czech Republic,Brno,http://cran.biokontakt.cz/,Biokontakt Brno,Tomas.Kaplan@biokontakt.cz
Denmark,Denmark,Aalborg,http://cran.dk.r-project.org/,"dotsrc.org, Aalborg",mirror@dotsrc.org
"France (Toulouse)",France,Toulouse,http://cran.fr.r-project.org/,"CICT, Toulouse","David Allouche <allouche@tlse.toulouse.inra.fr>"
"France (Lyon)",France,Lyon,http://cran.univ-lyon1.fr/,"Dept. of Biometry & Evol. Biology, University of Lyon","Jean Thioulouse <jthioulouse@biomserv.univ-lyon1.fr>"
......@@ -18,9 +21,11 @@ Denmark,Denmark,Aalborg,http://cran.dk.r-project.org/,"dotsrc.org, Aalborg",mirr
"Germany (Frankfurt)",Germany,Frankfurt,http://cran.xedio.de/,xedio.mediastudios,"Carsten Zedler <c.zedler@xedio.de>"
"Germany (Hamburg)",Germany,Hamburg,http://pangora.org/cran/,"Pangora GmbH, Hamburg",mirror@pangora.org
"Germany (Hannover)",Germany,Hannover,http://cran.mirroring.de/,"Maske & Glembotzky Opensource Mirroring GbR, Hannover",admin@mirroring.de
"Germany (Karlsruhe)",Germany,Karlsruhe,http://cran.cybermirror.org/,"Cybermirror, Karlsruhe","cm@cybermirror.org"
"Germany (Koeln)",Germany,Koeln,http://cran.miscellaneousmirror.org/,"Miscellaneousdata.de, Koeln","Simon Hardy-Francis <simonhf@gmail.com>"
"Germany (Mainz)",Germany,Mainz,http://umfragen.sowi.uni-mainz.de/CRAN/,"University of Mainz",
"Germany (Muenchen)",Germany,Muenchen,http://cran.rakanu.com/,"Rakanu.com, Muenchen","Carsten Zedler <info@rakanu.com>"
"Germany (Nuernberg)",Germany,Nuernberg,http://cran.basemirror.de/,"Baseportal GmbH",mirrors@baseportal.de
Hungary,Hungary,Budapest,http://cran.hu.r-project.org/,"Semmelweis University","Laszlo L Tornoci <torlasz@xenia.sote.hu>"
"Italy (Arezzo 1)",Italy,Arezzo,http://cran.arsmachinandi.it/,"Ars Machinandi, Arezzo",cran.mirror@arsmachinandi.com
"Italy (Arezzo 2)",Italy,Arezzo,http://cran2.arsmachinandi.it/,"Ars Machinandi, Arezzo",cran.mirror@arsmachinandi.com
......@@ -33,7 +38,8 @@ Israel,Israel,Tel-Aviv,http://cran.active.co.il/,"Activetech Ltd, Tel-Aviv","""R
"Japan (Tokyo)",Japan,Tokyo,ftp://ftp.ecc.u-tokyo.ac.jp/CRAN/,"University of Tokyo","Teru KAMOGASHIRA <teru@sodan.ecc.u-tokyo.ac.jp>"
"Japan (Tsukuba)",Japan,Tsukuba,http://cran.md.tsukuba.ac.jp/,"University of Tsukuba",
Korea,Korea,Seoul,http://bibs.snu.ac.kr/R/,"Seoul National University","SungGON Yi <skonmeme@gmail.com>"
Netherlands,Netherlands,Amsterdam,http://cran.nedmirror.nl/,"Nedmirror, Amsterdam",mirror@nedmirror.nl
"Netherlands (Amsterdam 1)",Netherlands,Amsterdam,http://cran.nedmirror.nl/,"Nedmirror, Amsterdam",mirror@nedmirror.nl
"Netherlands (Amsterdam 2)",Netherlands,Amsterdam,http://cran.dsmirror.nl/,"Dsmirror, Amsterdam","Webmaster Dsmirror <webmaster@dsmirror.nl>"
Norway,Norway,Bergen,http://cran.ii.uib.no/,"University of Bergen",webmaster@ii.uib.no
"Poland (Lublin)",Poland,Lublin,http://novum.am.lublin.pl/CRAN/,"Skubiszewski Medical University, Lublin","Lukasz Komsta <luke@novum.am.lublin.pl>"
"Poland (Wroclaw)",Poland,Wroclaw,http://r.meteo.uni.wroc.pl/,"University of Wroclaw","Pawel Netzel <netzel@meteo.uni.wroc.pl>"
......@@ -44,7 +50,7 @@ Portugal,Portugal,Porto,http://cran.pt.r-project.org/,"Universidade do Porto",ne
"South Africa (Grahamstown)","South Africa",Grahamstown,http://cran.za.r-project.org/,"Rhodes University","Jeremy Baxter <J.Baxter at ru.ac.za>"
"Spain (Alicante)",Spain,Alicante,http://cran.noha.es/,"NumismaticProject, Alicante","Mundo Numismatico Monedas del Mundo <monedasdelmundo@gmail.com>"
"Spain (Madrid)",Spain,Madrid,http://cran.es.r-project.org/,"Spanish National Research Network, Madrid","Jose Manuel Macias <jmanuel.macias@rediris.es>"
Sweden,Sweden,Uppsala,http://ftp.sunet.se/pub/lang/CRAN/,"Swedish University Computer Network, Uppsala","Göran Broström <gb@stat.umu.se>"
Sweden,Sweden,Uppsala,http://ftp.sunet.se/pub/lang/CRAN/,"Swedish University Computer Network, Uppsala","Göran Broström <gb@stat.umu.se>"
"Switzerland (Zuerich)",Switzerland,Zuerich,http://cran.ch.r-project.org/,"ETH Zuerich",Martin.Maechler@R-project.org
"Switzerland (Bern 1)",Switzerland,Bern,http://www.imsv.unibe.ch/cran/,"Universitaet Bern","Thomas Schweizer <Thomas.Schweizer@stat.unibe.ch>"
"Switzerland (Bern 2)",Switzerland,Bern,http://cran.prokmu.com/,"Prokmu Hosting, Bern",info@prokmu.com
......
This diff is collapsed.
......@@ -13,7 +13,7 @@ include $(top_builddir)/Makeconf
distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
INSTFILES = AUTHORS COPYING COPYING.LIB COPYRIGHTS CRAN_mirrors.csv \
KEYWORDS KEYWORDS.db THANKS
DISTFILES = Makefile.in $(INSTFILES) R.aux
DISTFILES = Makefile.in $(INSTFILES) R.aux Rscript.1
NON_SVN_INSTFILES = FAQ RESOURCES
SUBDIRS = html manual
......@@ -46,9 +46,11 @@ install: install-message installdirs install-sources install-sources2 install-ma
installdirs:
@$(MKINSTALLDIRS) "$(rdocdir)"
@$(MKINSTALLDIRS) $(mandir)/man1
install-man: R.1
install-man: R.1 Rscript.1
@rm -f $(mandir)/man1/R.1
@$(INSTALL_DATA) R.1 $(mandir)/man1
@rm -f $(mandir)/man1/Rscript.1
@@$(INSTALL_DATA) ${srcdir}/Rscript.1 $(mandir)/man1
install-message:
@echo "installing $(subdir) ..."
install-sources:
......@@ -76,7 +78,7 @@ uninstall:
rmdir "$(rdocdir)" 2>/dev/null \
|| echo " subdir $(subdir) not removed"; \
fi
@rm -f $(mandir)/man1/R.1
@rm -f $(mandir)/man1/R.1 $(mandir)/man1/Rscript.1
dvi info pdf::
@(cd manual && $(MAKE) $@)
......
.TH Rscript "1" "April 2007" "R scripting" FSF
.SH NAME
Rscript \- front end for scripting with R
.SH SYNOPSIS
.B Rscript
[\fI--options\fR] [\fI-e expr\fR] \fIfile \fR[\fIargs\fR]
.SH DESCRIPTION
A binary front-end to R, for use in scripting applications.
.TP
\fBexpr\fR
An optional expression to be evaluated, used in place of \fBexpr\fR.
.TP
\fBfile\fR
Input file of R expressions
.TP
\fBargs\fR
Optional further arguments to be processed by \fIcommandArgs\fR
in the R interpreter.
.SH OPTIONS
\fB\-\-options\fR accepted are
.TP
\fB\-\-help\fR
Print usage and exit
.TP
\fB\-\-version\fR
Print version and exit
.TP
\fB\-\-verbose\fR
Print information on progress
.TP
\fB\-\-default\-packages\fR=\fIlist\fR
Where 'list' is a comma-separated set
of package names, or 'NULL'
.PP
and also options to R (in addition to \fB\-\-slave\fR \fB\-\-no\-restore\fR),
such as
.TP