[Tux4kids-commits] r937 - in tuxmath/trunk: . doc src
dbruce-guest at alioth.debian.org
dbruce-guest at alioth.debian.org
Thu Mar 12 12:09:20 UTC 2009
Author: dbruce-guest
Date: 2009-03-12 12:09:20 +0000 (Thu, 12 Mar 2009)
New Revision: 937
Modified:
tuxmath/trunk/doc/INSTALL.txt
tuxmath/trunk/doc/README.txt
tuxmath/trunk/doc/TODO.txt
tuxmath/trunk/doc/changelog
tuxmath/trunk/src/globals.h
tuxmath/trunk/tuxmath.desktop
tuxmath/trunk/tuxmath.spec.in
tuxmath/trunk/tuxmath_preview.spec.in
Log:
release of 1.7.2
Modified: tuxmath/trunk/doc/INSTALL.txt
===================================================================
--- tuxmath/trunk/doc/INSTALL.txt 2009-03-12 02:43:29 UTC (rev 936)
+++ tuxmath/trunk/doc/INSTALL.txt 2009-03-12 12:09:20 UTC (rev 937)
@@ -1,7 +1,7 @@
INSTALL.txt for "Tux, Of Math Command" (aka "Tuxmath")
-Version 1.7.1
+Version 1.7.2
-January 23, 2009
+March 12, 2009
For users
---------
@@ -16,12 +16,25 @@
example, with Debian systems you can say "apt-get install tuxmath" and
you're done.
+The openSUSE Build Service now has extremely up-to-date builds of TuxMath
+for most rpm-based distributions (all recent openSUSE versions, Mandriva 2008
+and 2009, Fedora 9 and 10) that can be found via http://software.opensuse.org/search
+by searching for "tuxmath" (btw, TuxType is available there, too). Preliminary
+developer builds will have "tuxmath_preview" in the package name instead of just
+"tuxmath", but all are available to everyone.
+
For Windows/Macs: visit http://www.tux4kids.com, click on "Released
Files," and find the most recent package for your platform. You will
not need the source code packages. Save the package on your
harddrive and double-click on the icon.
+Also, Mac users interested in free/open source software should strongly consider
+the MacPorts project (http://www.macports.org). MacPorts is a package manager
+for over 5000 free software programs for the Mac. Both TuxMath and TuxType are
+included in MacPorts. Once MacPorts is installed (a simple
+dmg file), it is extremely easy to automatically get the latest version of TuxMath.
+
The remainder of this document is for people who want to compile TuxMath
themselves on their own computers.
@@ -46,6 +59,7 @@
IRIX
Other *BSDs
However, I do not know if anyone has done a current build on these systems.
+ (as of Jan 2009, OpenSolaris does not have all the needed SDL libs -DSB)
CPU
---
@@ -108,18 +122,22 @@
sound and music. This library is optional, but without it, the program
will be completely silent.
- As of version 1.5, TuxMath uses SDL_ttf to display true type fonts.
- The freely distributable Andika font is included under data/fonts.
-
As of v1.5.8 (Linux), v1.6.0 (Windows), and v1.6.1(MacOSX),
internationalization is supported using Gnu gettext and libiconv.
- As of v1.6.3 (Linux), TuxMath can support translations into
- languages requiring bidirectional text by using SDL_Pango.
- SDL_Pango is optional in the build process - it will be used if
- found, but the program will fall back to SDL_ttf if it cannot be
- built with SDL_Pango.
+ TuxMath can use either SDL_Pango or SDL_ttf to display text. SDL_Pango
+ is more capable and is required for right-to-left display (e.g. Arabic,
+ Hebrew) and proper rendering of Indic and many other non-Western languages.
+ Also, SDL_Pango takes care of font selection, so it eliminates the need
+ for any bundled fonts. For these reasons, SDL_Pango is the default when
+ available (Linux and the MacPorts build for MacOSX). If SDL_Pango is
+ available, SDL_ttf is not needed (as of v1.7.2).
+ SDL_Pango is not yet supported in the Windows build or the CMake MacOSX
+ build (the ones available for download from www.tux4kids.com), so the
+ program still supports SDL_ttf. For testing purposes, TuxMath can be
+ built without SDL_Pango by "./configure --without-sdlpango".
+
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
@@ -130,9 +148,12 @@
names, and install them with "sudo aptitude install". For Fedora and
Red Hat derivatives, the "yum" tool works very similarly.
- The Andika font is also included in the "tuxmath_w_fonts-*" packages,
- which is almost certainly what you want.
-
+ The Andika font is also included in the "tuxmath_w_fonts-*" packages.
+ You will definitely want this if building for a platform without
+ SDL_Pango. If you have SDL_Pango, both the packages with and without
+ fonts should work fine - the fonts will just take up a bit of space
+ on your hard drive.
+
Note: libSDL, SDL_image, SDL_ttf, SDL_mixer, SDL_Pango, and
libiconv are all free, Open Source libraries, released under the
GNU Library General Public License (LGPL).
@@ -209,35 +230,44 @@
Compiling the Program: Automake (Linux)
--------------------------------------
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
+ tuxmath_w_fonts-1.7.2-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. Your
+ "-dev" files for SDL, SDL_image, SDL_mixer, and SDL_ttf/SDL_Pango.
+
+ (NOTE: -If you have built other packages from source, your
system is virtually certain to already contain the other
- standard libs used at compile or run time.
-
+ standard libs used at compile or run time. If you haven't built
+ anything before, you might need to install some other packages.
+ Notably, on Ubuntu the needed tools are included in a package
+ called "build-essential").
+
For example:
- tar -xzf tuxmath_w_fonts-1.6.1-tar.gz
- cd tuxmath_w_fonts-1.6.1
+ tar -xzf tuxmath_w_fonts-1.7.2-tar.gz
+ cd tuxmath_w_fonts-1.7.2
./configure
make
make install. (you might need "su" or "sudo" for this)
Note: the build now uses SDL_Pango by default - the "enable-sdlpango"
- switch is no longer needed. If your build environment lacks this
- lib, TuxMath will be build without SDL_Pango support.
+ switch is no longer needed. We now have a "--without-sdlpango" option
+ for testing purposes. If your build environment lacks SDL_Pango, TuxMath
+ will be built using SDL_ttf instead.
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 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
+ generate the configure script, Makefile.in's, and friends, so the
build process becomes:
- autoreconf --install; ./configure; make; make install
+ autoreconf --install;
+ ./configure;
+ make;
+ sudo make install
Tuxmath supports "parallel" or "vpath" builds to avoid
cluttering the source tree with object files, so a clean way
@@ -248,7 +278,7 @@
autoreconf --install ../trunk
../trunk/configure
make
- make install
+ sudo make install
(which is what I do).
@@ -258,7 +288,8 @@
If you are using a deb or rpm-based distribution, your distro
may have tuxmath in a prepared package, in which case your job
- is as simple as "apt-get install tuxmath".
+ is as simple as "apt-get install tuxmath", "yum install tuxmath",
+ or using a GUI package manager.
Compiling the Program: CMake (Linux & Mac OS X)
----------------------------------------------
@@ -333,7 +364,7 @@
./cross-make.sh nsis
This should create the windows installer file
- ("tuxmath-1.6.1-win32-installer.exe") under trunk.
+ ("tuxmath-1.7.2-win32-installer.exe") under trunk.
Installation on Windows:
------------------------
@@ -354,11 +385,14 @@
There are several options for compiling on OS X. If you just want
to do a local build, using macports (http://www.macports.org/) is
perhaps the easiest approach: "port install tuxmath" and then wait.
+ MacPorts can also build .dmg files with "port mdmg tuxmath". The
+ MacPorts dmg files are very big because they include all the library
+ dependencies, even things like the X server.
- To build a .dmg, the currently-supported approach is to use CMake
- (described above under Linux/Unix). You will need to have both
- gettext and cmake installed on the build machine; using macports is
- the easiest way, "port install cmake gettext".
+ To build a .dmg, another approach is to use CMake (described above
+ under Linux/Unix). You will need to have both gettext and cmake
+ installed on the build machine; using macports is the easiest way,
+ "port install cmake gettext".
"make install" will create the .dmg in the build directory.
Modified: tuxmath/trunk/doc/README.txt
===================================================================
--- tuxmath/trunk/doc/README.txt 2009-03-12 02:43:29 UTC (rev 936)
+++ tuxmath/trunk/doc/README.txt 2009-03-12 12:09:20 UTC (rev 937)
@@ -2,9 +2,9 @@
An educational math tutorial game starring Tux, the Linux Penguin
-----------------------------------------------------------------
-January 23, 2009
+March 12, 2009
-For tuxmath-1.7.1
+For tuxmath-1.7.2
Objective
---------
@@ -120,7 +120,7 @@
factor of the numerator and denominator). For example, 7/70 could be
simplified by shooting it with the number 7.
- Help: this offers a short tutorial to teach game play.
+ Help: this offers a short tutorial to teach game play for the main comet game.
----
More Options:
Modified: tuxmath/trunk/doc/TODO.txt
===================================================================
--- tuxmath/trunk/doc/TODO.txt 2009-03-12 02:43:29 UTC (rev 936)
+++ tuxmath/trunk/doc/TODO.txt 2009-03-12 12:09:20 UTC (rev 937)
@@ -1,7 +1,17 @@
TODO.txt for "tuxmath"
+2009.Mar.12
+These are the main (difficult) issues we would like to tackle
+at some point:
+1. svg support
+2. stand-alone, GUI config/admin program
+3. client/server model to support LAN multiplayer play
+
+We also need to get SDL_Pango support functioning in the Windows
+build, if possible.
+
+Older stuff:
2007.Oct.08
-
Build:
* Make a relocatable binary for Linux (klik package?)
* Refine NSIS installer for Windows (or perhaps executable
@@ -50,7 +60,6 @@
Code:
* Optimize graphics blitting!!!
* Abstract SDL_BlitSurface() calls
- * Consider moving to C++ (ducks!)
Website:
* Make something more user-friendly
Modified: tuxmath/trunk/doc/changelog
===================================================================
--- tuxmath/trunk/doc/changelog 2009-03-12 02:43:29 UTC (rev 936)
+++ tuxmath/trunk/doc/changelog 2009-03-12 12:09:20 UTC (rev 937)
@@ -1,3 +1,10 @@
+2009.Mar.12 (svn.debian.org/tux4kids - revision 937)
+Version 1.7.2
+ Build- some minor tweaks to tuxmath.desktop and specfiles.
+ Doc - update of README, INSTALL for new release
+
+ David Bruce <davidstuartbruce at gmail.com>
+
2009.Mar.06 (svn.debian.org/tux4kids - revision 929)
Text drawing - SDL_extras revamp done, AFAIK - supports resetting of font
sizes and run-time changing of fonts (new field added to options struct
Modified: tuxmath/trunk/src/globals.h
===================================================================
--- tuxmath/trunk/src/globals.h 2009-03-12 02:43:29 UTC (rev 936)
+++ tuxmath/trunk/src/globals.h 2009-03-12 12:09:20 UTC (rev 937)
@@ -27,7 +27,7 @@
#include "config.h"
/* for conditional compilation of debugging output */
-#define TUXMATH_DEBUG
+//#define TUXMATH_DEBUG
/* for Tim's feedback speed control code */
//#define FEEDBACK_DEBUG
//#define LINEBREAK
Modified: tuxmath/trunk/tuxmath.desktop
===================================================================
--- tuxmath/trunk/tuxmath.desktop 2009-03-12 02:43:29 UTC (rev 936)
+++ tuxmath/trunk/tuxmath.desktop 2009-03-12 12:09:20 UTC (rev 937)
@@ -1,6 +1,6 @@
[Desktop Entry]
Name=Tux Math
-GenericName=Educational game
+GenericName=Educational math game
GenericName[de]=Mathe Spiel
GenericName[ru]=Образовательная игра
Comment=Tux Math - Learn math with tux!
@@ -11,5 +11,5 @@
Icon=tuxmath
Type=Application
Terminal=false
-Categories=Education;X-Teaching;
+Categories=Education;Math;
## X-SuSE-translate=false
Modified: tuxmath/trunk/tuxmath.spec.in
===================================================================
--- tuxmath/trunk/tuxmath.spec.in 2009-03-12 02:43:29 UTC (rev 936)
+++ tuxmath/trunk/tuxmath.spec.in 2009-03-12 12:09:20 UTC (rev 937)
@@ -12,13 +12,13 @@
Obsoletes: tuxmath = 2001.09.07
Obsoletes: tuxmath_preview <= @VERSION@
Provides: tuxmath_preview = @VERSION@
-%define realname tuxmath
-%define progname tuxmath
+%define realname @PACKAGE@
+%define progname @PACKAGE@
Summary: Tux Math - educational math game
Version: @VERSION@
Release: 1
License: GPL
-Group: Productivity/Scientific/Math
+Group: Amusements/Teaching/Mathematics
Url: http://tux4kids.alioth.debian.org/
Vendor: openSUSE-Education
@@ -67,16 +67,28 @@
Sam 'Criswell' Hart
Larry Ewing
+
+
+# prep section: ---------------------------------------------------------
+
%prep
%setup -q -n %realname-%version
rm -rf $(find . -type d -name CVS)
rm -rf $(find . -type d -name .svn)
rm -rf $(find . -type d -name .xvpics)
+
+
+# build section: ---------------------------------------------------------
+
%build
%configure --disable-rpath
make %{?jobs:-j %jobs}
+
+
+# install section: ---------------------------------------------------------
+
%install
install -d %buildroot/{%_bindir,%_datadir/pixmaps,%_datadir/applications,%_datadir/%progname,%_defaultdocdir/%progname}
make DESTDIR=%{buildroot} install
@@ -87,19 +99,19 @@
mv %buildroot/%_datadir/doc/%progname/* %buildroot/%_defaultdocdir/%progname/
rm -rf %buildroot/%_datadir/doc/%progname
# install desktop file
-%suse_update_desktop_file -i tuxmath Education Math
+%suse_update_desktop_file -i %progname Education Math
%fdupes -s %buildroot
%endif
%if 0%{?fedora_version}
# install desktop file
desktop-file-install --vendor="%{vendor}" \
--dir=%buildroot/%_datadir/applications \
- tuxmath.desktop
+ %progname.desktop
%endif
%if 0%{?mandriva_version}
desktop-file-install --vendor="%{vendor}" \
--dir=%buildroot/%_datadir/applications \
- tuxmath.desktop
+ %progname.desktop
%endif
# remove invalid locale directories
rm -rf %buildroot/%{_datadir}/locale/en@*
@@ -116,7 +128,12 @@
%clean
rm -rf %buildroot
+
+
+# files section: ---------------------------------------------------------
+
%files -f %progname.lang
+
%defattr(-,root,root)
%doc %_defaultdocdir/%progname
%_bindir/*
Modified: tuxmath/trunk/tuxmath_preview.spec.in
===================================================================
--- tuxmath/trunk/tuxmath_preview.spec.in 2009-03-12 02:43:29 UTC (rev 936)
+++ tuxmath/trunk/tuxmath_preview.spec.in 2009-03-12 12:09:20 UTC (rev 937)
@@ -18,14 +18,13 @@
Name: @PACKAGE at _preview
Obsoletes: tuxmath = 2001.09.07
Obsoletes: tuxmath <= @VERSION@
-Provides: tuxmath = @VERSION@
-%define realname tuxmath
-%define progname tuxmath
+%define realname @PACKAGE@
+%define progname @PACKAGE@
Summary: Tux Math - educational math game
Version: @VERSION@
Release: 1
License: GPL
-Group: Productivity/Scientific/Math
+Group: Amusements/Teaching/Mathematics
Url: http://tux4kids.alioth.debian.org/
Vendor: openSUSE-Education
@@ -74,16 +73,28 @@
Sam 'Criswell' Hart
Larry Ewing
+
+
+# prep section: ---------------------------------------------------------
+
%prep
%setup -q -n %realname-%version
rm -rf $(find . -type d -name CVS)
rm -rf $(find . -type d -name .svn)
rm -rf $(find . -type d -name .xvpics)
+
+
+# build section: ---------------------------------------------------------
+
%build
%configure --disable-rpath
make %{?jobs:-j %jobs}
+
+
+# install section: ---------------------------------------------------------
+
%install
install -d %buildroot/{%_bindir,%_datadir/pixmaps,%_datadir/applications,%_datadir/%progname,%_defaultdocdir/%progname}
make DESTDIR=%{buildroot} install
@@ -94,19 +105,19 @@
mv %buildroot/%_datadir/doc/%progname/* %buildroot/%_defaultdocdir/%progname/
rm -rf %buildroot/%_datadir/doc/%progname
# install desktop file
-%suse_update_desktop_file -i tuxmath Education Math
+%suse_update_desktop_file -i %progname Education Math
%fdupes -s %buildroot
%endif
%if 0%{?fedora_version}
# install desktop file
desktop-file-install --vendor="%{vendor}" \
--dir=%buildroot/%_datadir/applications \
- tuxmath.desktop
+ %progname.desktop
%endif
%if 0%{?mandriva_version}
desktop-file-install --vendor="%{vendor}" \
--dir=%buildroot/%_datadir/applications \
- tuxmath.desktop
+ %progname.desktop
%endif
# remove invalid locale directories
rm -rf %buildroot/%{_datadir}/locale/en@*
@@ -123,7 +134,12 @@
%clean
rm -rf %buildroot
+
+
+# files section: ---------------------------------------------------------
+
%files -f %progname.lang
+
%defattr(-,root,root)
%doc %_defaultdocdir/%progname
%_bindir/*
More information about the Tux4kids-commits
mailing list