[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pspp-cvs] pspp ChangeLog Makefile.am NEWS Smake acinclude... [simpler-p
|
From: |
Ben Pfaff |
|
Subject: |
[Pspp-cvs] pspp ChangeLog Makefile.am NEWS Smake acinclude... [simpler-proc] |
|
Date: |
Tue, 20 Mar 2007 00:08:51 +0000 |
CVSROOT: /cvsroot/pspp
Module name: pspp
Branch: simpler-proc
Changes by: Ben Pfaff <blp> 07/03/20 00:08:51
Modified files:
. : ChangeLog Makefile.am NEWS Smake acinclude.m4
configure.ac
doc : ChangeLog automake.mk
po : de.po pspp.pot
src/language : ChangeLog syntax-string-source.c
src/language/expressions: automake.mk
src/language/lexer: automake.mk
src/language/stats: ChangeLog crosstabs.q
src/libpspp : ChangeLog automake.mk i18n.c
src/ui/gui : ChangeLog automake.mk syntax-editor-source.c
var-sheet.c
src/ui/terminal: ChangeLog main.c
tests : ChangeLog automake.mk
tests/command : missing-values.sh
Log message:
Merge from main.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/pspp/ChangeLog?cvsroot=pspp&only_with_tag=simpler-proc&r1=1.71&r2=1.71.2.1
http://cvs.savannah.gnu.org/viewcvs/pspp/Makefile.am?cvsroot=pspp&only_with_tag=simpler-proc&r1=1.20&r2=1.20.2.1
http://cvs.savannah.gnu.org/viewcvs/pspp/NEWS?cvsroot=pspp&only_with_tag=simpler-proc&r1=1.16&r2=1.16.2.1
http://cvs.savannah.gnu.org/viewcvs/pspp/Smake?cvsroot=pspp&only_with_tag=simpler-proc&r1=1.49.2.1&r2=1.49.2.2
http://cvs.savannah.gnu.org/viewcvs/pspp/acinclude.m4?cvsroot=pspp&only_with_tag=simpler-proc&r1=1.10&r2=1.10.2.1
http://cvs.savannah.gnu.org/viewcvs/pspp/configure.ac?cvsroot=pspp&only_with_tag=simpler-proc&r1=1.54.2.1&r2=1.54.2.2
http://cvs.savannah.gnu.org/viewcvs/pspp/doc/ChangeLog?cvsroot=pspp&only_with_tag=simpler-proc&r1=1.43&r2=1.43.2.1
http://cvs.savannah.gnu.org/viewcvs/pspp/doc/automake.mk?cvsroot=pspp&only_with_tag=simpler-proc&r1=1.3&r2=1.3.2.1
http://cvs.savannah.gnu.org/viewcvs/pspp/po/de.po?cvsroot=pspp&only_with_tag=simpler-proc&r1=1.37&r2=1.37.2.1
http://cvs.savannah.gnu.org/viewcvs/pspp/po/pspp.pot?cvsroot=pspp&only_with_tag=simpler-proc&r1=1.121&r2=1.121.2.1
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/ChangeLog?cvsroot=pspp&only_with_tag=simpler-proc&r1=1.20&r2=1.20.2.1
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/syntax-string-source.c?cvsroot=pspp&only_with_tag=simpler-proc&r1=1.3&r2=1.3.2.1
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/expressions/automake.mk?cvsroot=pspp&only_with_tag=simpler-proc&r1=1.4&r2=1.4.2.1
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/lexer/automake.mk?cvsroot=pspp&only_with_tag=simpler-proc&r1=1.7&r2=1.7.2.1
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/stats/ChangeLog?cvsroot=pspp&only_with_tag=simpler-proc&r1=1.45.2.1&r2=1.45.2.2
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/stats/crosstabs.q?cvsroot=pspp&only_with_tag=simpler-proc&r1=1.27.2.1&r2=1.27.2.2
http://cvs.savannah.gnu.org/viewcvs/pspp/src/libpspp/ChangeLog?cvsroot=pspp&only_with_tag=simpler-proc&r1=1.55&r2=1.55.2.1
http://cvs.savannah.gnu.org/viewcvs/pspp/src/libpspp/automake.mk?cvsroot=pspp&only_with_tag=simpler-proc&r1=1.22&r2=1.22.2.1
http://cvs.savannah.gnu.org/viewcvs/pspp/src/libpspp/i18n.c?cvsroot=pspp&only_with_tag=simpler-proc&r1=1.5&r2=1.5.2.1
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/ChangeLog?cvsroot=pspp&only_with_tag=simpler-proc&r1=1.42&r2=1.42.2.1
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/automake.mk?cvsroot=pspp&only_with_tag=simpler-proc&r1=1.21.2.1&r2=1.21.2.2
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/syntax-editor-source.c?cvsroot=pspp&only_with_tag=simpler-proc&r1=1.6&r2=1.6.2.1
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/var-sheet.c?cvsroot=pspp&only_with_tag=simpler-proc&r1=1.20.2.1&r2=1.20.2.2
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/terminal/ChangeLog?cvsroot=pspp&only_with_tag=simpler-proc&r1=1.21&r2=1.21.2.1
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/terminal/main.c?cvsroot=pspp&only_with_tag=simpler-proc&r1=1.30.2.1&r2=1.30.2.2
http://cvs.savannah.gnu.org/viewcvs/pspp/tests/ChangeLog?cvsroot=pspp&only_with_tag=simpler-proc&r1=1.79&r2=1.79.2.1
http://cvs.savannah.gnu.org/viewcvs/pspp/tests/automake.mk?cvsroot=pspp&only_with_tag=simpler-proc&r1=1.27.2.1&r2=1.27.2.2
http://cvs.savannah.gnu.org/viewcvs/pspp/tests/command/missing-values.sh?cvsroot=pspp&only_with_tag=simpler-proc&r1=1.5&r2=1.5.2.1
Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/pspp/pspp/ChangeLog,v
retrieving revision 1.71
retrieving revision 1.71.2.1
diff -u -b -r1.71 -r1.71.2.1
--- ChangeLog 19 Feb 2007 18:57:04 -0000 1.71
+++ ChangeLog 20 Mar 2007 00:08:49 -0000 1.71.2.1
@@ -1,3 +1,39 @@
+2007-03-19 Ben Pfaff <address@hidden>
+
+ Work toward modernizing the build system by updating our Automake
+ and Autoconf dependencies and requiring libintl to be available
+ externally (if desired) instead of including a copy in the
+ distribution.
+
+ * Makefile.am (AUTOMAKE_OPTIONS): Require Automake 1.10 (or
+ later), which works better with systems that have a non-empty
+ $(EXEEXT).
+ (SUBDIRS): Drop intl.
+ (DISTCLEANFILES): Drop intl/plural.c.
+
+ * Throughout Makefile.am and the automake.mk files: Change
+ mkinstalldirs to $(MKDIR_P), to support the corresponding Automake
+ change.
+
+ * Smake (GNULIB_MODULES): Use gettext-h instead of gettext module.
+ (all): Don't create intl directory.
+ (gettextize): Don't use --intl flag.
+
+ * configure.ac: Require Autoconf 2.60 or later. Use external
+ gettext. Drop intl/Makefile from config files.
+
+2007-02-25 Ben Pfaff <address@hidden>
+
+ Thanks to Jason Stover for verifying that this patch helps under
+ NetBSD.
+
+ * acinclude.m4: Rename PSPP_ENABLE_WARNING to PSPP_ENABLE_OPTION,
+ because it's useful for more than warnings.
+
+ * configure.ac: Add PSPP_ENABLE_OPTION(-mieee) to improve IEEE
+ floating-point conformance on Alpha and SH architectures. Also,
+ check for fpsetmask function (available on BSDs).
+
Mon Feb 19 10:52:21 2007 Ben Pfaff <address@hidden>
* Smake (GNULIB_MODULES): Add dirname module, remove canonicalize
Index: Makefile.am
===================================================================
RCS file: /cvsroot/pspp/pspp/Makefile.am,v
retrieving revision 1.20
retrieving revision 1.20.2.1
diff -u -b -r1.20 -r1.20.2.1
--- Makefile.am 16 Feb 2007 19:24:25 -0000 1.20
+++ Makefile.am 20 Mar 2007 00:08:49 -0000 1.20.2.1
@@ -1,13 +1,12 @@
## Process this file with automake to produce Makefile.in -*- makefile -*-
-AUTOMAKE_OPTIONS = gnits 1.7 subdir-objects
+AUTOMAKE_OPTIONS = gnits 1.10 subdir-objects
-SUBDIRS = intl gl po
-DISTCLEANFILES = ./intl/plural.c ./po/stamp-po
+SUBDIRS = gl po
+DISTCLEANFILES = ./po/stamp-po
BUILT_SOURCES =
-AM_CPPFLAGS=-I$(top_srcdir)/intl -I$(top_builddir)/intl \
- -I$(top_srcdir)/gl -I$(top_builddir)/gl
+AM_CPPFLAGS = -I$(top_srcdir)/gl -I$(top_builddir)/gl
AM_CFLAGS=
@@ -19,7 +18,7 @@
CC_FOR_BUILD = @CC_FOR_BUILD@
EXEEXT_FOR_BUILD = @EXEEXT_FOR_BUILD@
.q.c:
- @$(top_srcdir)/mkinstalldirs `dirname address@hidden
+ @$(MKDIR_P) `dirname address@hidden
./src/language/lexer/q2c$(EXEEXT_FOR_BUILD) $< $@
$(all_q_sources:.q=.c): src/language/lexer/q2c$(EXEEXT_FOR_BUILD)
Index: NEWS
===================================================================
RCS file: /cvsroot/pspp/pspp/NEWS,v
retrieving revision 1.16
retrieving revision 1.16.2.1
diff -u -b -r1.16 -r1.16.2.1
--- NEWS 6 May 2006 20:27:23 -0000 1.16
+++ NEWS 20 Mar 2007 00:08:49 -0000 1.16.2.1
@@ -1,5 +1,5 @@
PSPP NEWS -- history of user-visible changes.
-Time-stamp: <2006-05-06 13:24:08 blp>
+Time-stamp: <2007-03-01 17:13:42 blp>
Copyright (C) 1996-9, 2000 Free Software Foundation, Inc.
See the end for copying conditions.
@@ -7,10 +7,19 @@
Changes since 0.4.2:
+ Changes in build dependencies:
+
+ * iconv, which is ordinarily installed as part of a Unix-like
+ system, is now required. If you don't have it already, you can
+ install GNU libiconv (http://www.gnu.org/software/libiconv/).
+
The PROCESS IF command, which was deprecated, has been removed. You
may replace any usage of it by SELECT IF following TEMPORARY, which
has the same effect.
+ For developers, the build system now requires Autoconf 2.60 and
+ Automake 1.10.
+
Changes since 0.4.0 to 0.4.1:
Added support for very long string variables > 255 bytes.
Index: Smake
===================================================================
RCS file: /cvsroot/pspp/pspp/Smake,v
retrieving revision 1.49.2.1
retrieving revision 1.49.2.2
diff -u -b -r1.49.2.1 -r1.49.2.2
--- Smake 19 Mar 2007 21:36:24 -0000 1.49.2.1
+++ Smake 20 Mar 2007 00:08:49 -0000 1.49.2.2
@@ -19,7 +19,7 @@
getline \
getlogin_r \
getopt \
- gettext \
+ gettext-h \
intprops \
inttostr \
linebreak \
@@ -32,6 +32,7 @@
memmove \
mempcpy \
memset \
+ minmax \
mkstemp \
progname \
snprintf \
@@ -69,8 +70,6 @@
--doc-base=gl/doc --import $(GNULIB_MODULES)
echo '*' > gl/.cvsignore
echo '*' > gl/m4/.cvsignore
- test -d intl || mkdir intl
- echo '*' > intl/.cvsignore
libtoolize --force --automake
autopoint --force
aclocal -I m4 -I gl/m4
@@ -81,7 +80,7 @@
gettextize:
test -d m4 || mkdir m4
touch m4/Makefile.am
- gettextize -f -c --intl --no-changelog
+ gettextize --force --no-changelog
po/POTFILES.in:
for f in `find src \( -name \*.[qc] -o -name \*.glade \) ! -name .\*
-print` ; do \
@@ -128,6 +127,7 @@
rm -f mdate-sh texinfo.tex
rm -f doc/stamp-vti
rm -f config.h.in~
+ rm -f config.h.in
find . -name Makefile.in -exec rm -f {} \;
rm -f compile
rm -f ltmain.sh
Index: acinclude.m4
===================================================================
RCS file: /cvsroot/pspp/pspp/acinclude.m4,v
retrieving revision 1.10
retrieving revision 1.10.2.1
diff -u -b -r1.10 -r1.10.2.1
--- acinclude.m4 16 Feb 2007 19:24:25 -0000 1.10
+++ acinclude.m4 20 Mar 2007 00:08:49 -0000 1.10.2.1
@@ -63,10 +63,10 @@
`--disable-largefile' or `CFLAGS=-ansi'.])])
])
-dnl Check whether a warning flag is accepted.
+dnl Check whether a C compiler option is accepted.
dnl If so, add it to CFLAGS.
-dnl Example: PSPP_ENABLE_WARNING(-Wdeclaration-after-statement)
-AC_DEFUN([PSPP_ENABLE_WARNING],
+dnl Example: PSPP_ENABLE_OPTION(-Wdeclaration-after-statement)
+AC_DEFUN([PSPP_ENABLE_OPTION],
[
m4_define([pspp_cv_name], [pspp_cv_[]m4_translit([$1], [-], [_])])dnl
AC_CACHE_CHECK([whether $CC accepts $1], [pspp_cv_name],
Index: configure.ac
===================================================================
RCS file: /cvsroot/pspp/pspp/configure.ac,v
retrieving revision 1.54.2.1
retrieving revision 1.54.2.2
diff -u -b -r1.54.2.1 -r1.54.2.2
--- configure.ac 19 Mar 2007 21:36:24 -0000 1.54.2.1
+++ configure.ac 20 Mar 2007 00:08:49 -0000 1.54.2.2
@@ -1,10 +1,10 @@
dnl Process this file with autoconf to produce a configure script.
dnl Initialize.
-AX_PREREQ(2.57)
+AX_PREREQ(2.60)
AC_INIT(pspp, 0.4.2,address@hidden)
AC_CONFIG_HEADERS([config.h])
-AM_INIT_AUTOMAKE(1.9)
+AM_INIT_AUTOMAKE
dnl Checks for programs.
AC_GNU_SOURCE
@@ -14,8 +14,9 @@
AC_LIBTOOL_DLOPEN
AC_PROG_LIBTOOL
-PSPP_ENABLE_WARNING(-Wdeclaration-after-statement)
-PSPP_ENABLE_WARNING(-Wno-missing-field-initializers)
+PSPP_ENABLE_OPTION(-Wdeclaration-after-statement)
+PSPP_ENABLE_OPTION(-Wno-missing-field-initializers)
+PSPP_ENABLE_OPTION(-mieee)
AM_CONDITIONAL(cc_is_gcc, test x"$GCC" = x"yes" )
@@ -23,8 +24,8 @@
PSPP_PERL
dnl Internationalization macros.
-AM_GNU_GETTEXT
-AM_GNU_GETTEXT_VERSION([0.14.5])
+AM_GNU_GETTEXT([external], [need-ngettext])
+AM_GNU_GETTEXT_VERSION([0.16.1])
dnl Checks for libraries.
AC_SYS_LARGEFILE
@@ -81,7 +82,7 @@
AC_C_BIGENDIAN
AC_FUNC_VPRINTF
-AC_CHECK_FUNCS([__setfpucw execl fork isinf isnan finite getpid feholdexcept
popen round trunc])
+AC_CHECK_FUNCS([__setfpucw execl fork isinf isnan finite getpid feholdexcept
fpsetmask popen round trunc])
AC_PROG_LN_S
@@ -100,7 +101,7 @@
PSPP_CHECK_PREREQS
-AC_CONFIG_FILES([Makefile gl/Makefile intl/Makefile po/Makefile.in])
+AC_CONFIG_FILES([Makefile gl/Makefile po/Makefile.in])
AC_OUTPUT
Index: doc/ChangeLog
===================================================================
RCS file: /cvsroot/pspp/pspp/doc/ChangeLog,v
retrieving revision 1.43
retrieving revision 1.43.2.1
diff -u -b -r1.43 -r1.43.2.1
--- doc/ChangeLog 20 Dec 2006 10:10:51 -0000 1.43
+++ doc/ChangeLog 20 Mar 2007 00:08:49 -0000 1.43.2.1
@@ -1,3 +1,14 @@
+2007-03-01 Ben Pfaff <address@hidden>
+
+ * automake.mk: Fix "make distcheck" by distributing doc/ni.texi,
+ even though it's generated. Reviewed by John Darrington.
+ (doc_pspp_TEXINFOS): Add doc/ni.texi.
+ (nodist_doc_pspp_TEXINFOS): Remove.
+ (am__TEXINFO_TEX_DIR) Removed (was just a kluge anyhow).
+ ($(INFO_DEPS)): Removed.
+ ($(HTML_DEPS)): Removed.
+ (CLEANFILES): Removed.
+
Wed Dec 20 18:45:31 WST 2006 John Darrington <address@hidden>
* statistics.texi: Added documentation for the NPAR TESTS command.
Index: doc/automake.mk
===================================================================
RCS file: /cvsroot/pspp/pspp/doc/automake.mk,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -b -r1.3 -r1.3.2.1
--- doc/automake.mk 15 Jul 2006 04:38:57 -0000 1.3
+++ doc/automake.mk 20 Mar 2007 00:08:49 -0000 1.3.2.1
@@ -19,6 +19,7 @@
doc/invoking.texi \
doc/language.texi \
doc/license.texi \
+ doc/ni.texi \
doc/not-implemented.texi \
doc/portable-file-format.texi \
doc/q2c.texi \
@@ -29,22 +30,10 @@
doc/variables.texi \
doc/fdl.texi
-nodist_doc_pspp_TEXINFOS = doc/ni.texi
-
-
EXTRA_DIST += doc/pspp.man \
doc/get-commands.pl \
$(doc_pspp_TEXINFOS)
-# Kludge to get around automake deficiency.
-am__TEXINFO_TEX_DIR=./doc
-
doc/ni.texi: $(top_srcdir)/src/language/command.def doc/get-commands.pl
- @$(top_srcdir)/mkinstalldirs doc
+ @$(MKDIR_P) doc
@PERL@ $(top_srcdir)/doc/get-commands.pl
$(top_srcdir)/src/language/command.def > $@
-
-
-$(INFO_DEPS): doc/ni.texi
-$(HTML_DEPS): doc/ni.texi
-
-CLEANFILES += doc/ni.texi
Index: po/de.po
===================================================================
RCS file: /cvsroot/pspp/pspp/po/de.po,v
retrieving revision 1.37
retrieving revision 1.37.2.1
diff -u -b -r1.37 -r1.37.2.1
--- po/de.po 22 Feb 2007 11:26:37 -0000 1.37
+++ po/de.po 20 Mar 2007 00:08:49 -0000 1.37.2.1
@@ -10,7 +10,7 @@
msgstr ""
"Project-Id-Version: PSPP 0.4.2\n"
"Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2007-02-22 12:10+0100\n"
+"POT-Creation-Date: 2007-03-19 13:38-0700\n"
"PO-Revision-Date: 2006-05-26 17:49+0800\n"
"Last-Translator: John Darrington <address@hidden>\n"
"Language-Team: German <address@hidden>\n"
@@ -1045,7 +1045,7 @@
msgstr ""
#: src/language/data-io/data-list.c:418 src/language/data-io/print.c:398
-#: src/ui/gui/var-sheet.c:76
+#: src/ui/gui/var-sheet.c:74
msgid "Columns"
msgstr "Spalten"
@@ -1367,6 +1367,20 @@
"Data fields must be listed in order of increasing record number."
msgstr ""
+#: src/language/data-io/print-space.c:75 src/language/lexer/lexer.c:465
+#: src/language/stats/autorecode.c:153 src/language/xforms/select-if.c:61
+msgid "expecting end of command"
+msgstr ""
+
+#: src/language/data-io/print-space.c:116
+msgid "The expression on PRINT SPACE evaluated to the system-missing value."
+msgstr ""
+
+#: src/language/data-io/print-space.c:119
+#, c-format
+msgid "The expression on PRINT SPACE evaluated to %g."
+msgstr ""
+
#: src/language/data-io/print.c:260
#, c-format
msgid "Output calls for %d records but %u specified on RECORDS subcommand."
@@ -1386,20 +1400,6 @@
msgstr[0] ""
msgstr[1] ""
-#: src/language/data-io/print-space.c:75 src/language/lexer/lexer.c:465
-#: src/language/stats/autorecode.c:153 src/language/xforms/select-if.c:61
-msgid "expecting end of command"
-msgstr ""
-
-#: src/language/data-io/print-space.c:116
-msgid "The expression on PRINT SPACE evaluated to the system-missing value."
-msgstr ""
-
-#: src/language/data-io/print-space.c:119
-#, c-format
-msgid "The expression on PRINT SPACE evaluated to %g."
-msgstr ""
-
#: src/language/dictionary/apply-dictionary.c:74
#, c-format
msgid "Variable %s is %s in target file, but %s in source file."
@@ -1584,7 +1584,7 @@
#: src/language/dictionary/split-file.c:87
#: src/language/dictionary/sys-file-info.c:402
-#: src/language/dictionary/sys-file-info.c:550 src/ui/gui/var-sheet.c:73
+#: src/language/dictionary/sys-file-info.c:550 src/ui/gui/var-sheet.c:71
msgid "Label"
msgstr "Kennsatz"
@@ -2285,7 +2285,7 @@
#: src/language/stats/crosstabs.q:1025 src/language/stats/crosstabs.q:1748
#: src/language/stats/examine.q:909 src/language/stats/frequencies.q:1222
#: src/language/stats/oneway.q:307 src/language/stats/oneway.q:471
-#: src/language/stats/regression.q:314
+#: src/language/stats/regression.q:324
msgid "Total"
msgstr ""
@@ -2331,7 +2331,7 @@
msgstr ""
#: src/language/stats/chisquare.c:223 src/language/stats/chisquare.c:263
-#: src/language/stats/regression.q:313
+#: src/language/stats/regression.q:323
msgid "Residual"
msgstr ""
@@ -2349,7 +2349,7 @@
#: src/language/stats/chisquare.c:325 src/language/stats/crosstabs.q:1119
#: src/language/stats/oneway.q:280 src/language/stats/oneway.q:681
-#: src/language/stats/regression.q:307 src/language/stats/t-test.q:981
+#: src/language/stats/regression.q:317 src/language/stats/t-test.q:981
#: src/language/stats/t-test.q:1173 src/language/stats/t-test.q:1266
msgid "df"
msgstr ""
@@ -2399,7 +2399,7 @@
#: src/language/stats/crosstabs.q:824 src/language/stats/examine.q:908
#: src/language/stats/frequencies.q:1213 src/language/stats/frequencies.q:1520
-#: src/ui/gui/var-sheet.c:75
+#: src/ui/gui/var-sheet.c:73
msgid "Missing"
msgstr "Löse"
@@ -2502,7 +2502,7 @@
msgid "Directional measures."
msgstr ""
-#: src/language/stats/crosstabs.q:1186 src/ui/gui/var-sheet.c:70
+#: src/language/stats/crosstabs.q:1186 src/ui/gui/var-sheet.c:68
msgid "Type"
msgstr "Typ"
@@ -2772,7 +2772,7 @@
msgstr ""
#: src/language/stats/examine.q:1421 src/language/stats/oneway.q:395
-#: src/language/stats/oneway.q:679 src/language/stats/regression.q:211
+#: src/language/stats/oneway.q:679 src/language/stats/regression.q:221
msgid "Std. Error"
msgstr ""
@@ -3018,6 +3018,22 @@
msgid "TABLES subcommand may not appear more than once."
msgstr ""
+#: src/language/stats/npar-summary.c:110
+msgid "Descriptive Statistics"
+msgstr ""
+
+#: src/language/stats/npar-summary.c:147
+msgid "25th"
+msgstr ""
+
+#: src/language/stats/npar-summary.c:150
+msgid "50th (Median)"
+msgstr ""
+
+#: src/language/stats/npar-summary.c:153
+msgid "75th"
+msgstr ""
+
#: src/language/stats/npar.q:101
msgid "NPAR subcommand not currently implemented."
msgstr ""
@@ -3042,22 +3058,6 @@
"match the number following (%d)."
msgstr ""
-#: src/language/stats/npar-summary.c:110
-msgid "Descriptive Statistics"
-msgstr ""
-
-#: src/language/stats/npar-summary.c:147
-msgid "25th"
-msgstr ""
-
-#: src/language/stats/npar-summary.c:150
-msgid "50th (Median)"
-msgstr ""
-
-#: src/language/stats/npar-summary.c:153
-msgid "75th"
-msgstr ""
-
#: src/language/stats/oneway.q:169
msgid "Number of contrast coefficients must equal the number of groups"
msgstr ""
@@ -3072,21 +3072,21 @@
msgid "`%s' is not a variable name"
msgstr ""
-#: src/language/stats/oneway.q:279 src/language/stats/regression.q:306
+#: src/language/stats/oneway.q:279 src/language/stats/regression.q:316
msgid "Sum of Squares"
msgstr ""
-#: src/language/stats/oneway.q:281 src/language/stats/regression.q:308
+#: src/language/stats/oneway.q:281 src/language/stats/regression.q:318
msgid "Mean Square"
msgstr ""
-#: src/language/stats/oneway.q:282 src/language/stats/regression.q:309
+#: src/language/stats/oneway.q:282 src/language/stats/regression.q:319
#: src/language/stats/t-test.q:978
msgid "F"
msgstr ""
#: src/language/stats/oneway.q:283 src/language/stats/oneway.q:537
-#: src/language/stats/regression.q:214 src/language/stats/regression.q:310
+#: src/language/stats/regression.q:224 src/language/stats/regression.q:320
msgid "Significance"
msgstr ""
@@ -3098,7 +3098,7 @@
msgid "Within Groups"
msgstr ""
-#: src/language/stats/oneway.q:353 src/language/stats/regression.q:336
+#: src/language/stats/oneway.q:353 src/language/stats/regression.q:346
msgid "ANOVA"
msgstr ""
@@ -3134,7 +3134,7 @@
msgid "Value of Contrast"
msgstr ""
-#: src/language/stats/oneway.q:680 src/language/stats/regression.q:213
+#: src/language/stats/oneway.q:680 src/language/stats/regression.q:223
#: src/language/stats/t-test.q:980 src/language/stats/t-test.q:1172
#: src/language/stats/t-test.q:1265
msgid "t"
@@ -3206,59 +3206,59 @@
msgid "Too many variables in INTO clause."
msgstr ""
-#: src/language/stats/regression.q:165
+#: src/language/stats/regression.q:175
msgid "R"
msgstr ""
-#: src/language/stats/regression.q:166
+#: src/language/stats/regression.q:176
msgid "R Square"
msgstr ""
-#: src/language/stats/regression.q:167
+#: src/language/stats/regression.q:177
msgid "Adjusted R Square"
msgstr ""
-#: src/language/stats/regression.q:168
+#: src/language/stats/regression.q:178
msgid "Std. Error of the Estimate"
msgstr ""
-#: src/language/stats/regression.q:173
+#: src/language/stats/regression.q:183
msgid "Model Summary"
msgstr ""
-#: src/language/stats/regression.q:210
+#: src/language/stats/regression.q:220
msgid "B"
msgstr ""
-#: src/language/stats/regression.q:212
+#: src/language/stats/regression.q:222
msgid "Beta"
msgstr ""
-#: src/language/stats/regression.q:215
+#: src/language/stats/regression.q:225
msgid "(Constant)"
msgstr ""
-#: src/language/stats/regression.q:275
+#: src/language/stats/regression.q:285
msgid "Coefficients"
msgstr ""
-#: src/language/stats/regression.q:312
+#: src/language/stats/regression.q:322
msgid "Regression"
msgstr ""
-#: src/language/stats/regression.q:391
+#: src/language/stats/regression.q:401
msgid "Model"
msgstr ""
-#: src/language/stats/regression.q:392
+#: src/language/stats/regression.q:402
msgid "Covariances"
msgstr ""
-#: src/language/stats/regression.q:407
+#: src/language/stats/regression.q:417
msgid "Coefficient Correlations"
msgstr ""
-#: src/language/stats/regression.q:1131
+#: src/language/stats/regression.q:1147
msgid "Dependent variable must be numeric."
msgstr ""
@@ -4601,6 +4601,18 @@
msgid "%d"
msgstr ""
+#: src/ui/gui/psppire-var-store.c:470
+msgid "None"
+msgstr "Keine"
+
+#: src/ui/gui/psppire-var-store.c:477
+msgid "Scientific"
+msgstr "Wissenschäflich"
+
+#: src/ui/gui/psppire-var-store.c:480
+msgid "Custom"
+msgstr "Spezial"
+
#: src/ui/gui/psppire.glade:9
#, fuzzy
msgid "This is pre-alpha software. Use at your own risk."
@@ -4651,18 +4663,6 @@
msgid "Variable(s):"
msgstr "Variableansicht"
-#: src/ui/gui/psppire-var-store.c:470
-msgid "None"
-msgstr "Keine"
-
-#: src/ui/gui/psppire-var-store.c:477
-msgid "Scientific"
-msgstr "Wissenschäflich"
-
-#: src/ui/gui/psppire-var-store.c:480
-msgid "Custom"
-msgstr "Spezial"
-
#: src/ui/gui/sort-cases-dialog.c:367
msgid "Criteria"
msgstr ""
@@ -4711,51 +4711,51 @@
msgid "To End"
msgstr ""
-#: src/ui/gui/var-sheet.c:69
+#: src/ui/gui/var-sheet.c:67
msgid "Name"
msgstr "Name"
-#: src/ui/gui/var-sheet.c:71
+#: src/ui/gui/var-sheet.c:69
msgid "Width"
msgstr "GroÃe"
-#: src/ui/gui/var-sheet.c:72
+#: src/ui/gui/var-sheet.c:70
msgid "Decimals"
msgstr "Dezimalstellen"
-#: src/ui/gui/var-sheet.c:74
+#: src/ui/gui/var-sheet.c:72
msgid "Values"
msgstr "Werten"
-#: src/ui/gui/var-sheet.c:77
+#: src/ui/gui/var-sheet.c:75
msgid "Align"
msgstr "Einstellung"
-#: src/ui/gui/var-sheet.c:78
+#: src/ui/gui/var-sheet.c:76
msgid "Measure"
msgstr "Messe"
-#: src/ui/gui/var-sheet.c:84
+#: src/ui/gui/var-sheet.c:82
msgid "Left"
msgstr "Links"
-#: src/ui/gui/var-sheet.c:85
+#: src/ui/gui/var-sheet.c:83
msgid "Right"
msgstr "Rechts"
-#: src/ui/gui/var-sheet.c:86
+#: src/ui/gui/var-sheet.c:84
msgid "Centre"
msgstr "Mittel"
-#: src/ui/gui/var-sheet.c:91
+#: src/ui/gui/var-sheet.c:89
msgid "Nominal"
msgstr "Nominalwert"
-#: src/ui/gui/var-sheet.c:92
+#: src/ui/gui/var-sheet.c:90
msgid "Ordinal"
msgstr "Ordinalwert"
-#: src/ui/gui/var-sheet.c:93
+#: src/ui/gui/var-sheet.c:91
msgid "Scale"
msgstr "Skalwert"
@@ -4832,7 +4832,7 @@
"Report bugs to <%s>.\n"
msgstr ""
-#: src/ui/terminal/main.c:128
+#: src/ui/terminal/main.c:132
msgid ""
"Stopping syntax file processing here to avoid a cascade of dependent command "
"failures."
Index: po/pspp.pot
===================================================================
RCS file: /cvsroot/pspp/pspp/po/pspp.pot,v
retrieving revision 1.121
retrieving revision 1.121.2.1
diff -u -b -r1.121 -r1.121.2.1
--- po/pspp.pot 22 Feb 2007 11:26:37 -0000 1.121
+++ po/pspp.pot 20 Mar 2007 00:08:49 -0000 1.121.2.1
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2007-02-22 12:10+0100\n"
+"POT-Creation-Date: 2007-03-19 13:38-0700\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <address@hidden>\n"
"Language-Team: LANGUAGE <address@hidden>\n"
@@ -1040,7 +1040,7 @@
msgstr ""
#: src/language/data-io/data-list.c:418 src/language/data-io/print.c:398
-#: src/ui/gui/var-sheet.c:76
+#: src/ui/gui/var-sheet.c:74
msgid "Columns"
msgstr ""
@@ -1362,6 +1362,20 @@
"Data fields must be listed in order of increasing record number."
msgstr ""
+#: src/language/data-io/print-space.c:75 src/language/lexer/lexer.c:465
+#: src/language/stats/autorecode.c:153 src/language/xforms/select-if.c:61
+msgid "expecting end of command"
+msgstr ""
+
+#: src/language/data-io/print-space.c:116
+msgid "The expression on PRINT SPACE evaluated to the system-missing value."
+msgstr ""
+
+#: src/language/data-io/print-space.c:119
+#, c-format
+msgid "The expression on PRINT SPACE evaluated to %g."
+msgstr ""
+
#: src/language/data-io/print.c:260
#, c-format
msgid "Output calls for %d records but %u specified on RECORDS subcommand."
@@ -1381,20 +1395,6 @@
msgstr[0] ""
msgstr[1] ""
-#: src/language/data-io/print-space.c:75 src/language/lexer/lexer.c:465
-#: src/language/stats/autorecode.c:153 src/language/xforms/select-if.c:61
-msgid "expecting end of command"
-msgstr ""
-
-#: src/language/data-io/print-space.c:116
-msgid "The expression on PRINT SPACE evaluated to the system-missing value."
-msgstr ""
-
-#: src/language/data-io/print-space.c:119
-#, c-format
-msgid "The expression on PRINT SPACE evaluated to %g."
-msgstr ""
-
#: src/language/dictionary/apply-dictionary.c:74
#, c-format
msgid "Variable %s is %s in target file, but %s in source file."
@@ -1579,7 +1579,7 @@
#: src/language/dictionary/split-file.c:87
#: src/language/dictionary/sys-file-info.c:402
-#: src/language/dictionary/sys-file-info.c:550 src/ui/gui/var-sheet.c:73
+#: src/language/dictionary/sys-file-info.c:550 src/ui/gui/var-sheet.c:71
msgid "Label"
msgstr ""
@@ -2280,7 +2280,7 @@
#: src/language/stats/crosstabs.q:1025 src/language/stats/crosstabs.q:1748
#: src/language/stats/examine.q:909 src/language/stats/frequencies.q:1222
#: src/language/stats/oneway.q:307 src/language/stats/oneway.q:471
-#: src/language/stats/regression.q:314
+#: src/language/stats/regression.q:324
msgid "Total"
msgstr ""
@@ -2326,7 +2326,7 @@
msgstr ""
#: src/language/stats/chisquare.c:223 src/language/stats/chisquare.c:263
-#: src/language/stats/regression.q:313
+#: src/language/stats/regression.q:323
msgid "Residual"
msgstr ""
@@ -2344,7 +2344,7 @@
#: src/language/stats/chisquare.c:325 src/language/stats/crosstabs.q:1119
#: src/language/stats/oneway.q:280 src/language/stats/oneway.q:681
-#: src/language/stats/regression.q:307 src/language/stats/t-test.q:981
+#: src/language/stats/regression.q:317 src/language/stats/t-test.q:981
#: src/language/stats/t-test.q:1173 src/language/stats/t-test.q:1266
msgid "df"
msgstr ""
@@ -2394,7 +2394,7 @@
#: src/language/stats/crosstabs.q:824 src/language/stats/examine.q:908
#: src/language/stats/frequencies.q:1213 src/language/stats/frequencies.q:1520
-#: src/ui/gui/var-sheet.c:75
+#: src/ui/gui/var-sheet.c:73
msgid "Missing"
msgstr ""
@@ -2497,7 +2497,7 @@
msgid "Directional measures."
msgstr ""
-#: src/language/stats/crosstabs.q:1186 src/ui/gui/var-sheet.c:70
+#: src/language/stats/crosstabs.q:1186 src/ui/gui/var-sheet.c:68
msgid "Type"
msgstr ""
@@ -2767,7 +2767,7 @@
msgstr ""
#: src/language/stats/examine.q:1421 src/language/stats/oneway.q:395
-#: src/language/stats/oneway.q:679 src/language/stats/regression.q:211
+#: src/language/stats/oneway.q:679 src/language/stats/regression.q:221
msgid "Std. Error"
msgstr ""
@@ -3012,6 +3012,22 @@
msgid "TABLES subcommand may not appear more than once."
msgstr ""
+#: src/language/stats/npar-summary.c:110
+msgid "Descriptive Statistics"
+msgstr ""
+
+#: src/language/stats/npar-summary.c:147
+msgid "25th"
+msgstr ""
+
+#: src/language/stats/npar-summary.c:150
+msgid "50th (Median)"
+msgstr ""
+
+#: src/language/stats/npar-summary.c:153
+msgid "75th"
+msgstr ""
+
#: src/language/stats/npar.q:101
msgid "NPAR subcommand not currently implemented."
msgstr ""
@@ -3036,22 +3052,6 @@
"match the number following (%d)."
msgstr ""
-#: src/language/stats/npar-summary.c:110
-msgid "Descriptive Statistics"
-msgstr ""
-
-#: src/language/stats/npar-summary.c:147
-msgid "25th"
-msgstr ""
-
-#: src/language/stats/npar-summary.c:150
-msgid "50th (Median)"
-msgstr ""
-
-#: src/language/stats/npar-summary.c:153
-msgid "75th"
-msgstr ""
-
#: src/language/stats/oneway.q:169
msgid "Number of contrast coefficients must equal the number of groups"
msgstr ""
@@ -3066,21 +3066,21 @@
msgid "`%s' is not a variable name"
msgstr ""
-#: src/language/stats/oneway.q:279 src/language/stats/regression.q:306
+#: src/language/stats/oneway.q:279 src/language/stats/regression.q:316
msgid "Sum of Squares"
msgstr ""
-#: src/language/stats/oneway.q:281 src/language/stats/regression.q:308
+#: src/language/stats/oneway.q:281 src/language/stats/regression.q:318
msgid "Mean Square"
msgstr ""
-#: src/language/stats/oneway.q:282 src/language/stats/regression.q:309
+#: src/language/stats/oneway.q:282 src/language/stats/regression.q:319
#: src/language/stats/t-test.q:978
msgid "F"
msgstr ""
#: src/language/stats/oneway.q:283 src/language/stats/oneway.q:537
-#: src/language/stats/regression.q:214 src/language/stats/regression.q:310
+#: src/language/stats/regression.q:224 src/language/stats/regression.q:320
msgid "Significance"
msgstr ""
@@ -3092,7 +3092,7 @@
msgid "Within Groups"
msgstr ""
-#: src/language/stats/oneway.q:353 src/language/stats/regression.q:336
+#: src/language/stats/oneway.q:353 src/language/stats/regression.q:346
msgid "ANOVA"
msgstr ""
@@ -3128,7 +3128,7 @@
msgid "Value of Contrast"
msgstr ""
-#: src/language/stats/oneway.q:680 src/language/stats/regression.q:213
+#: src/language/stats/oneway.q:680 src/language/stats/regression.q:223
#: src/language/stats/t-test.q:980 src/language/stats/t-test.q:1172
#: src/language/stats/t-test.q:1265
msgid "t"
@@ -3200,59 +3200,59 @@
msgid "Too many variables in INTO clause."
msgstr ""
-#: src/language/stats/regression.q:165
+#: src/language/stats/regression.q:175
msgid "R"
msgstr ""
-#: src/language/stats/regression.q:166
+#: src/language/stats/regression.q:176
msgid "R Square"
msgstr ""
-#: src/language/stats/regression.q:167
+#: src/language/stats/regression.q:177
msgid "Adjusted R Square"
msgstr ""
-#: src/language/stats/regression.q:168
+#: src/language/stats/regression.q:178
msgid "Std. Error of the Estimate"
msgstr ""
-#: src/language/stats/regression.q:173
+#: src/language/stats/regression.q:183
msgid "Model Summary"
msgstr ""
-#: src/language/stats/regression.q:210
+#: src/language/stats/regression.q:220
msgid "B"
msgstr ""
-#: src/language/stats/regression.q:212
+#: src/language/stats/regression.q:222
msgid "Beta"
msgstr ""
-#: src/language/stats/regression.q:215
+#: src/language/stats/regression.q:225
msgid "(Constant)"
msgstr ""
-#: src/language/stats/regression.q:275
+#: src/language/stats/regression.q:285
msgid "Coefficients"
msgstr ""
-#: src/language/stats/regression.q:312
+#: src/language/stats/regression.q:322
msgid "Regression"
msgstr ""
-#: src/language/stats/regression.q:391
+#: src/language/stats/regression.q:401
msgid "Model"
msgstr ""
-#: src/language/stats/regression.q:392
+#: src/language/stats/regression.q:402
msgid "Covariances"
msgstr ""
-#: src/language/stats/regression.q:407
+#: src/language/stats/regression.q:417
msgid "Coefficient Correlations"
msgstr ""
-#: src/language/stats/regression.q:1131
+#: src/language/stats/regression.q:1147
msgid "Dependent variable must be numeric."
msgstr ""
@@ -4578,6 +4578,18 @@
msgid "%d"
msgstr ""
+#: src/ui/gui/psppire-var-store.c:470
+msgid "None"
+msgstr ""
+
+#: src/ui/gui/psppire-var-store.c:477
+msgid "Scientific"
+msgstr ""
+
+#: src/ui/gui/psppire-var-store.c:480
+msgid "Custom"
+msgstr ""
+
#: src/ui/gui/psppire.glade:9
msgid "This is pre-alpha software. Use at your own risk."
msgstr ""
@@ -4624,18 +4636,6 @@
msgid "Variable(s):"
msgstr ""
-#: src/ui/gui/psppire-var-store.c:470
-msgid "None"
-msgstr ""
-
-#: src/ui/gui/psppire-var-store.c:477
-msgid "Scientific"
-msgstr ""
-
-#: src/ui/gui/psppire-var-store.c:480
-msgid "Custom"
-msgstr ""
-
#: src/ui/gui/sort-cases-dialog.c:367
msgid "Criteria"
msgstr ""
@@ -4681,51 +4681,51 @@
msgid "To End"
msgstr ""
-#: src/ui/gui/var-sheet.c:69
+#: src/ui/gui/var-sheet.c:67
msgid "Name"
msgstr ""
-#: src/ui/gui/var-sheet.c:71
+#: src/ui/gui/var-sheet.c:69
msgid "Width"
msgstr ""
-#: src/ui/gui/var-sheet.c:72
+#: src/ui/gui/var-sheet.c:70
msgid "Decimals"
msgstr ""
-#: src/ui/gui/var-sheet.c:74
+#: src/ui/gui/var-sheet.c:72
msgid "Values"
msgstr ""
-#: src/ui/gui/var-sheet.c:77
+#: src/ui/gui/var-sheet.c:75
msgid "Align"
msgstr ""
-#: src/ui/gui/var-sheet.c:78
+#: src/ui/gui/var-sheet.c:76
msgid "Measure"
msgstr ""
-#: src/ui/gui/var-sheet.c:84
+#: src/ui/gui/var-sheet.c:82
msgid "Left"
msgstr ""
-#: src/ui/gui/var-sheet.c:85
+#: src/ui/gui/var-sheet.c:83
msgid "Right"
msgstr ""
-#: src/ui/gui/var-sheet.c:86
+#: src/ui/gui/var-sheet.c:84
msgid "Centre"
msgstr ""
-#: src/ui/gui/var-sheet.c:91
+#: src/ui/gui/var-sheet.c:89
msgid "Nominal"
msgstr ""
-#: src/ui/gui/var-sheet.c:92
+#: src/ui/gui/var-sheet.c:90
msgid "Ordinal"
msgstr ""
-#: src/ui/gui/var-sheet.c:93
+#: src/ui/gui/var-sheet.c:91
msgid "Scale"
msgstr ""
@@ -4802,7 +4802,7 @@
"Report bugs to <%s>.\n"
msgstr ""
-#: src/ui/terminal/main.c:128
+#: src/ui/terminal/main.c:132
msgid ""
"Stopping syntax file processing here to avoid a cascade of dependent command "
"failures."
Index: src/language/ChangeLog
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/ChangeLog,v
retrieving revision 1.20
retrieving revision 1.20.2.1
diff -u -b -r1.20 -r1.20.2.1
--- src/language/ChangeLog 12 Feb 2007 02:10:54 -0000 1.20
+++ src/language/ChangeLog 20 Mar 2007 00:08:50 -0000 1.20.2.1
@@ -1,3 +1,8 @@
+2007-03-18 Ben Pfaff <address@hidden>
+
+ * syntax-string-source.c (close): Rename to do_close to avoid
+ conflict with POSIX function of the same name.
+
Thu Feb 8 15:04:42 2007 Ben Pfaff <address@hidden>
Reduce platform dependence.
Index: src/language/syntax-string-source.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/syntax-string-source.c,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -b -r1.3 -r1.3.2.1
--- src/language/syntax-string-source.c 9 Feb 2007 15:06:28 -0000 1.3
+++ src/language/syntax-string-source.c 20 Mar 2007 00:08:50 -0000 1.3.2.1
@@ -60,7 +60,7 @@
static void
-close (struct getl_interface *i )
+do_close (struct getl_interface *i )
{
struct syntax_string_source *sss = (struct syntax_string_source *) i;
@@ -116,7 +116,7 @@
va_end (args);
sss->parent.interactive = always_false;
- sss->parent.close = close;
+ sss->parent.close = do_close;
sss->parent.read = read_single_line;
sss->parent.name = name;
Index: src/language/expressions/automake.mk
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/expressions/automake.mk,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -b -r1.4 -r1.4.2.1
--- src/language/expressions/automake.mk 14 Dec 2006 10:45:19 -0000
1.4
+++ src/language/expressions/automake.mk 20 Mar 2007 00:08:50 -0000
1.4.2.1
@@ -29,7 +29,7 @@
SUFFIXES = .h.pl .inc.pl
-generate_from_pl = $(top_srcdir)/mkinstalldirs `dirname address@hidden && \
+generate_from_pl = $(MKDIR_P) `dirname address@hidden && \
$(PERL) -I $(top_srcdir)/src/language/expressions $< -o $@ -i
$(top_srcdir)/src/language/expressions/operations.def
.h.pl.h:
Index: src/language/lexer/automake.mk
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/lexer/automake.mk,v
retrieving revision 1.7
retrieving revision 1.7.2.1
diff -u -b -r1.7 -r1.7.2.1
--- src/language/lexer/automake.mk 16 Feb 2007 19:24:25 -0000 1.7
+++ src/language/lexer/automake.mk 20 Mar 2007 00:08:50 -0000 1.7.2.1
@@ -16,7 +16,7 @@
src/language/lexer/q2c$(EXEEXT_FOR_BUILD):
$(top_srcdir)/src/language/lexer/q2c.c
- @$(top_srcdir)/mkinstalldirs `dirname address@hidden
+ @$(MKDIR_P) `dirname address@hidden
$(CC_FOR_BUILD) $(top_srcdir)/src/language/lexer/q2c.c -o
$(top_builddir)/src/language/lexer/q2c
Index: src/language/stats/ChangeLog
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/stats/ChangeLog,v
retrieving revision 1.45.2.1
retrieving revision 1.45.2.2
diff -u -b -r1.45.2.1 -r1.45.2.2
--- src/language/stats/ChangeLog 19 Mar 2007 21:36:24 -0000 1.45.2.1
+++ src/language/stats/ChangeLog 20 Mar 2007 00:08:50 -0000 1.45.2.2
@@ -1,4 +1,4 @@
-Fri Dec 22 14:04:09 2006 Ben Pfaff <address@hidden>
+2007-03-19 Ben Pfaff <address@hidden>
Simplify missing value handling.
@@ -15,6 +15,15 @@
* rank.q: Ditto.
+2007-03-18 Ben Pfaff <address@hidden>
+
+ * crosstabs.q (static var write): Rename write_style to avoid
+ conflict with POSIX function of same name.
+
+2007-03-16 Jason Stover <address@hidden>
+
+ * regression.q (run_regression): Added support for moments.
+
Sat Feb 17 08:16:00 2007 Ben Pfaff <address@hidden>
* flip.c (flip_sink_create): Improve error message when temporary
Index: src/language/stats/crosstabs.q
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/stats/crosstabs.q,v
retrieving revision 1.27.2.1
retrieving revision 1.27.2.2
diff -u -b -r1.27.2.1 -r1.27.2.2
--- src/language/stats/crosstabs.q 19 Mar 2007 21:36:24 -0000 1.27.2.1
+++ src/language/stats/crosstabs.q 20 Mar 2007 00:08:50 -0000 1.27.2.2
@@ -169,7 +169,7 @@
static int cells[8]; /* Cells requested. */
/* WRITE. */
-static int write; /* One of WR_* that specifies the WRITE style.
*/
+static int write_style; /* One of WR_* that specifies the WRITE
style. */
/* Command parsing info. */
static struct cmd_crosstabs cmd;
@@ -291,11 +291,11 @@
+ cmd.a_write[CRS_WR_CELLS] == 0))
cmd.a_write[CRS_WR_CELLS] = 1;
if (cmd.a_write[CRS_WR_CELLS])
- write = CRS_WR_CELLS;
+ write_style = CRS_WR_CELLS;
else if (cmd.a_write[CRS_WR_ALL])
- write = CRS_WR_ALL;
+ write_style = CRS_WR_ALL;
else
- write = CRS_WR_NONE;
+ write_style = CRS_WR_NONE;
input = casereader_create_filter_weight (proc_open (ds), dataset_dict (ds),
NULL, NULL);
Index: src/libpspp/ChangeLog
===================================================================
RCS file: /cvsroot/pspp/pspp/src/libpspp/ChangeLog,v
retrieving revision 1.55
retrieving revision 1.55.2.1
diff -u -b -r1.55 -r1.55.2.1
--- src/libpspp/ChangeLog 22 Feb 2007 23:34:44 -0000 1.55
+++ src/libpspp/ChangeLog 20 Mar 2007 00:08:50 -0000 1.55.2.1
@@ -1,3 +1,7 @@
+Mon Mar 5 20:55:49 CET 2007 John Darrington <address@hidden>
+
+ * i18n.c: Cast second argument of iconv using ICONV_CONST
+
2007-02-22 Ben Pfaff <address@hidden>
* string.h: Don't include vsnprintf.h any more, because gnulib has
Index: src/libpspp/automake.mk
===================================================================
RCS file: /cvsroot/pspp/pspp/src/libpspp/automake.mk,v
retrieving revision 1.22
retrieving revision 1.22.2.1
diff -u -b -r1.22 -r1.22.2.1
--- src/libpspp/automake.mk 22 Feb 2007 11:26:37 -0000 1.22
+++ src/libpspp/automake.mk 20 Mar 2007 00:08:50 -0000 1.22.2.1
@@ -63,7 +63,7 @@
nodist_src_libpspp_libpspp_a_SOURCES = src/libpspp/version.c
src/libpspp/version.c: $(top_srcdir)/AUTHORS
- @$(top_srcdir)/mkinstalldirs src/libpspp
+ @$(MKDIR_P) src/libpspp
echo "/* -*- mode: c; buffer-read-only: t -*-" > $@
echo " Generated by src/libpspp/automake.mk --- Do not edit. */">> $@
echo "#include \"version.h\"" >> $@
Index: src/libpspp/i18n.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/libpspp/i18n.c,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -u -b -r1.5 -r1.5.2.1
--- src/libpspp/i18n.c 21 Feb 2007 08:27:16 -0000 1.5
+++ src/libpspp/i18n.c 20 Mar 2007 00:08:50 -0000 1.5.2.1
@@ -62,7 +62,7 @@
The returned string must be freed when no longer required.
*/
char *
-recode_string(enum conv_id how, const char *text, int length)
+recode_string (enum conv_id how, const char *text, int length)
{
char *outbuf = 0;
size_t outbufferlength;
@@ -80,7 +80,7 @@
if ( length == -1 )
length = strlen(text);
- assert(how < n_CONV);
+ assert (how < n_CONV);
if (convertor[how] == (iconv_t) -1)
return xstrndup (text, length);
@@ -96,14 +96,14 @@
inbytes = length;
do {
- result = iconv(convertor[how], &text, &inbytes,
+ result = iconv (convertor[how], (ICONV_CONST char **) &text, &inbytes,
&op, &outbytes);
if ( -1 == result )
{
int the_error = errno;
- switch ( the_error)
+ switch (the_error)
{
case EILSEQ:
case EINVAL:
@@ -117,9 +117,9 @@
}
/* Fall through */
case E2BIG:
- free(outbuf);
+ free (outbuf);
outbufferlength <<= 1;
- outbuf = xmalloc(outbufferlength);
+ outbuf = xmalloc (outbufferlength);
op = outbuf;
outbytes = outbufferlength;
inbytes = length;
@@ -128,14 +128,13 @@
/* should never happen */
break;
}
-
}
} while ( -1 == result );
if (outbytes == 0 )
{
char *const oldaddr = outbuf;
- outbuf = xrealloc(outbuf, outbufferlength + 1);
+ outbuf = xrealloc (outbuf, outbufferlength + 1);
op += (outbuf - oldaddr) ;
}
@@ -148,15 +147,15 @@
/* Returns the current PSPP locale */
const char *
-get_pspp_locale(void)
+get_pspp_locale (void)
{
- assert ( locale);
+ assert (locale);
return locale;
}
/* Set the PSPP locale */
void
-set_pspp_locale(const char *l)
+set_pspp_locale (const char *l)
{
char *current_locale;
const char *current_charset;
@@ -164,28 +163,28 @@
free(locale);
locale = strdup(l);
- current_locale = setlocale(LC_CTYPE, 0);
- current_charset = locale_charset();
- setlocale(LC_CTYPE, locale);
+ current_locale = setlocale (LC_CTYPE, 0);
+ current_charset = locale_charset ();
+ setlocale (LC_CTYPE, locale);
- charset = locale_charset();
- setlocale(LC_CTYPE, current_locale);
+ charset = locale_charset ();
+ setlocale (LC_CTYPE, current_locale);
- iconv_close(convertor[CONV_PSPP_TO_UTF8]);
+ iconv_close (convertor[CONV_PSPP_TO_UTF8]);
convertor[CONV_PSPP_TO_UTF8] = create_iconv ("UTF-8", charset);
- iconv_close(convertor[CONV_SYSTEM_TO_PSPP]);
+ iconv_close (convertor[CONV_SYSTEM_TO_PSPP]);
convertor[CONV_SYSTEM_TO_PSPP] = create_iconv (charset, current_charset);
}
void
-i18n_init(void)
+i18n_init (void)
{
- assert ( ! locale) ;
- locale = strdup(setlocale(LC_CTYPE, NULL));
+ assert (!locale) ;
+ locale = strdup (setlocale (LC_CTYPE, NULL));
- setlocale(LC_CTYPE, locale);
- charset = locale_charset();
+ setlocale (LC_CTYPE, locale);
+ charset = locale_charset ();
convertor[CONV_PSPP_TO_UTF8] = create_iconv ("UTF-8", charset);
convertor[CONV_SYSTEM_TO_PSPP] = create_iconv (charset, charset);
@@ -193,17 +192,17 @@
void
-i18n_done(void)
+i18n_done (void)
{
int i;
- free(locale);
+ free (locale);
locale = 0;
for(i = 0 ; i < n_CONV; ++i )
{
if ( (iconv_t) -1 == convertor[i] )
continue;
- iconv_close(convertor[i]);
+ iconv_close (convertor[i]);
}
}
Index: src/ui/gui/ChangeLog
===================================================================
RCS file: /cvsroot/pspp/pspp/src/ui/gui/ChangeLog,v
retrieving revision 1.42
retrieving revision 1.42.2.1
diff -u -b -r1.42 -r1.42.2.1
--- src/ui/gui/ChangeLog 22 Feb 2007 11:26:37 -0000 1.42
+++ src/ui/gui/ChangeLog 20 Mar 2007 00:08:50 -0000 1.42.2.1
@@ -1,3 +1,17 @@
+2007-03-18 Ben Pfaff <address@hidden>
+
+ * syntax-editor-source.c (close): Rename do_close to avoid naming
+ conflict with POSIX function of same name.
+
+Tue Mar 13 17:20:05 CET 2007 John Darrington <address@hidden>
+ * psppire.c: Changed gtk_init to gtk_parse_args, followed by a delayed
call to gdk_init, so that psppire --version will succeed, even if it
+ cannot connect to a display .
+
+Wed Mar 7 19:05:12 CET 2007 John Darrington <address@hidden>
+
+ * var-sheet.c: Replaced call to nl_langinfo with locale_charset
+ from gnulib.
+
Thu Feb 22 12:27:41 CET 2007 John Darrington <address@hidden>
* data-editor.c : called new gen_quoted_string function to properly
Index: src/ui/gui/automake.mk
===================================================================
RCS file: /cvsroot/pspp/pspp/src/ui/gui/automake.mk,v
retrieving revision 1.21.2.1
retrieving revision 1.21.2.2
diff -u -b -r1.21.2.1 -r1.21.2.2
--- src/ui/gui/automake.mk 19 Mar 2007 21:36:25 -0000 1.21.2.1
+++ src/ui/gui/automake.mk 20 Mar 2007 00:08:50 -0000 1.21.2.2
@@ -1,6 +1,6 @@
## Process this file with automake to produce Makefile.in -*- makefile -*-
-bin_PROGRAMS += src/ui/gui/psppire
+#bin_PROGRAMS += src/ui/gui/psppire
src_ui_gui_psppire_CFLAGS = $(GTK_CFLAGS) $(GLADE_CFLAGS) -Wall
Index: src/ui/gui/syntax-editor-source.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/ui/gui/syntax-editor-source.c,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -u -b -r1.6 -r1.6.2.1
--- src/ui/gui/syntax-editor-source.c 9 Feb 2007 15:06:28 -0000 1.6
+++ src/ui/gui/syntax-editor-source.c 20 Mar 2007 00:08:50 -0000 1.6.2.1
@@ -100,7 +100,7 @@
static void
-close (struct getl_interface *i )
+do_close (struct getl_interface *i )
{
free (i);
}
@@ -120,7 +120,7 @@
ses->parent.interactive = always_false;
ses->parent.read = read_line_from_buffer;
- ses->parent.close = close;
+ ses->parent.close = do_close;
ses->parent.name = name;
ses->parent.location = location;
Index: src/ui/gui/var-sheet.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/ui/gui/var-sheet.c,v
retrieving revision 1.20.2.1
retrieving revision 1.20.2.2
diff -u -b -r1.20.2.1 -r1.20.2.2
--- src/ui/gui/var-sheet.c 19 Mar 2007 21:36:25 -0000 1.20.2.1
+++ src/ui/gui/var-sheet.c 20 Mar 2007 00:08:50 -0000 1.20.2.2
@@ -33,9 +33,6 @@
#include <stdlib.h>
#include <string.h>
-#if HAVE_LANGINFO_H
-#include <langinfo.h>
-#endif
#include <data/value.h>
@@ -43,6 +40,7 @@
#include <gtksheet/gsheet-hetero-column.h>
#include <gtksheet/gsheet-uniform-row.h>
+#include "localcharset.h"
#include "psppire-var-store.h"
#include "helper.h"
#include "psppire-dict.h"
@@ -418,9 +416,7 @@
gchar *string2,
gint int1, gint int2)
{
-#if HAVE_LANGINFO_H
gchar *codeset;
-#endif
gint i;
GtkWidget *sheet;
@@ -448,12 +444,11 @@
gtk_sheet_set_model (GTK_SHEET (sheet), G_SHEET_MODEL (the_var_store));
-#if HAVE_LANGINFO_H
/* Since this happens inside glade_xml_new, we must prevent strings from
* being re-encoded twice */
codeset = bind_textdomain_codeset (PACKAGE, 0);
- bind_textdomain_codeset (PACKAGE, nl_langinfo (CODESET));
-#endif
+ bind_textdomain_codeset (PACKAGE, locale_charset ());
+
for (i = 0 ; i < n_COLS ; ++i )
{
g_sheet_hetero_column_set_button_label (G_SHEET_HETERO_COLUMN (geo), i,
@@ -462,9 +457,8 @@
g_sheet_hetero_column_set_width (G_SHEET_HETERO_COLUMN (geo), i,
column_def[i].width);
}
-#if HAVE_LANGINFO_H
+
bind_textdomain_codeset (PACKAGE, codeset);
-#endif
gtk_widget_show (sheet);
Index: src/ui/terminal/ChangeLog
===================================================================
RCS file: /cvsroot/pspp/pspp/src/ui/terminal/ChangeLog,v
retrieving revision 1.21
retrieving revision 1.21.2.1
diff -u -b -r1.21 -r1.21.2.1
--- src/ui/terminal/ChangeLog 18 Feb 2007 21:29:20 -0000 1.21
+++ src/ui/terminal/ChangeLog 20 Mar 2007 00:08:50 -0000 1.21.2.1
@@ -1,3 +1,12 @@
+2007-02-25 Ben Pfaff <address@hidden>
+
+ Thanks to Jason Stover for verifying that this patch helps under
+ NetBSD.
+
+ * main.c [HAVE_IEEE_FP]: Include <ieeefp.h>.
+ (fpu_init) [HAVE_IEEE_FP]: Use setfpmask to mask floating-point
+ exceptions.
+
Sun Feb 18 13:28:26 2007 Ben Pfaff <address@hidden>
* msg-ui.c: Don't include exit.h, because gnulib fixes up stdlib.h
Index: src/ui/terminal/main.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/ui/terminal/main.c,v
retrieving revision 1.30.2.1
retrieving revision 1.30.2.2
diff -u -b -r1.30.2.1 -r1.30.2.2
--- src/ui/terminal/main.c 19 Mar 2007 21:36:25 -0000 1.30.2.1
+++ src/ui/terminal/main.c 20 Mar 2007 00:08:50 -0000 1.30.2.2
@@ -57,6 +57,10 @@
#include <fenv.h>
#endif
+#if HAVE_IEEEFP_H
+#include <ieeefp.h>
+#endif
+
#include "gettext.h"
#define _(msgid) gettext (msgid)
@@ -154,6 +158,8 @@
feholdexcept (&foo);
#elif HAVE___SETFPUCW && defined(_FPU_IEEE)
__setfpucw (_FPU_IEEE);
+#elif HAVE_FPSETMASK
+ fpsetmask (0);
#endif
}
Index: tests/ChangeLog
===================================================================
RCS file: /cvsroot/pspp/pspp/tests/ChangeLog,v
retrieving revision 1.79
retrieving revision 1.79.2.1
diff -u -b -r1.79 -r1.79.2.1
--- tests/ChangeLog 12 Feb 2007 14:30:23 -0000 1.79
+++ tests/ChangeLog 20 Mar 2007 00:08:51 -0000 1.79.2.1
@@ -1,3 +1,9 @@
+2007-03-18 Ben Pfaff <address@hidden>
+
+ * automake.mk: Don't try to distribute tests that are compiled
+ from C source. This fixes "make dist" when "make all" has not yet
+ been run.
+
Mon Feb 12 06:29:30 2007 Ben Pfaff <address@hidden>
* libpspp/ll-test.c, libpspp/llx-test.c: Include <config.h>.
Index: tests/automake.mk
===================================================================
RCS file: /cvsroot/pspp/pspp/tests/automake.mk,v
retrieving revision 1.27.2.1
retrieving revision 1.27.2.2
diff -u -b -r1.27.2.1 -r1.27.2.2
--- tests/automake.mk 19 Mar 2007 21:36:25 -0000 1.27.2.1
+++ tests/automake.mk 20 Mar 2007 00:08:51 -0000 1.27.2.2
@@ -2,7 +2,7 @@
TESTS_ENVIRONMENT = top_srcdir='$(top_srcdir)' top_builddir='$(top_builddir)'
TESTS_ENVIRONMENT += PERL='@PERL@'
-TESTS = \
+dist_TESTS = \
tests/command/aggregate.sh \
tests/command/autorecod.sh \
tests/command/beg-data.sh \
@@ -129,12 +129,16 @@
tests/expressions/randist.sh \
tests/expressions/valuelabel.sh \
tests/expressions/variables.sh \
- tests/expressions/vectors.sh \
+ tests/expressions/vectors.sh
+
+nodist_TESTS = \
tests/libpspp/ll-test \
tests/libpspp/llx-test \
tests/libpspp/heap-test \
tests/libpspp/abt-test
+TESTS = $(dist_TESTS) $(nodist_TESTS)
+
check_PROGRAMS += \
tests/libpspp/ll-test \
tests/libpspp/llx-test \
@@ -172,7 +176,9 @@
tests_formats_inexactify_SOURCES = tests/formats/inexactify.c
-EXTRA_DIST += $(TESTS) tests/weighting.data tests/data-list.data
tests/list.data \
+EXTRA_DIST += \
+ $(dist_TESTS) \
+ tests/weighting.data tests/data-list.data tests/list.data \
tests/no_case_size.sav \
tests/coverage.sh tests/test_template \
tests/v13.sav tests/v14.sav \
Index: tests/command/missing-values.sh
===================================================================
RCS file: /cvsroot/pspp/pspp/tests/command/missing-values.sh,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -u -b -r1.5 -r1.5.2.1
--- tests/command/missing-values.sh 7 Nov 2006 13:00:00 -0000 1.5
+++ tests/command/missing-values.sh 20 Mar 2007 00:08:51 -0000 1.5.2.1
@@ -17,6 +17,8 @@
STAT_CONFIG_PATH=$top_srcdir/config
export STAT_CONFIG_PATH
+LANG=C
+export LANG
cleanup()
{
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Pspp-cvs] pspp ChangeLog Makefile.am NEWS Smake acinclude... [simpler-proc],
Ben Pfaff <=