Commit bd5ffc8d authored by Oskar Skog's avatar Oskar Skog

0.2.9: Bunch of minor stuff

parent c5259086
2016-07-14 Oskar Skog <[email protected]>
0.2.9
* INSTALL: Updated
* enginecfg.default: Added the hiscores key.
* cygwin-sshd:
- Added "Things that will be done:" to avoid confusion.
- exit 0 instead of fatal if the user aborts.
* Makefile.static:
- Added DESTDIR to HISCORE_FILE
- install-dirs now installs CFG_DIR and $(DESTDIR)$(vargamesdir)
0.2.8
* configure.py: New functions: find_sysconfdir and find_vargamesdir.
* anonymine.py, configure.py, Makefile.static: Place configuration
......
......@@ -95,7 +95,7 @@ ADVANCED INSTALLATION
configure will also accept these short options:
-f Force; write the Makefile even if there were errors.
-v verbose
-v verbose; this also affects the Makefile
-w Use sys.prefix as prefix. (For quickly removing old
versions.)
......@@ -113,9 +113,12 @@ ADVANCED INSTALLATION
-------- --------------------------
prefix sys.prefix
bindir $(prefix)/bin NOTICE: may not work as expected.
bindir $(prefix)/bin # NOTE 1
gamesdir $(prefix)/games
libdir $(prefix)/lib
localstatedir $(prefix)/var, /var
sysconfdir $(prefix)/etc, /etc # NOTE 2
vargamesdir $(localstatedir)/games, $(localstatedir)
EXECUTABLES This program will be installed in $(gamesdir)
MODULES See its own subsection
......@@ -129,10 +132,16 @@ ADVANCED INSTALLATION
macosx Empty=false, non-empty=true; Mac OS X
windows Empty=false, non-empty=true; Windows (Cygwin)
verbose If set to true (default), make will be verbose
NOTE 1
gamesdir will override bindir if possible, so setting bindir
might have no effect
prefix, bindir and libdir:
NOTE 2
The game itself only tests for sys.prefix+'/etc' and '/etc'.
./configure will fails if sysconfdir is not usable by the game.
prefix, bindir and libdir, localstatedir, sysconfdir:
http://www.gnu.org/prep/standards/html_node/Directory-Variables.html
DESTDIR
......@@ -148,6 +157,11 @@ ADVANCED INSTALLATION
Both of these default to the current working directory.
sysconfdir
Configuration files will be stored in $(sysconfdir)/anonymine/
vargamesdir
The highscores file is $(vargamesdir)/anonymine
EXECUTABLES
===========
......
......@@ -12,10 +12,10 @@
NAME := anonymine
NAME_C := Anonymine
DESCRIPTION = Minesweeper without guessing
VERSION := 0.2.8
VERSION := 0.2.9
# Three more variables are required: EXECUTABLES and MODULES
# and MODULES_OTHERVER (= "non-existent").
# Five more variables are required: sysconfdir, vargamesdir, EXECUTABLES and
# MODULES, and MODULES_OTHERVER which may be set to "non-existent".
# They will be prepended to the actual Makefile by the "configure" script.
# srcdir, builddir and DESTDIR may also be prepended by the "configure"
......@@ -50,7 +50,7 @@ MAIN_SRC := $(srcdir)$(NAME).py
MAIN_STAGE := $(builddir)$(NAME)
MAIN_DEST := $(DESTDIR)$(EXECUTABLES)/$(NAME)
HISCORE_FILE := $(vargamesdir)/anonymine
HISCORE_FILE := $(DESTDIR)$(vargamesdir)/anonymine
ENGINECFG_STAGE := $(builddir)enginecfg.out
# freedesktop.org, see desktop/README
......@@ -146,7 +146,7 @@ check-install-cfg : FORCE
@$(PRE_INSTALL)
@: # Cause installation to fail if the configuration is incompatible.
@$(info) 'Installing or checking configuration'
@$(INSTALL) -d "$(CFG_DIR)"
@: #$(INSTALL) -d "$(CFG_DIR)"
@$(INSTALL_CFG) "$(srcdir)cursescfg" "$(CFG_DIR)/cursescfg"
@$(INSTALL_CFG) "$(ENGINECFG_STAGE)" "$(CFG_DIR)/enginecfg"
......@@ -158,6 +158,8 @@ overwrite-cfg: FORCE
install-dirs : FORCE
@$(info) 'Installing directories'
@mkdir -p "$(CFG_DIR)" || true
@mkdir -p "$(DESTDIR)$(vargamesdir)" || true
@mkdir -p "$(DESTDIR)$(EXECUTABLES)" || true
@mkdir -p "$(DESTDIR)$(MODULES)" || true
@if [ "$(MODULES_OTHERVER)" != "non-existent" ]; then \
......
......@@ -104,7 +104,6 @@ Asterisk marks that the file will be created during building.
configure.py Used internally by configure
cursescfg The configuration file for the curses interface
enginecfg The configuration file for the game's engine
gedanken Thoughts...
install-cfg Script for installing configuration files
test.py Misc small unnecessary functions: demos, etc
desktop/ Non-essential files for the graphical environments:
......
......@@ -63,7 +63,7 @@ except:
GAME_NAME = 'Anonymine'
GAME_FILENAME = GAME_NAME.lower().replace(' ', '-')
GAME_VERSION = (0, 2, 8)
GAME_VERSION = (0, 2, 9)
# GAME_VERSION MAY lag behind the version of the package when no change has
# been made to this file.
GAME_CRAPTEXT = """{0} version {1}.{2}.{3}
......
......@@ -11,7 +11,7 @@ if [ $# -eq 1 ]; then
done
for version_option in -V --version; do
if [ "$1" = $version_option ]; then
echo Anonymine 0.2.8
echo Anonymine 0.2.9
echo Handmade configure and configure.py
echo Version info from ./configure may lag behind.
exit
......
......@@ -115,7 +115,7 @@
# be a positive integer.
# [1]: character (Required by all keys except 'number', 'grid'
# and 'text'. For these three, the character will be
# ignored. 'background' will also be ignore due to BUG #7)
# ignored. 'background' will also be ignored due to BUG #7)
# [2]: foreground color; valid colors are: "BLACK", "BLUE",
# "GREEN", "CYAN", "RED", "MAGENTA", "YELLOW" and
# "WHITE".
......
......@@ -48,6 +48,7 @@ as any other user than the one you create to play Anonymine on mobile devices.
If you are installing something else at the same time, race conditions
may occur, and if they do, they will probably be quite nasty.
Things that will be done:
- Install 'openssh' and 'cygrunsrv' with /setup.exe
- Run 'ssh-host-config' (which will do various things)
- Modify '/etc/sshd_config'
......@@ -134,7 +135,7 @@ __EOF__
error 'The SSH server seems to be configured already.'
error "The AllowUsers key was found in /etc/sshd_config"
ask "Configure manually" || fatal "Can't configure the SSH daemon."
ask "Continue installation" || fatal
ask "Continue installation" || exit 0
fi
# Launch SSH daemon
......
......@@ -7,4 +7,11 @@
# than one and a half minute.
'sec-maxarea': 10000, # Crash if a huge field is requested.
},
'hiscores': {
'file': '/var/games/anonymine',
'maxsize': 524288,
'entries': 10,
'use-user': True,
'use-nick': True,
},
}
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment