mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-12-25 05:55:34 +00:00
Provide our own patched AM_PYTHON_CHECK_VERSION that requires python <3.0
Use the python found by configure to build po files. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@40319 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
parent
5609c3a174
commit
5ea4f80d1a
@ -635,3 +635,24 @@ AC_DEFUN([LYX_SET_VERSION_INFO],
|
|||||||
AC_SUBST(LYX_DIR_VER,"$lyx_dir_ver")
|
AC_SUBST(LYX_DIR_VER,"$lyx_dir_ver")
|
||||||
AC_SUBST(LYX_USERDIR_VER,"$lyx_userdir_ver")
|
AC_SUBST(LYX_USERDIR_VER,"$lyx_userdir_ver")
|
||||||
])
|
])
|
||||||
|
|
||||||
|
# AM_PYTHON_CHECK_VERSION(PROG, VERSION, [ACTION-IF-TRUE], [ACTION-IF-FALSE])
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
# Copied from autoconf 2.68, added a check that python version is < 3.0
|
||||||
|
# Run ACTION-IF-TRUE if the Python interpreter PROG has version >= VERSION.
|
||||||
|
# Run ACTION-IF-FALSE otherwise.
|
||||||
|
# This test uses sys.hexversion instead of the string equivalent (first
|
||||||
|
# word of sys.version), in order to cope with versions such as 2.2c1.
|
||||||
|
# This supports Python 2.0 or higher. (2.0 was released on October 16, 2000).
|
||||||
|
AC_DEFUN([AM_PYTHON_CHECK_VERSION],
|
||||||
|
[prog="import sys
|
||||||
|
# split strings by '.' and convert to numeric. Append some zeros
|
||||||
|
# because we need at least 4 digits for the hex conversion.
|
||||||
|
# map returns an iterator in Python 3.0 and a list in 2.x
|
||||||
|
minver = list(map(int, '$2'.split('.'))) + [[0, 0, 0]]
|
||||||
|
minverhex = 0
|
||||||
|
maxverhex = 50331648 # = 3.0.0.0
|
||||||
|
# xrange is not present in Python 3.0 and range returns an iterator
|
||||||
|
for i in list(range(0, 4)): minverhex = (minverhex << 8) + minver[[i]]
|
||||||
|
sys.exit(sys.hexversion < minverhex or sys.hexversion >= maxverhex)"
|
||||||
|
AS_IF([AM_RUN_LOG([$1 -c "$prog"])], [$3], [$4])])
|
||||||
|
@ -14,6 +14,8 @@ PACKAGE = @PACKAGE@
|
|||||||
VERSION = @VERSION@
|
VERSION = @VERSION@
|
||||||
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
|
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
|
||||||
|
|
||||||
|
PYTHON = @PYTHON@
|
||||||
|
|
||||||
SHELL = /bin/sh
|
SHELL = /bin/sh
|
||||||
@SET_MAKE@
|
@SET_MAKE@
|
||||||
|
|
||||||
|
18
po/Rules-lyx
18
po/Rules-lyx
@ -23,34 +23,34 @@ l10n_pots: qt4_l10n.pot layouts_l10n.pot languages_l10n.pot encodings_l10n.pot u
|
|||||||
|
|
||||||
qt4_l10n.pot: $(top_srcdir)/src/frontends/qt4/ui/*.ui
|
qt4_l10n.pot: $(top_srcdir)/src/frontends/qt4/ui/*.ui
|
||||||
LC_ALL=C ; export LC_ALL ; \
|
LC_ALL=C ; export LC_ALL ; \
|
||||||
python $(srcdir)/lyx_pot.py -b $(top_srcdir) -o $@ -t qt4 ${top_srcdir}/src/frontends/qt4/ui/*.ui
|
$(PYTHON) $(srcdir)/lyx_pot.py -b $(top_srcdir) -o $@ -t qt4 ${top_srcdir}/src/frontends/qt4/ui/*.ui
|
||||||
|
|
||||||
layouts_l10n.pot: $(top_srcdir)/lib/layouts/*.layout $(top_srcdir)/lib/layouts/*.inc \
|
layouts_l10n.pot: $(top_srcdir)/lib/layouts/*.layout $(top_srcdir)/lib/layouts/*.inc \
|
||||||
$(top_srcdir)/lib/layouts/*.module
|
$(top_srcdir)/lib/layouts/*.module
|
||||||
LC_ALL=C ; export LC_ALL ; \
|
LC_ALL=C ; export LC_ALL ; \
|
||||||
python $(srcdir)/lyx_pot.py -b $(top_srcdir) -o $@ -t layouts ${top_srcdir}/lib/layouts/*.layout ${top_srcdir}/lib/layouts/*.inc ${top_srcdir}/lib/layouts/*.module
|
$(PYTHON) $(srcdir)/lyx_pot.py -b $(top_srcdir) -o $@ -t layouts ${top_srcdir}/lib/layouts/*.layout ${top_srcdir}/lib/layouts/*.inc ${top_srcdir}/lib/layouts/*.module
|
||||||
|
|
||||||
$(top_srcdir)/lib/layouttranslations: $(POFILES) $(top_srcdir)/lib/layouts/*.layout \
|
$(top_srcdir)/lib/layouttranslations: $(POFILES) $(top_srcdir)/lib/layouts/*.layout \
|
||||||
$(top_srcdir)/lib/layouts/*.inc $(top_srcdir)/lib/layouts/*.module
|
$(top_srcdir)/lib/layouts/*.inc $(top_srcdir)/lib/layouts/*.module
|
||||||
LC_ALL=C ; export LC_ALL ; \
|
LC_ALL=C ; export LC_ALL ; \
|
||||||
python $(srcdir)/lyx_pot.py -b $(top_srcdir) -o $@ -t layouttranslations ${top_srcdir}/lib/layouts/*.layout ${top_srcdir}/lib/layouts/*.inc ${top_srcdir}/lib/layouts/*.module
|
$(PYTHON) $(srcdir)/lyx_pot.py -b $(top_srcdir) -o $@ -t layouttranslations ${top_srcdir}/lib/layouts/*.layout ${top_srcdir}/lib/layouts/*.inc ${top_srcdir}/lib/layouts/*.module
|
||||||
|
|
||||||
languages_l10n.pot: $(top_srcdir)/lib/languages
|
languages_l10n.pot: $(top_srcdir)/lib/languages
|
||||||
python $(srcdir)/lyx_pot.py -b $(top_srcdir) -o $@ -t languages ${top_srcdir}/lib/languages
|
$(PYTHON) $(srcdir)/lyx_pot.py -b $(top_srcdir) -o $@ -t languages ${top_srcdir}/lib/languages
|
||||||
|
|
||||||
encodings_l10n.pot: $(top_srcdir)/lib/encodings
|
encodings_l10n.pot: $(top_srcdir)/lib/encodings
|
||||||
python $(srcdir)/lyx_pot.py -b $(top_srcdir) -o $@ -t encodings ${top_srcdir}/lib/encodings
|
$(PYTHON) $(srcdir)/lyx_pot.py -b $(top_srcdir) -o $@ -t encodings ${top_srcdir}/lib/encodings
|
||||||
|
|
||||||
ui_l10n.pot: $(top_srcdir)/lib/ui/*.ui $(top_srcdir)/lib/ui/*.inc
|
ui_l10n.pot: $(top_srcdir)/lib/ui/*.ui $(top_srcdir)/lib/ui/*.inc
|
||||||
LC_ALL=C ; export LC_ALL ; \
|
LC_ALL=C ; export LC_ALL ; \
|
||||||
python $(srcdir)/lyx_pot.py -b $(top_srcdir) -o $@ -t ui ${top_srcdir}/lib/ui/*.ui ${top_srcdir}/lib/ui/*.inc
|
$(PYTHON) $(srcdir)/lyx_pot.py -b $(top_srcdir) -o $@ -t ui ${top_srcdir}/lib/ui/*.ui ${top_srcdir}/lib/ui/*.inc
|
||||||
|
|
||||||
external_l10n.pot: $(top_srcdir)/lib/external_templates
|
external_l10n.pot: $(top_srcdir)/lib/external_templates
|
||||||
python $(srcdir)/lyx_pot.py -b $(top_srcdir) -o $@ -t external ${top_srcdir}/lib/external_templates
|
$(PYTHON) $(srcdir)/lyx_pot.py -b $(top_srcdir) -o $@ -t external ${top_srcdir}/lib/external_templates
|
||||||
|
|
||||||
formats_l10n.pot: $(top_srcdir)/lib/configure.py
|
formats_l10n.pot: $(top_srcdir)/lib/configure.py
|
||||||
python $(srcdir)/lyx_pot.py -b $(top_srcdir) -o $@ -t formats ${top_srcdir}/lib/configure.py
|
$(PYTHON) $(srcdir)/lyx_pot.py -b $(top_srcdir) -o $@ -t formats ${top_srcdir}/lib/configure.py
|
||||||
|
|
||||||
# LyX specific code to generate l10n statistics for the web site
|
# LyX specific code to generate l10n statistics for the web site
|
||||||
i18n.inc: $(POFILES) postats.py
|
i18n.inc: $(POFILES) postats.py
|
||||||
(cd $(srcdir) ; python postats.py "$(VERSION)" $(POFILES)) >$@
|
(cd $(srcdir) ; $(PYTHON) postats.py "$(VERSION)" $(POFILES)) >$@
|
||||||
|
@ -38,6 +38,8 @@ What's new
|
|||||||
|
|
||||||
* BUILD/INSTALLATION
|
* BUILD/INSTALLATION
|
||||||
|
|
||||||
|
- Make sure that we detect and use python 2 on systems where python 3
|
||||||
|
is the default python interpreter.
|
||||||
|
|
||||||
|
|
||||||
** Bug fixes:
|
** Bug fixes:
|
||||||
|
Loading…
Reference in New Issue
Block a user