Commit ddc7d760 authored by Oskar Skog's avatar Oskar Skog

Pre 0.4.8: Use PyPy instead of CPython if possible

parent c2aacc2d
......@@ -7,6 +7,9 @@
* Makefile.static (all etc), mk-symlinks: New file mk-symlinks that
creates $(builddir)symlinks which creates the symlinks using a
new method.
* configure, configure.py, Makefile.static ($(MAIN_STAGE)), INSTALL:
Use PyPy is possible; New Makefile variable: $(python);
./reconfigure will use sys.executable.
2016-12-18 Oskar Skog <oskar.skog.finland@gmail.com>
0.4.7
......
......@@ -131,6 +131,8 @@ Advanced installation
sysconfdir $(prefix)/etc, /etc
vargamesdir $(localstatedir)/games, $(localstatedir)
python Path to the Python interpreter.
EXECUTABLES This program will be installed in $(gamesdir)
MODULES See its own subsection
......@@ -158,6 +160,10 @@ Advanced installation
vargamesdir
The highscores file is $(vargamesdir)/anonymine
python
Can be set to use a different version/implementation than what
./configure has chosen automatically.
EXECUTABLES
===========
......
......@@ -108,7 +108,7 @@ $(builddir)Makefile.vars : $(srcdir)configure $(srcdir)configure.py
$(MAIN_STAGE) : $(MAIN_SRC) $(builddir)Makefile
@$(info) 'Creating the appropriate shebang line'
@echo "#!`which python`" > "$(MAIN_STAGE)"
@echo "#!$(python)" > "$(MAIN_STAGE)"
@sed -e "$(MAIN_STAGE_SED1)" "$(MAIN_SRC)" \
| sed -e "$(MAIN_STAGE_SED2)" >> "$(MAIN_STAGE)"
......
0.4.8
- PyPy will be used instead of CPython if possible.
- New Makefile/configure variable: "python" the path to the desired
Python interpreter.
- MODULES_OTHERVER has been removed from configure and Makefile.
0.4.5 - 0.4.7
- Avoid 0.4.5 and 0.4.6, use 0.4.7 instead, the issues #16 and #17 were
not fixed correctly.
......
......@@ -11,11 +11,18 @@ if [ $# -eq 1 ]; then
done
for version_option in -V --version; do
if [ "$1" = $version_option ]; then
echo Anonymine `grep 'VERSION := ' Makefile.static | cut -d= -f2`
echo Handmade configure and configure.py
exit
echo "Anonymine $(grep 'VERSION := ' Makefile.static |cut -d= -f2)"
echo "Handmade configure and configure.py"
exit 0
fi
done
fi
python configure.py "$@"
for python_version in pypy3 pypy python3 python; do
"$python_version" -c '' 2>/dev/null || continue
"$python_version" configure.py "$@"
exit 0
done
echo "No Python version found" >&2
exit 1
......@@ -489,6 +489,7 @@ def main():
Makefile = {
'srcdir': '', # REQUIRED
'builddir': '', # REQUIRED
'python': sys.executable,
'gamesdir': '$(prefix)/games',
'bindir': '$(prefix)/bin',
'libdir': '$(prefix)/lib',
......@@ -582,10 +583,10 @@ def main():
v('Writing "' + reconfigure_name + '"...')
reconfigure_f = open(reconfigure_name, 'w')
reconfigure_f.write(
'#!/bin/sh\n'
'cd ' + shellescape(Makefile['srcdir']) + ' && ./configure'
)
reconfigure_f.write('#!/bin/sh\ncd {0} && {1} configure.py'.format(
shellescape(Makefile['srcdir']),
shellescape(sys.executable)
))
for arg in reconfigure_argv:
reconfigure_f.write(' ' + shellescape(arg))
reconfigure_f.write('\n')
......
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