[Tux4kids-commits] r418 - in tuxmath/trunk: . data/images/sprites doc po src
dbruce-guest at alioth.debian.org
dbruce-guest at alioth.debian.org
Thu Jan 31 17:07:45 UTC 2008
Author: dbruce-guest
Date: 2008-01-31 17:07:44 +0000 (Thu, 31 Jan 2008)
New Revision: 418
Modified:
tuxmath/trunk/configure
tuxmath/trunk/configure.ac
tuxmath/trunk/data/images/sprites/Makefile.in
tuxmath/trunk/doc/INSTALL.txt
tuxmath/trunk/doc/changelog
tuxmath/trunk/po/en at boldquot.po
tuxmath/trunk/po/en at quot.po
tuxmath/trunk/src/Makefile.in
Log:
update docs - release version 1.6.1
Modified: tuxmath/trunk/configure
===================================================================
--- tuxmath/trunk/configure 2008-01-29 19:00:58 UTC (rev 417)
+++ tuxmath/trunk/configure 2008-01-31 17:07:44 UTC (rev 418)
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for Tux Of Math Command 1.6.0.
+# Generated by GNU Autoconf 2.61 for Tux Of Math Command 1.6.1.
#
# Report bugs to <tuxmath-devel at lists.sourceforge.net>.
#
@@ -574,8 +574,8 @@
# Identity of this package.
PACKAGE_NAME='Tux Of Math Command'
PACKAGE_TARNAME='tuxmath'
-PACKAGE_VERSION='1.6.0'
-PACKAGE_STRING='Tux Of Math Command 1.6.0'
+PACKAGE_VERSION='1.6.1'
+PACKAGE_STRING='Tux Of Math Command 1.6.1'
PACKAGE_BUGREPORT='tuxmath-devel at lists.sourceforge.net'
ac_unique_file="src/tuxmath.c"
@@ -1281,7 +1281,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures Tux Of Math Command 1.6.0 to adapt to many kinds of systems.
+\`configure' configures Tux Of Math Command 1.6.1 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1352,7 +1352,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of Tux Of Math Command 1.6.0:";;
+ short | recursive ) echo "Configuration of Tux Of Math Command 1.6.1:";;
esac
cat <<\_ACEOF
@@ -1464,7 +1464,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-Tux Of Math Command configure 1.6.0
+Tux Of Math Command configure 1.6.1
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1478,7 +1478,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by Tux Of Math Command $as_me 1.6.0, which was
+It was created by Tux Of Math Command $as_me 1.6.1, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2345,7 +2345,7 @@
# Define the identity of the package.
PACKAGE='tuxmath'
- VERSION='1.6.0'
+ VERSION='1.6.1'
cat >>confdefs.h <<_ACEOF
@@ -17483,7 +17483,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by Tux Of Math Command $as_me 1.6.0, which was
+This file was extended by Tux Of Math Command $as_me 1.6.1, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -17536,7 +17536,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-Tux Of Math Command config.status 1.6.0
+Tux Of Math Command config.status 1.6.1
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
@@ -18340,22 +18340,21 @@
fi
rm -f "$tmp/out12"
# Compute $ac_file's index in $config_headers.
-_am_arg=$ac_file
_am_stamp_count=1
for _am_header in $config_headers :; do
case $_am_header in
- $_am_arg | $_am_arg:* )
+ $ac_file | $ac_file:* )
break ;;
* )
_am_stamp_count=`expr $_am_stamp_count + 1` ;;
esac
done
-echo "timestamp for $_am_arg" >`$as_dirname -- "$_am_arg" ||
-$as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$_am_arg" : 'X\(//\)[^/]' \| \
- X"$_am_arg" : 'X\(//\)$' \| \
- X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$_am_arg" |
+echo "timestamp for $ac_file" >`$as_dirname -- $ac_file ||
+$as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ X$ac_file : 'X\(//\)[^/]' \| \
+ X$ac_file : 'X\(//\)$' \| \
+ X$ac_file : 'X\(/\)' \| . 2>/dev/null ||
+echo X$ac_file |
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
s//\1/
q
@@ -18505,7 +18504,7 @@
# each Makefile.in and add a new line on top of each file to say so.
# Grep'ing the whole file is not good either: AIX grep has a line
# limit of 2048, but all sed's we know have understand at least 4000.
- if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
+ if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then
dirpart=`$as_dirname -- "$mf" ||
$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
X"$mf" : 'X\(//\)[^/]' \| \
Modified: tuxmath/trunk/configure.ac
===================================================================
--- tuxmath/trunk/configure.ac 2008-01-29 19:00:58 UTC (rev 417)
+++ tuxmath/trunk/configure.ac 2008-01-31 17:07:44 UTC (rev 418)
@@ -1,6 +1,6 @@
# -*- Autoconf -*-
# Process this file with autoconf to produce a configure script.
-AC_INIT([Tux Of Math Command],[1.6.0],[tuxmath-devel at lists.sourceforge.net],[tuxmath])
+AC_INIT([Tux Of Math Command],[1.6.1],[tuxmath-devel at lists.sourceforge.net],[tuxmath])
AC_CONFIG_SRCDIR([src/tuxmath.c])
AC_PREREQ(2.61)
Modified: tuxmath/trunk/data/images/sprites/Makefile.in
===================================================================
--- tuxmath/trunk/data/images/sprites/Makefile.in 2008-01-29 19:00:58 UTC (rev 417)
+++ tuxmath/trunk/data/images/sprites/Makefile.in 2008-01-31 17:07:44 UTC (rev 418)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
Modified: tuxmath/trunk/doc/INSTALL.txt
===================================================================
--- tuxmath/trunk/doc/INSTALL.txt 2008-01-29 19:00:58 UTC (rev 417)
+++ tuxmath/trunk/doc/INSTALL.txt 2008-01-31 17:07:44 UTC (rev 418)
@@ -15,35 +15,37 @@
Linux
Windows 32-bit
MacOSX
+ FreeBSD
+ BeOS
In principle, Tuxmath should build and run on any platform with SDL,
including:
Solaris
IRIX
- FreeBSD
- BeOS
+ Other *BSDs
However, I do not know if anyone has done a current build on these systems.
CPU
---
- [ Minimum requirements should be P90, but not sure yet... ]
- [ Architectures including i386, Alpha, PPC, Sparc64, 68000<?> ]
+ Any machine from the last decade should easily handle TuxMath - when first
+ written, the minimum suggested CPU was a 90 MHz Pentium.
Video Display
-------------
TuxMath displays the game screen in a 640x480 window.
- If supported by your system, the game can also display in full-screen
- mode (see "README.txt" or the program's "--usage" display).
+ If a 640x480 resolution is supported by your system, the game can also display
+ in full-screen mode(see "README.txt" or the program's "--usage" display).
When attempting to run in fullscreen mode on systems where true 640x480
resolution isn't available for some reason, the next-lowest resolution
available will be used, and the game area will be centered within a
black screen.
- TuxMath prefers 16bpp (bits per pixel) color depth, but can run in
- 8bpp (256 colors) if that's all that is available.
+ TuxMath prefers 32bpp (bits per pixel) color depth. Current builds have not been
+ tested on systems that cannot provide this (AFAIK), but I believe SDL will make
+ do with lower color depth if necessary.
Sound Card
@@ -85,12 +87,19 @@
sound and music. This library is optional, but without it, the program
will be completely silent.
- Gnu gettext is required to run "make install".
-
As of version 1.5, TuxMath uses SDL_ttf to display true type fonts.
The freely distributable Andika font is included under data/fonts.
- Note: libSDL, SDL_image, SDL_ttf and SDL_mixer are all free,
+ As of v1.5.8 (Linux), v1.6.0 (Windows), and v1.6.1(MacOSX), internationalization
+ is supported using Gnu gettext and libiconv.
+
+ The executable Windows installer contains all needed libraries (DLLs) and
+ the Andika font - nothing else should be needed that is not part of
+ Windows. The *tar.gz source packages require the "*-dev" versions of SDL,
+ SDL_image, SDL_mixer, SDL_ttf for building and installation (easily obtained
+ in most any Gnu/Linux distribution). The Andika font is also included.
+
+ Note: libSDL, SDL_image, SDL_ttf, SDL_mixer, and libiconv are all free,
Open Source libraries, released under the GNU Library General Public
License (LGPL).
@@ -146,25 +155,27 @@
svn://svn.debian.org/tux4kids/tuxmath
- If you are using a source tar.gz package (e.g. tuxmath-1.5.5-tar.gz),
+ If you are using a source tar.gz package (e.g. tuxmath_w_fonts-1.6.1-tar.gz),
all you need to do is unpack the archive in a convient location and
do a typical configure, make, and install. In other words, the
tarball contains a complete "GNU Build System". Note, however, that
you will need the "-dev" files for SDL, SDL_image, SDL_mixer, and
- SDL_ttf.
+ SDL_ttf. Your system is virtually certain to already contain the other
+ standard libs used at compile or run time.
For example:
- tar -xzf tuxmath-1.5.5-tar.gz
- cd tuxmath-1.5.5
+ tar -xzf tuxmath_w_fonts-1.6.1-tar.gz
+ cd tuxmath_w_fonts-1.6.1
./configure
make
make install. (you might need "su" or "sudo" for this)
If you use a subversion checkout, you will need to generate the configure script.
- Tuxmath uses the Gnu Autoconf/Automake tools for development. You will need
- to run Autoconf's "autoreconf" to generate the configure script, Makefile.in's,
- and friends, so the build process becomes:
+ Tuxmath uses the Gnu Autoconf/Automake tools for development. You will Autoconf 2.61
+ or later, Automake 1.10 or later, and Gnu Gettext 0.16 or later, in addition to the
+ libs needed for the build itself. Run Autoconf's "autoreconf" to generate the
+ configurescript, Makefile.in's, and friends, so the build process becomes:
autoreconf --install; ./configure; make; make install
@@ -193,39 +204,22 @@
Tuxmath can be cross-compiled for Windows under Linux. I have done this on
my Debian system. Once the crossbuild environment is set up, the process is
simple and nearly automatic.
-
- To set up a crossbuild environment:
-
- 1. Install mingw32 (apt-get install mingw32) and makensis (apt-get install nsis)
- 2. Create directory structure:
- - mkdir /usr/local/cross-tools
- - mkdir /usr/local/cross-tools/i586-mingw32msvc
- - mkdir /usr/local/cross-tools/i586-mingw32msvc/lib
- - mkdir /usr/local/cross-tools/i586-mingw32msvc/include
+ In order to get a successful crossbuild using gettext, it was necessary to set
+ up a "pure" mingw environment, in particular avoiding the use of libgw32c.
+ I also stopped using the Debian-packaged mingw32 cross-tools and used the script
+ directly from the mingw project:
- 3. Install precompiled win32dev files (lib and includes) for SDL, SDL-image
- and SDL-mixer in the lib and include directories you just created.
- You can get all of these from www.libsdl.org. I had some trouble with
- this step as the SDL libs have varieties intended for both mingw32 and MSVC -
- I was able to build successfully using the mingw32 ones. I also had to put
- all the lib files directly under /usr/local/cross-tools/i586-mingw32msvc/lib
- to get it to work. My /usr/local/cross-tools/i586-mingw32msvc/lib contains:
+ http://downloads.sourceforge.net/mingw/x86-mingw32-build.sh-0.0-20061107-1.tar.bz2
- dbruce at debian:/usr/local/cross-tools/i586-mingw32msvc/lib$ ls
- jpeg.dll libSDL.la SDL_image.dll SDL_ttf.dll zlib1.dll
- libgw32c.a libSDLmain.a SDL_image.lib smpeg.dll
- libpng12.dll libtiff.dll SDL_mixer.dll vorbis.dll
- libSDL.dll.a ogg.dll SDL_mixer.lib vorbisfile.dll
+ I used the above to create a crossbuild environment under /usr/local/mingw.
+ After that, I built *everything* from source needed for the crossbuild, including
+ all the SDL* libs, gettext, libiconv, libjpeg, freetype, and so forth. There were
+ a number of pitfalls along the way, and hopefully I will get this documented at
+ some point. Suffice to say that tuxmath itself builds fine in this way, once the
+ environment is set up.
- The header files can be in their own folders as long as they are under
- /usr/local/cross-tools/i586-mingw32msvc/include
-
- 4. Install libgw32c (the dev file):
- http://gnuwin32.sourceforge.net/packages/libgw32c.htm in the same directory.
- This gives you the file "libgw32c.a" that you need to have in the lib directory.
-
5. You need to have a directory containing all of the dlls that will need to be
packaged into the installer. The Makefile expects them to be in NSI_DLL_DIR,
which I have set to ~/tuxmath_dll. On my machine, this contains:
@@ -234,21 +228,23 @@
jpeg.dll ogg.dll SDL_mixer.dll vorbis.dll
libpng12.dll SDL.dll SDL_ttf.dll vorbisfile.dll
libtiff.dll SDL_image.dll smpeg.dll zlib1.dll
+ libiconv-2.dll
+ The svn repository has a directory with copies of all of these files:
- (Note - this has mostly the same files as the cross-tools lib directory - it is most
- likely possible to eliminate this redundancy in some way.).
+ tuxmath/people/dbruce/tuxmath_dll
- 6. If you have done a native (Linux) build in the same source tree, run "make clean"
- and "make distclean" to get rid of the autogenerated files.
+ 6. If you have done a native (Linux) build in the same source tree, run
+ "make distclean" to get rid of the autogenerated files.
+
7. From the trunk dir, run:
autoreconf --install
- ./cross-configure.sh --with-sdl-prefix
+ ./cross-configure.sh
./cross-make.sh
./cross-make.sh nsis
- This should create the windows installer file ("tuxmath-1.5-win32-installer.exe")
+ This should create the windows installer file ("tuxmath-1.6.1-win32-installer.exe")
under trunk.
Installation on Windows:
@@ -264,6 +260,14 @@
Mac OSX: (contributed by Tim Holy)
-------
+
+ Note - this is being actively developed. As of 1.6.1, you can simply do a
+ "./configure; make; make install" on MacOSX 10.5 (Leopard) as long as you have
+ the needed libs. I hope to have a user-friendly .dmg file for the next release.
+ --DSB
+
+ (build instructions for TuxMath 1.5 follow:)
+
Building from source:
--------------------
You have to have the development tools and development libraries for SDL. Here's the approach that worked for me:
Modified: tuxmath/trunk/doc/changelog
===================================================================
--- tuxmath/trunk/doc/changelog 2008-01-29 19:00:58 UTC (rev 417)
+++ tuxmath/trunk/doc/changelog 2008-01-31 17:07:44 UTC (rev 418)
@@ -1,3 +1,11 @@
+2008.Jan.30 (svn.debian.org/tux4kids - revision 418)
+Version 1.6.1
+ Docs:
+ Updating of changelog, README.txt, INSTALL.txt to reflect recent work -
+ no code changes beyond what is listed below.
+
+ David Bruce <dbruce at tampabay.rr.com>
+
2008.Jan.26 (svn.debian.org/tux4kids - revision 410)
Build:
After a few minor modifications, tuxmath now builds and installs on
@@ -3,5 +11,5 @@
MacOSX Leopard with "./configure; make; sudo make install", including
functioning gettext!
-
+
The build environment needs current versions of gettext,
libiconv, and all the SDL* libs. Also, it needs newer versions of
Modified: tuxmath/trunk/po/en at boldquot.po
===================================================================
--- tuxmath/trunk/po/en at boldquot.po 2008-01-29 19:00:58 UTC (rev 417)
+++ tuxmath/trunk/po/en at boldquot.po 2008-01-31 17:07:44 UTC (rev 418)
@@ -29,7 +29,7 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Tux Of Math Command 1.6.0\n"
+"Project-Id-Version: Tux Of Math Command 1.6.1\n"
"Report-Msgid-Bugs-To: tuxmath-devel at lists.sourceforge.net\n"
"POT-Creation-Date: 2007-12-31 14:39-0500\n"
"PO-Revision-Date: 2007-12-31 14:39-0500\n"
Modified: tuxmath/trunk/po/en at quot.po
===================================================================
--- tuxmath/trunk/po/en at quot.po 2008-01-29 19:00:58 UTC (rev 417)
+++ tuxmath/trunk/po/en at quot.po 2008-01-31 17:07:44 UTC (rev 418)
@@ -26,7 +26,7 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Tux Of Math Command 1.6.0\n"
+"Project-Id-Version: Tux Of Math Command 1.6.1\n"
"Report-Msgid-Bugs-To: tuxmath-devel at lists.sourceforge.net\n"
"POT-Creation-Date: 2007-12-31 14:39-0500\n"
"PO-Revision-Date: 2007-12-31 14:39-0500\n"
Modified: tuxmath/trunk/src/Makefile.in
===================================================================
--- tuxmath/trunk/src/Makefile.in 2008-01-29 19:00:58 UTC (rev 417)
+++ tuxmath/trunk/src/Makefile.in 2008-01-31 17:07:44 UTC (rev 418)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -89,7 +89,7 @@
tuxmathadmin_OBJECTS = $(am_tuxmathadmin_OBJECTS)
tuxmathadmin_LDADD = $(LDADD)
tuxmathadmin_DEPENDENCIES =
-DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
+DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@@ -408,8 +408,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -421,8 +421,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -432,12 +432,13 @@
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
+ here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
More information about the Tux4kids-commits
mailing list