Commit 63553e6e authored by Dirk Eddelbuettel's avatar Dirk Eddelbuettel

Import Debian changes 2.8.1-1

r-base (2.8.1-1) unstable; urgency=low

  * New upstream version released today

r-base (2.8.1~20081219-1) unstable; urgency=low

  * Updated to Dec 19 release candidate of R 2.8.1 expected for Dec 22

  * r-doc-pdf expected to be empty due to the tex/texinfo bug below
  
  * debian/control: Change Build-Depends: on openjdk-6-jdk to 
    'openjdk-6-jdk [!arm !hppa]' as arm and hppa do not have one.

r-base (2.8.1~20081212) unstable; urgency=low

  * Initial beta release of R 2.8.1 expected for Dec 22
  * Fixes 'dev2bitmap fails with gsexe related error'	(Closes: #505698)

  * As #487974 is still open, the r-doc-pdf documentation package is again
    almost empty due to the tilde in the Debian revision number which breaks
    the texinfo-to-pdf conversions.  Users are advised to hold onto the
    2.8.0 version of the package until 2.8.1 comes out in ten days.
  
  * debian/control: Added 'openjdk-6-jdk' to Build-Depends:
  * debian/r-cran.mk:  Removed commented-out code that attempted to 
    configure Java at package build-time, we now do that at R builds 

  * debian/rules: Set softlinks for COPYING and COPYING.LIB to GPL-2 and 
    LGPL-2.1, respectively, to ensure the correct versions are linked. 
    Thanks to Deepayan Sarkar for the suggestion.
parents 0b003a03 60ed1b02
This diff is collapsed.
Revision: 46754
Last Changed Date: 2008-10-20
Revision: 47281
Last Changed Date: 2008-12-22
This diff is collapsed.
r-base (2.8.1-1) unstable; urgency=low
* New upstream version released today
-- Dirk Eddelbuettel <edd@debian.org> Mon, 22 Dec 2008 20:10:19 -0600
r-base (2.8.1~20081219-1) unstable; urgency=low
* Updated to Dec 19 release candidate of R 2.8.1 expected for Dec 22
* r-doc-pdf expected to be empty due to the tex/texinfo bug below
* debian/control: Change Build-Depends: on openjdk-6-jdk to
'openjdk-6-jdk [!arm !hppa]' as arm and hppa do not have one.
-- Dirk Eddelbuettel <edd@debian.org> Sat, 20 Dec 2008 09:26:38 -0600
r-base (2.8.1~20081212) unstable; urgency=low
* Initial beta release of R 2.8.1 expected for Dec 22
* Fixes 'dev2bitmap fails with gsexe related error' (Closes: #505698)
* As #487974 is still open, the r-doc-pdf documentation package is again
almost empty due to the tilde in the Debian revision number which breaks
the texinfo-to-pdf conversions. Users are advised to hold onto the
2.8.0 version of the package until 2.8.1 comes out in ten days.
* debian/control: Added 'openjdk-6-jdk' to Build-Depends:
* debian/r-cran.mk: Removed commented-out code that attempted to
configure Java at package build-time, we now do that at R builds
* debian/rules: Set softlinks for COPYING and COPYING.LIB to GPL-2 and
LGPL-2.1, respectively, to ensure the correct versions are linked.
Thanks to Deepayan Sarkar for the suggestion.
-- Dirk Eddelbuettel <edd@debian.org> Fri, 12 Dec 2008 11:36:22 -0600
r-base (2.8.0-1) unstable; urgency=low
* New upstream version released a few hours ago
......
......@@ -3,7 +3,7 @@ Section: math
Priority: optional
Maintainer: Dirk Eddelbuettel <edd@debian.org>
Standards-Version: 3.8.0
Build-Depends: gcc (>= 4:4.1.0), g++ (>= 4:4.1.0), gfortran (>= 4:4.1.0), libblas-dev, liblapack-dev (>= 3.1.1), tcl8.5-dev, tk8.5-dev, bison, groff-base, libncurses5-dev, libreadline5-dev, debhelper (>= 5.0.0), texi2html, texinfo (>= 4.1-2), libbz2-dev, libpcre3-dev, xpdf-reader, zlib1g-dev, libpng12-dev, libjpeg62-dev, libx11-dev, libxt-dev, x11proto-core-dev, libpango1.0-dev, libcairo2-dev, libtiff4-dev, xvfb, xauth, xfonts-base, texlive-base, texlive-latex-base, texlive-generic-recommended, texlive-fonts-recommended, texlive-extra-utils, texlive-latex-recommended, texlive-latex-extra, texinfo, texi2html
Build-Depends: gcc (>= 4:4.1.0), g++ (>= 4:4.1.0), gfortran (>= 4:4.1.0), libblas-dev, liblapack-dev (>= 3.1.1), tcl8.5-dev, tk8.5-dev, bison, groff-base, libncurses5-dev, libreadline5-dev, debhelper (>= 5.0.0), texi2html, texinfo (>= 4.1-2), libbz2-dev, libpcre3-dev, xpdf-reader, zlib1g-dev, libpng12-dev, libjpeg62-dev, libx11-dev, libxt-dev, x11proto-core-dev, libpango1.0-dev, libcairo2-dev, libtiff4-dev, xvfb, xauth, xfonts-base, texlive-base, texlive-latex-base, texlive-generic-recommended, texlive-fonts-recommended, texlive-extra-utils, texlive-latex-recommended, texlive-latex-extra, texinfo, texi2html, openjdk-6-jdk [!arm !hppa]
Homepage: http://www.r-project.org/
Package: r-base
......
......@@ -57,3 +57,4 @@ r-base-core: package-contains-empty-directory usr/lib/R/library/stats4/html/
r-base-core: package-contains-empty-directory usr/lib/R/library/grid/html/
r-base-core: package-contains-empty-directory usr/lib/R/library/tools/latex/
r-base-core: package-contains-empty-directory usr/lib/R/library/utils/html/
r-base-core: executable-not-elf-or-script ./usr/share/R/share/sh/help-print.sh
......@@ -60,10 +60,6 @@ R_any_arch:
## create the target directory
dh_installdirs $(debRdir)
##
## if we find /usr/bin/java, reconfigure R for Java
#if test -f /usr/bin/java; then \
# R CMD javareconf -e ''; \
#fi
## call R to install the sources we're looking at
## use this inside xvfb-run if this wrapper is installed
if test -f /usr/bin/xvfb-run; then \
......
usr/share/doc/r-base-core usr/share/doc/r-mathlib
......@@ -369,8 +369,8 @@ install-arch-stamp:
rm -v $(debtmp)/usr/share/R/doc/COPYING \
$(debtmp)/usr/share/R/doc/COPYING.LIB
(cd $(debtmp)/usr/share/R/doc; \
ln -s ../../../share/common-licenses/GPL COPYING; \
ln -s ../../../share/common-licenses/LGPL COPYING.LIB )
ln -s ../../../share/common-licenses/GPL-2 COPYING; \
ln -s ../../../share/common-licenses/LGPL-2.1 COPYING.LIB )
# edd 15 Jul 2002 reduce compile load on small machines
#ifneq "$(findstring $(arch), m68k arm)" ""
......@@ -572,7 +572,6 @@ binary-arch: build-arch check install-arch
dh_testdir -a
dh_testroot -a
#dh_installdebconf -a
#dh_link -a
# edd 04 Apr 2006 AUTHORS RESOURCES THANKS Y2K FAQ all gone
dh_installdocs -p$(corepackage) NEWS ONEWS OONEWS README \
debian/README.Atlas \
......@@ -616,6 +615,7 @@ binary-arch: build-arch check install-arch
dh_compress -a
dh_fixperms -a
#dh_suidregister -a
dh_link -a
dh_makeshlibs -a
dh_installdeb -a
dh_perl -a
......
......@@ -5,7 +5,10 @@ The bulk of this code is copyright by members of or all of the R
Development Core Team.
See the file COPYING for the exact conditions under which you may
redistribute it.
redistribute it. R as a whole is distributed under GPL version 2:
most source files contain a copyright statement allow use of that file
under GPL version 2 or later: the main exceptions are packages 'rpart'
and 'survival' (GPL-2 only) and bundle 'VR' (GPL-2 or GPL-3).
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
......@@ -162,7 +165,7 @@ src/library/stats/src/Trunmed.c
In part Copyright (C) 1995 Berwin A. Turlach
src/library/tcltk/exec/*.tcl
src/library/tcltk/exec/{hierarchy,util*,widget}.tcl
Copyright (c) various dates Jeffrey Hobbs
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
......@@ -6429,7 +6429,7 @@ command like
Users connected to the Internet can use the @code{install.packages()}
and @code{update.packages()} functions (available through the
@code{Packages} menu in the Windows and RAqua GUIs, @pxref{Installing
packages, , , R-admin, R Installation and Adminstration}) to install and
packages, , , R-admin, R Installation and Administration}) to install and
update packages.
To see which packages are currently loaded, use
......
......@@ -1195,7 +1195,7 @@ even if this was known (and e.g.@: @code{scan} would not know the
encoding of the file it was reading). This lead to packages with data
in French encoded in Latin-1 in @code{.rda} files which could not be
read in other locales (and they would be able to be displayed in a
French UTF-8 locale, if not in most Japanese locales).
French UTF-8 locale, if not in non-UTF-8 Japanese locales).
@R{} 2.5.0 introduced a limited means to indicate the encoding of a
@code{CHARSXP} via two of the `general purpose' bits which are used to
......@@ -1207,9 +1207,9 @@ display in hexadecimal bytes that are not valid in the current locale).
Many (but not all) of the character manipulation functions will either
preserve the declaration or re-encode the character string.
Eventually strings that refer to the OS such as file names will need to
be passed through a wide-character interface on some OSes
(e.g. Windows), which is to a large extent done as from @R{} 2.7.0.
Strings that refer to the OS such as file names need to be passed
through a wide-character interface on some OSes (e.g. Windows), which is
to a large extent done as from @R{} 2.7.0.
When are character strings declared to be of known encoding? One way is
to do so directly via @code{Encoding}. The parser declares the encoding
......@@ -1219,8 +1219,9 @@ the @R{} command line. (Other ways are recorded on the help page for
@code{Encoding}.)
It is not necessary to declare the encoding of ASCII strings as they
will work in any locale, but the overhead in doing so is small since
they will never be passed to @command{iconv} for translation.
will work in any locale. As from @R{} 2.8.0, ASCII strings should never
have a marked encoding, as any encoding will be ignored when entering
such strings into the @code{CHARSXP} cache.
The rationale behind considering only UTF-8 and Latin-1 is that most
systems are capable of producing UTF-8 strings and this is the nearest
......@@ -1249,13 +1250,13 @@ Windows has no UTF-8 locales, but rather expects to work with
UCS-2@footnote{or UTF-16 if support for surrogates is enabled in the OS,
which it is not normally at least for Western versions of Windows,
despite some claims to the contrary on the Microsoft site.} strings.
@R{} (being written in standard C) will not work internally with UCS-2
@R{} (being written in standard C) would not work internally with UCS-2
without extensive changes. As from @R{} 2.7.0 the @file{Rgui}
console@footnote{but not the GraphApp toolkit.} uses UCS-2 internally,
but communicates with the @R{} engine in the native encoding. To allow
UTF-8 strings to be printed in UTF-8, an escape convention is used (see
header @file{rgui_UTF8.h}) which is used by @code{cat}, @code{print} and
autoprinting.
UTF-8 strings to be printed in UTF-8 in @file{Rgui.exe}, an escape
convention is used (see header @file{rgui_UTF8.h}) which is used by
@code{cat}, @code{print} and autoprinting.
`Unicode' (UCS-2LE) files are common in the Windows world, and
@code{readLines} and @code{scan} will read them into UTF-8 strings on
......@@ -1282,9 +1283,18 @@ the cache. @code{CHARSXP}s reloaded from the @code{save} formats of
@R{} prior to 0.99.0 are not cached (since the code used is frozen and
few examples still exist). Prior to @R{} 2.8.0, @code{CHARSXP}s were
used to hold the finalizer function of a C finalizer (uncached) -- now
@code{RAWSXP}s are used. Finally, user code could create
@code{RAWSXP}s are used. Finally, user code could create uncached
@code{CHARSXP}s via @code{allocString} (removed in @R 2.8.0) and
@code{allocVector(CHARSXP ...)} (deprecated in @R 2.8.0).
@code{allocVector(CHARSXP ...)} (deprecated in @R 2.8.0, removed in @R{}
2.9.0).
@findex mkCharLenCE
The cache records the encoding of the string as well as the bytes: all
requests to create a @code{CHARSXP} should be @emph{via} a call to
@code{mkCharLenCE}. As from @R{} 2.8.0 any encoding given in
@code{mkCharLenCE} call will be ignored if the string's bytes are all
ASCII characters.
@node Warnings and errors, S4 objects, The CHARSXP cache, R Internal Structures
@section Warnings and errors
......
......@@ -1715,7 +1715,7 @@ named @code{"aa"} and @code{"aabb"} is the only name which has prefix
@code{exact} argument which defaults to @code{NA} indicating that
partial matching is allowed, but should result in a warning when it
occurs. Setting @code{exact} to @code{TRUE} prevents partial matching
from occuring, a @code{FALSE} value allows it and does not issue any
from occurring, a @code{FALSE} value allows it and does not issue any
warnings. Note that @code{[} always requires an exact match. The string
@code{""} is treated specially: it indicates `no name' and matches no
element (not even those without a name). Note that partial matching is
......
......@@ -11,9 +11,10 @@ R_PAPERSIZE=${R_PAPERSIZE-'@R_PAPERSIZE@'}
## Default print command
R_PRINTCMD=${R_PRINTCMD-'@R_PRINTCMD@'}
## Default TeXMF stuff
R_LATEXCMD=${R_LATEXCMD-${LATEX-'@LATEX@'}}
R_DVIPSCMD=${R_DVIPSCMD-${DVIPS-'@DVIPS@'}}
R_MAKEINDEXCMD=${R_MAKEINDEX-${MAKEINDEX-'@MAKEINDEX@'}}
R_LATEXCMD=${R_LATEXCMD-${LATEX-'latex'}}
R_PDFLATEXCMD=${R_PDFLATEXCMD-${PDFLATEX-'pdflatex'}}
R_DVIPSCMD=${R_DVIPSCMD-${DVIPS-'dvips'}}
R_MAKEINDEXCMD=${R_MAKEINDEXCMD-${MAKEINDEX-'makeindex'}}
R_RD4DVI=${R_RD4DVI-'@R_RD4DVI@'}
R_RD4PDF=${R_RD4PDF-'@R_RD4PDF@'}
## Default zip/unzip commands
......
......@@ -3049,7 +3049,7 @@ AC_DEFUN([R_BZLIB],
[if test "x${use_system_bzlib}" = xyes; then
AC_CHECK_LIB(bz2, BZ2_bzlibVersion, [have_bzlib=yes], [have_bzlib=no])
if test "${have_bzlib}" = yes; then
AC_CHECK_HEADER(bzlib.h, [have_bzlib=yes], [have_bzlib=no])
AC_CHECK_HEADERS(bzlib.h, [have_bzlib=yes], [have_bzlib=no])
fi
else
have_bzlib=no
......
......@@ -5,6 +5,8 @@
## size_max.m4 stdint_h.m4 uintmax_t.m4 ulonglong.m4 visibility.m4
## wchar_t.m4 wint_t.m4 xsize.m4 > .../m4/gettext.m4
## Then disable testing for libiconv prefix
# gettext.m4 serial 59 (gettext-0.16.1)
dnl Copyright (C) 1995-2006 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
......@@ -502,7 +504,7 @@ AC_DEFUN([AM_ICONV_LINKFLAGS_BODY],
dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV
dnl accordingly.
AC_LIB_LINKFLAGS_BODY([iconv])
dnl AC_LIB_LINKFLAGS_BODY([iconv])
])
AC_DEFUN([AM_ICONV_LINK],
......@@ -512,7 +514,7 @@ AC_DEFUN([AM_ICONV_LINK],
dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV
dnl accordingly.
AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY])
dnl AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY])
dnl Add $INCICONV to CPPFLAGS before performing the following checks,
dnl because if the user has installed libiconv and not disabled its use
......
......@@ -200,7 +200,7 @@ if test ${r_cv_java_works} = yes; then
done
if test -z "${jmdinc}"; then
# ultima-ratio: use find and pray that it works
jmdinc=`find "${jinc}/" -name jni_md.h 2>dev/null |head -n 1 2>/dev/null`
jmdinc=`find "${jinc}/" -name jni_md.h 2>/dev/null |head -n 1 2>/dev/null`
if test -n "${jmdinc}"; then jmdinc=`dirname "${jmdinc}"`; fi
fi
if test -n "${jmdinc}"; then
......
This diff is collapsed.
......@@ -25,6 +25,10 @@ use R::Dcf;
fileparse_set_fstype; # Unix, in case one gets anything else.
## switch on autoflushing for STDOUT. We want this as we
## write to both STDERR (warnings) and STDOUT.
$| = 1;
@knownoptions = ("rhome:s", "html", "txt", "latex", "example", "debug|d",
"dosnames", "chm", "index");
GetOptions (@knownoptions) || usage();
......
......@@ -23,7 +23,7 @@ use R::Rdlists;
use R::Utils;
use R::Dcf;
my $revision = ' $Rev: 42298 $ ';
my $revision = ' $Rev: 47126 $ ';
my $version;
my $name;
......@@ -31,6 +31,10 @@ $revision =~ / ([\d\.]*) /;
$version = $1;
($name = $0) =~ s|.*/||;
## switch on autoflushing for STDOUT. We want this as we
## write to both STDERR (warnings) and STDOUT.
$| = 1;
@knownoptions = ("rhome:s", "html", "txt", "latex", "example", "debug|d",
"dosnames", "help|h", "version|v", "os|OS:s",
"index");
......@@ -75,12 +79,6 @@ if(!$opt_html && !$opt_txt && !$opt_latex && !$opt_example){
}
($pkg, $version, $lib, @mandir) = buildinit();
## !!! Attempting to create the ability to have packages stored in a
## !!! location other than lib/pkg. There are obviously better ways
## !!! of doing this, but trying to do it in a manner which will not
## !!! interfere with other things calling this besides INSTALL. JG
$dest = $ARGV[2];
if (!$dest) {$dest = file_path($lib, $pkg);}
......
#! /bin/sh
## Usage is
## sh help-print.sh FILE TOPIC LATEX DVIPS
## see src/library/utils/R/unix/help.R.
......@@ -18,13 +16,24 @@ if test "${DVIPS}" = "false"; then
exit 2
fi
ODIR=`pwd`
status=0
cd `(dirname "${FILE}") 2>/dev/null || \
echo "${FILE}" | ${SED=sed} -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
${LATEX} "\\nonstopmode\\input{${FILE}}" >/dev/null 2>&1
${DVIPS} "${FILE}" 2>/dev/null
${LATEX} "\\nonstopmode\\input{${FILE}}" >/dev/null 2>&1 || status=1
if test $status -gt 0; then
echo "Error in running latex command ('${LATEX}')"
exit 1
fi
${DVIPS} "${FILE}" 2>/dev/null || status=1
if test $status -gt 0; then
echo "Error in running dvips command ('${DVIPS}')"
exit 1
fi
if test -f "${FILE}.ps"; then
echo "Saving help page to '${TOPIC}.ps'"
mv "${FILE}.ps" "${ODIR}/${TOPIC}.ps"
echo "Saving help page to '${TOPIC}.ps'"
mv "${FILE}.ps" "${ODIR}/${TOPIC}.ps"
else
echo "Help page sent to printer"
fi
rm -f "${FILE}.aux" "${FILE}.dvi" "${FILE}.log"
......
......@@ -61,6 +61,10 @@ static void Rintfn(double *x, int n, void *ex)
if(length(resultsxp) != n)
error("evaluation of function gave a result of wrong length");
if(TYPEOF(resultsxp) == INTSXP) {
resultsxp = coerceVector(resultsxp, REALSXP);
} else if(TYPEOF(resultsxp) != REALSXP)
error("evaluation of function gave a result of wrong type");
for(i = 0; i < n; i++) {
x[i] = REAL(resultsxp)[i];
if(!R_FINITE(x[i]))
......
......@@ -36,6 +36,8 @@
*/
#include "internal.h"
#include <richedit.h>
# define alloca(x) __builtin_alloca((x))
/*
......@@ -599,8 +601,20 @@ void setforeground(control obj, rgb fg)
if (! obj)
return;
obj->fg = fg;
InvalidateRect(obj->handle, NULL, TRUE);
redraw(obj);
if (obj->kind == TextboxObject) {
if (obj->handle) {
CHARFORMAT format;
COLORREF wincolour = RGB((fg&gaRed)>>16,(fg&gaGreen)>>8,(fg&gaBlue));
format.cbSize = sizeof(format);
format.dwMask = CFM_COLOR;
format.crTextColor = wincolour;
sendmessage(obj->handle, EM_SETCHARFORMAT, 0, (LPARAM)&format);
}
} else {
InvalidateRect(obj->handle, NULL, TRUE);
redraw(obj);
}
}
rgb getforeground(control obj)
......@@ -613,22 +627,22 @@ rgb getforeground(control obj)
void setbackground(control obj, rgb bg)
{
#if USE_NATIVE_CONTROLS
COLORREF wincolour;
wincolour = RGB((bg&gaRed)>>16,(bg&gaGreen)>>8,(bg&gaBlue));
COLORREF wincolour = RGB((bg&gaRed)>>16,(bg&gaGreen)>>8,(bg&gaBlue));
if (! obj)
return;
if (obj->bgbrush)
DeleteObject(obj->bgbrush);
obj->bgbrush = CreateSolidBrush(wincolour);
#endif
if (! obj)
return;
obj->bg = bg;
InvalidateRect(obj->handle, NULL, TRUE);
redraw(obj);
if (obj->kind == TextboxObject) {
if (obj->handle)
sendmessage(obj->handle, EM_SETBKGNDCOLOR, 0, wincolour);
} else {
if (obj->bgbrush)
DeleteObject(obj->bgbrush);
obj->bgbrush = CreateSolidBrush(wincolour);
InvalidateRect(obj->handle, NULL, TRUE);
redraw(obj);
}
}
rgb getbackground(control obj)
......
......@@ -183,7 +183,7 @@ void askchangedir()
askok(msg);
}
/* in every case reset cod (to new directory if all went ok
or to old since user may have edited it */
or to old since user may have edited it) */
GetCurrentDirectory(MAX_PATH, cod);
}
......@@ -196,7 +196,8 @@ char *askfilename(const char *title, const char *default_name)
char *askfilenamewithdir(const char *title, const char *default_name, const char *dir)
{
if (*askfilenames(title, default_name, 0, userfilter?userfilter:filter[0], 0,
if (*askfilenames(title, default_name, 0,
userfilter ? userfilter : filter[0], 0,
strbuf, BUFSIZE, dir)) return strbuf;
else return NULL;
}
......@@ -214,10 +215,7 @@ char *askfilenames(const char *title, const char *default_name, int multi,
if (!default_name) default_name = "";
strcpy(strbuf, default_name);
GetCurrentDirectory(MAX_PATH, cwd);
if (!strcmp(cod, "")) {
if (!dir) strcpy(cod, cwd);
else strcpy(cod, dir);
}
if (!cod[0]) strcpy(cod, cwd);
ofn.lStructSize = sizeof(OPENFILENAME);
ofn.hwndOwner = current_window ? current_window->handle : 0;
......@@ -230,7 +228,7 @@ char *askfilenames(const char *title, const char *default_name, int multi,
ofn.nMaxFile = bufsize;
ofn.lpstrFileTitle = NULL;
ofn.nMaxFileTitle = _MAX_FNAME + _MAX_EXT;
ofn.lpstrInitialDir = cod;
ofn.lpstrInitialDir = dir ? dir : cod;
ofn.lpstrTitle = title;
ofn.Flags = OFN_CREATEPROMPT | OFN_HIDEREADONLY | OFN_EXPLORER;
if (multi) ofn.Flags |= OFN_ALLOWMULTISELECT;
......@@ -242,12 +240,12 @@ char *askfilenames(const char *title, const char *default_name, int multi,
ofn.lpTemplateName = NULL;
if (GetOpenFileName(&ofn) == 0) {
GetCurrentDirectory(MAX_PATH, cod);
if(!dir) GetCurrentDirectory(MAX_PATH, cod);
SetCurrentDirectory(cwd);
strbuf[0] = 0;
strbuf[1] = 0;
} else {
GetCurrentDirectory(MAX_PATH, cod);
if(!dir) GetCurrentDirectory(MAX_PATH, cod);
SetCurrentDirectory(cwd);
for (i = 0; i < 10; i++) if (peekevent()) doevent();
}
......@@ -269,11 +267,12 @@ char *askfilesave(const char *title, const char *default_name)
return askfilesavewithdir(title, default_name, NULL);
}
char *askfilesavewithdir(const char *title, const char *default_name, const char *dir)
char *askfilesavewithdir(const char *title, const char *default_name,
const char *dir)
{
int i;
OPENFILENAME ofn;
char *p, cwd[MAX_PATH], *defext = NULL;
char cwd[MAX_PATH], *defext = NULL;
if (!default_name) default_name = "";
else if(default_name[0] == '|') {
......@@ -295,7 +294,7 @@ char *askfilesavewithdir(const char *title, const char *default_name, const char
ofn.nMaxFileTitle = _MAX_FNAME + _MAX_EXT;
if(dir && strlen(dir) > 0) {
strcpy(cwd, dir);
for(p = cwd; *p; p++) if(*p == '/') *p = '\\';
/* This should have been set to use backslashes in the caller */
ofn.lpstrInitialDir = cwd;
} else {
if (GetCurrentDirectory(MAX_PATH, cwd))
......
......@@ -20,6 +20,6 @@ time_t is signed, which it is on all sensible platforms.)
To remake it, use a machine with zic in the path (it may be /usr/sbin/zic).
Copy the current version of tzdataXXXXx.tar.gz to this directory and run
make -f Make.zi VERSION=2008g
make -f Make.zi VERSION=2008i
for the appropriate version.
......@@ -385,11 +385,11 @@ register const int doextend;
name = fullname;
}
if (doaccess && access(name, R_OK) != 0) {
Rf_warning("unknwon timezone '%s'", sname);
Rf_warning("unknown timezone '%s'", sname);
return -1;
}
if ((fid = open(name, OPEN_MODE)) == -1) {
Rf_warning("unknwon timezone '%s'", sname);
Rf_warning("unknown timezone '%s'", sname);
return -1;
}
......
This diff is collapsed.
......@@ -47,17 +47,9 @@ Based on files which are
http://www.ede.com/free/u2nt
src/gnuwin32/front-ends/SC_*.h, bdx*.[ch], com_util.[ch], rproxy*.[ch]
Copyright (C) 1999-2005 Thomas Baier
Distributed under the GNU Library General Public License
version 2 or later.
R_HOME/Tcl:
Files compiled and installed from Tcl 8.4.15 and Tk 8.4.15.
Files compiled and installed from Tcl 8.5.2 and Tk 8.5.2.
see R_HOME/Tcl/license.terms for the license.
This software is copyrighted by the Regents of the University of
......@@ -80,9 +72,9 @@ From trio-1.12 (http://daniel.haxx.se/projects/trio/)
CONTRIBUTORS ACCEPT NO RESPONSIBILITY IN ANY CONCEIVABLE MANNER.
src/gnuwin32/dos_glob.[ch]
src/gnuwin32/dos_wglob.[ch]
Modified from perl's ext/File/Glob/bsd_glob.[ch].
(Very much) modified from perl's ext/File/Glob/bsd_glob.[ch].
/*
* Copyright (c) 1989, 1993
......
......@@ -2,6 +2,7 @@
RLIB=../../../library
DPKG=$(RLIB)/$(PKG)
SPKG=.
PKGNAME=$(PKG)
LAZY=false
LAZYDATA=false
......@@ -375,7 +376,7 @@ lazyload:
if ! test -f $(DPKG)/R/$(PKG).rdb ; then \
$(ECHO) " preparing package $(PKG) for lazy loading" ; \
(if test -s $(SPKG0)/R_PROFILE.R; then cat $(SPKG0)/R_PROFILE.R; fi; \
$(ECHO) "options(warn=1); invisible(.libPaths(c(.Library,\"$(RLIB)\", .libPaths()))); .getRequiredPackages(\"$(SPKG0)/DESCRIPTION\",useImports=TRUE); Sys.setenv('R_CROSS_BUILD'='$(R_X_BUILD)'); tools:::makeLazyLoading(\"$(PKG)\", lib.loc=\"$(RLIB)\")") | \
$(ECHO) "options(warn=1); invisible(.libPaths(c(.Library,\"$(RLIB)\", .libPaths()))); .getRequiredPackages(\"$(SPKG0)/DESCRIPTION\",useImports=TRUE); Sys.setenv('R_CROSS_BUILD'='$(R_X_BUILD)'); tools:::makeLazyLoading(\"$(PKGNAME)\", lib.loc=\"$(RLIB)\")") | \
R_DEFAULT_PACKAGES=$(R_START_PACKAGES) \
LC_ALL=C R_OSTYPE=windows $(REXE) > /dev/null || exit 1; \
rm -f $(DPKG)/R/all.rda ; \
......@@ -389,7 +390,7 @@ lazydata:
@if test -d $(DPKG)/data; then \
if ! test -f $(DPKG)/data/Rdata.rdb ; then \
$(ECHO) " preparing package $(PKG) for lazy data loading" ; \
$(ECHO) "options(warn=1); invisible(.libPaths(c(.Library,\"$(RLIB)\", .libPaths()))); tools:::data2LazyLoadDB(\"$(PKG)\", lib.loc=\"$(RLIB)\")" | \
$(ECHO) "options(warn=1); invisible(.libPaths(c(.Library,\"$(RLIB)\", .libPaths()))); tools:::data2LazyLoadDB(\"$(PKGNAME)\", lib.loc=\"$(RLIB)\")" | \
R_CROSS_BUILD=$(R_X_BUILD) R_DEFAULT_PACKAGES=$(R_START_PACKAGES) \
LC_ALL=C R_OSTYPE=windows $(REXE) > /dev/null || exit 1; \
fi ; \
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
......@@ -645,6 +645,8 @@ static editor neweditor(void)
gsetcursor(c, ArrowCursor);
setforeground(c, consolefg);
setbackground(c, consolebg);
setbackground(t, consolebg);