Commit c5f851ca authored by Hugo Lefeuvre's avatar Hugo Lefeuvre

New upstream version 2.1.2

parent 5b2ab54c

Too many changes to show.

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

......@@ -22,3 +22,10 @@ Matthew Hohlfeld <hohlfeld@cs.ucsd.edu>
Nicola Larosa
John Stoneham <obijohn99@aol.com>
David Svoboda <svoboda@users.sourceforge.net>
Translations
============
Holger Schäkel <Holger@Schaekel-row.de> (de)
Jerzy Trzeciak <artusek@wp.pl> (pl)
......@@ -4,7 +4,7 @@
## code
##
include pysol.py setup.py setup_osx.py setup.cfg MANIFEST.in Makefile
include COPYING README AUTHORS
include COPYING README.md AUTHORS
#recursive-include pysollib *.py
include pysollib/*.py pysollib/macosx/*.py pysollib/configobj/*.py
include pysollib/winsystems/*.py
......@@ -15,6 +15,7 @@ include data/tcl/*.tcl
include data/pysol.desktop
include data/pysolfc.glade
graft data/themes
recursive-exclude data/themes *.py
include scripts/build.bat scripts/create_iss.py scripts/mahjongg_utils.py
include scripts/pygettext.py scripts/all_games.py scripts/cardset_viewer.py
#graft data/plugins
......
......@@ -7,7 +7,10 @@ PYSOLLIB_FILES=pysollib/tk/*.py pysollib/tile/*.py pysollib/*.py \
pysollib/games/*.py pysollib/games/special/*.py \
pysollib/games/ultra/*.py pysollib/games/mahjongg/*.py
.PHONY : install dist all_games_html rules pot mo
.PHONY : all install dist all_games_html rules pot mo
all:
@echo "No default target"
install:
python setup.py install
......@@ -19,21 +22,21 @@ rpm: all_games_html rules mo
python setup.py bdist_rpm
all_games_html:
./scripts/all_games.py > docs/all_games.html
PYTHONPATH=`pwd` ./scripts/all_games.py > docs/all_games.html
rules:
(cd html-src && ./gen-html.py)
export PYTHONPATH=`pwd`; (cd html-src && ./gen-html.py)
cp -r html-src/images html-src/html
rm -rf data/html
mv html-src/html data
pot:
./scripts/all_games.py gettext > po/games.pot
./scripts/pygettext.py -k n_ --ngettext-keyword ungettext -o po/pysol-1.pot $(PYSOLLIB_FILES)
PYTHONPATH=`pwd` ./scripts/all_games.py gettext > po/games.pot
PYTHONPATH=`pwd` ./scripts/pygettext.py -k n_ --ngettext-keyword ungettext -o po/pysol-1.pot $(PYSOLLIB_FILES)
xgettext -L C --keyword=N_ -o po/pysol-2.pot data/glade-translations
msgcat po/pysol-1.pot po/pysol-2.pot > po/pysol.pot
rm -f po/pysol-1.pot po/pysol-2.pot
for lng in ru; do \
for lng in ru pl; do \
mv -f po/$${lng}_pysol.po po/$${lng}_pysol.old.po; \
msgmerge po/$${lng}_pysol.old.po po/pysol.pot > po/$${lng}_pysol.po; \
rm -f po/$${lng}_pysol.old.po; \
......@@ -43,8 +46,35 @@ pot:
done
mo:
test -d locale/ru/LC_MESSAGES || mkdir -p locale/ru/LC_MESSAGES
test -d locale/ru_RU/LC_MESSAGES || mkdir -p locale/ru_RU/LC_MESSAGES
msgcat po/ru_games.po po/ru_pysol.po > po/ru.po 2>/dev/null
msgfmt -o locale/ru/LC_MESSAGES/pysol.mo po/ru.po
for loc in ru ru_RU de de_AT de_BE de_DE de_LU de_CH pl pl_PL it it_IT; do \
test -d locale/$${loc}/LC_MESSAGES || mkdir -p locale/$${loc}/LC_MESSAGES; \
done
for lang in ru pl it; do \
msgcat --use-first po/$${lang}_games.po po/$${lang}_pysol.po > po/$${lang}.po 2>/dev/null; \
done
for lang in ru de pl it; do \
msgfmt -o locale/$${lang}/LC_MESSAGES/pysol.mo po/$${lang}.po; \
done
cp -f locale/ru/LC_MESSAGES/pysol.mo locale/ru_RU/LC_MESSAGES/pysol.mo
for dir in de_AT de_BE de_DE de_LU de_CH; do \
cp -f locale/de/LC_MESSAGES/pysol.mo locale/$${dir}/LC_MESSAGES/pysol.mo; \
done
cp -f locale/pl/LC_MESSAGES/pysol.mo locale/pl_PL/LC_MESSAGES/pysol.mo
cp -f locale/it/LC_MESSAGES/pysol.mo locale/it_IT/LC_MESSAGES/pysol.mo
pretest:
@rm -f tests/individually-importing/*.py # To avoid stray files
python scripts/gen_individual_importing_tests.py
TEST_ENV = PYTHONPATH="`pwd`:`pwd`/tests/lib"
TEST_FILES = tests/style/*.t tests/board_gen/*.py tests/individually-importing/*.py
define RUN_TESTS
$(TEST_ENV) $1 $(TEST_FILES)
endef
test: pretest
$(call RUN_TESTS,prove)
runtest: pretest
$(call RUN_TESTS,runprove)
Metadata-Version: 1.0
Name: PySolFC
Version: 2.0
Version: 2.1.2
Summary: a Python solitaire game collection
Home-page: http://pysolfc.sourceforge.net/
Author: Skomoroh
......
PySol Fan Club edition
======================
Requirements.
-------------
- Python (2.4 or later) (NB: python 2.6.0 has a bug, use 2.6.1 instead)
- Tkinter (Tcl/Tk 8.4 or later)
** for sound support (optional) **
- PySol-Sound-Server: http://www.pysol.org/ (mp3, wav, tracker music)
or
- PyGame: http://www.pygame.org/ (mp3, ogg, wav, midi, tracker music)
** other packages (optional) **
- Tile (ttk): http://tktable.sourceforge.net/tile/ (0.8.0 or later)
- PIL (Python Imaging Library): http://www.pythonware.com/products/pil
- Freecell Solver: http://fc-solve.berlios.de/
Installation.
-------------
See: http://www.python.org/doc/current/inst/
or just run from the source directory:
$ python pysol.py
** Freecell Solver **
If you want to use Solver, you should configure freecell-solver with following
options:
--enable-max-num-freecells=8
--enable-max-num-stacks=20
--enable-max-num-initial-cards-per-stack=60
(or edit config.h)
Install Extras.
---------------
** Music **
- Copy some music files (mp3 for example) to ~/.PySolFC/music/
- Original PySol music can be download from:
ftp://ibiblio.org/pub/linux/games/solitaires/pysol-music-4.40.tar.gz
** Cardsets **
- Copy cardsets to ~/.PySolFC/cardsets
- Additional cardsets can be downloaded from the PySolFC project page:
http://sourceforge.net/project/showfiles.php?group_id=150718
# PySol Fan Club edition
This is an open source and portable (Windows, Linux and Mac OS X) collection
of Card Solitaire/Patience games written in Python. It is based on
http://pysolfc.sourceforge.net/ .
This is a maintenance branch of PySol FC by [Shlomi
Fish](http://www.shlomifish.org/) and by some other
people, aiming to clean up the code, add features, fix bugs, port to Python
3, and implement other enhancements.
[![Build Status](https://travis-ci.org/shlomif/PySolFC.svg)](https://travis-ci.org/shlomif/PySolFC)
# Screenshots
![Image](<http://i.imgur.com/jQkTGwf.jpg>)
## Requirements.
- Python (2.4 or later) (NB: CPython 2.6.0 has a bug, use 2.6.1 instead)
- Tkinter (Tcl/Tk 8.4 or later)
- For sound support (optional)
- PySol-Sound-Server: http://www.pysol.org/ (mp3, wav, tracker music)
or
- PyGame: http://www.pygame.org/ (mp3, ogg, wav, midi, tracker music)
- Other packages (optional):
- Tile (ttk): http://tktable.sourceforge.net/tile/ (0.8.0 or later)
- PIL (Python Imaging Library): http://www.pythonware.com/products/pil
- Freecell Solver: http://fc-solve.shlomifish.org/ .
- [Black Hole Solitaire Solver](http://www.shlomifish.org/open-source/projects/black-hole-solitaire-solver/)
## Installation.
See: http://www.python.org/doc/current/inst/
### Running from source without installation.
You can run from the source directory:
$ python pysol.py
After following steps similar to these (on
[Mageia Linux](http://www.mageia.org/) ):
#### Step 1 - install the dependencies
On Mageia you can do:
```
$ sudo urpmi git make pygtk2 pygtk2.0-libglade gnome-python-canvas tkinter
```
On Debian / Ubuntu / etc. you can do:
```
$ sudo apt-get install -y ack-grep cpanminus libperl-dev make perl python-glade2 python-gnome2 python-gnome2-dev python-gtk2 python-setuptools python-tk
```
#### Step 2 - build PySol.
```
$ git clone https://github.com/shlomif/PySolFC.git
$ cd PySolFC
$ sudo urpmi tkinter
$ sudo urpmi pygtk2
$ sudo urpmi pygtk2.0-libglade
$ sudo urpmi gnome-python-canvas
$ gmake test
$ ln -s html-src html
$ ln -s data/images images
$ tar -xvf PySolFC-Cardsets-2.0.tar.bz2 # Need to be downloaded from sourceforge
$ mkdir -p ~/.PySolFC
$ rmdir ~/.PySolFC/cardsets
$ ln -s "`pwd`/PySolFC-Cardsets-2.0" ~/.PySolFC/cardsets
$ python pysol.py
```
<b>Note!</b> If you are using a Debian derivative (e.g: Debian, Ubuntu, or
Linu Mint) and you are getting an error of "No cardsets were found !!! Main
data directory is `[insert dir here]` Please check your PySol installation.",
then you likely installed the cardsets package which has removed some files
that are needed by pysol from source (without the debian modifications).
Please uninstall that package and use the cardsets archive from sourceforge.net
per the instructions above.
### Configuring Freecell Solver
If you want to use the solver, you should configure freecell-solver
( http://fc-solve.shlomifish.org/ ) by passing the following options
to its CMake-based build-system:
`-DMAX_NUM_FREECELLS=8 -DMAX_NUM_STACKS=20 -DMAX_NUM_INITIAL_CARDS_IN_A_STACK=60`.
## Install Extras.
- Music
- Copy some music files (mp3 for example) to ~/.PySolFC/music/
- Original PySol music can be downloaded from:
ftp://ibiblio.org/pub/linux/games/solitaires/pysol-music-4.40.tar.gz
- Cardsets
- Copy cardsets to ~/.PySolFC/cardsets
- Additional cardsets can be downloaded from the PySolFC project page:
http://sourceforge.net/project/showfiles.php?group_id=150718
## Chat
To facilitate coordination about contributing to PySol, please join us for a
real time Internet chat on
the <a href="irc://irc.freenode.net/##pysol">##pysol</a> chat room on
[Freenode](http://freenode.net/) (note the double
octhothorpe/hash-sign/pound-sign) . We may set up
chat rooms on different services in the future.