Commit b6efa70a authored by Kirill Smelkov's avatar Kirill Smelkov

Cloudooo uses both py2 and py3 simultaneously

parent 589ca02a
......@@ -311,10 +311,12 @@ def namever(url, failonerr=True): # -> (name, ver) | None if !failonerr
# originally from https://sourceforge.net/projects/swig/files/swig/swig-3.0.12/swig-3.0.12.tar.gz/download
ver = del_tgztail(ver)
ver = removeprefix(ver, 'v')
# XXX hack: in ERP5 SR we use both readline8 and readline-5
# XXX in Cloudooo SR ----//---- libpng16 and libpng12
# XXX hack: ERP5 SR uses both readline8 and readline-5
# XXX Cloudooo SR ----//---- libpng16 and libpng12
# XXX Cloudooo SR ----//---- python2 and python3
if name == 'readline' and ver.startswith('5'): name += '5'
if name == 'libpng' and ver.startswith('1.2'): name += '12'
if name == 'Python' and ver.startswith('3'): name += '3'
return name, ver
def _namever(url, failonerr):
......
......@@ -308,6 +308,7 @@ recipe = plone.recipe.command
# readline 8 and 5 used simultaneously -> older one is presented as readline5
# libpng 12 and 16 used simultaneously -> ----//---- libpng12
# ----/---- Python2 and Python3
case1("""\
[readline]
recipe = slapos.recipe.cmmi
......@@ -323,7 +324,15 @@ url = http://download.sourceforge.net/libpng/libpng-1.6.37.tar.xz
recipe = slapos.recipe.cmmi
url = http://download.sourceforge.net/libpng/libpng-1.2.59.tar.xz
[python2.7]
recipe = slapos.recipe.cmmi
url = http://www.python.org/ftp/python/2.7.18/Python-2.7.18.tar.xz
[python3]
recipe = slapos.recipe.cmmi
url = https://www.python.org/ftp/python/3.9.15/Python-3.9.15.tar.xz
""", """\
Python 2.7.18 http://www.python.org/ftp/python/2.7.18/Python-2.7.18.tar.xz
Python3 3.9.15 https://www.python.org/ftp/python/3.9.15/Python-3.9.15.tar.xz
libpng 1.6.37 http://download.sourceforge.net/libpng/libpng-1.6.37.tar.xz
libpng12 1.2.59 http://download.sourceforge.net/libpng/libpng-1.2.59.tar.xz
readline 8.1 http://ftp.gnu.org/gnu/readline/readline-8.1.tar.gz
......
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