From e9ccc0f526b1c2ca9e5018b28b79898a093ab262 Mon Sep 17 00:00:00 2001 From: david Date: Fri, 31 Mar 2023 10:10:13 +0200 Subject: [PATCH] Add python-3.10.10-0 install higher versions for some package add fix versions of packages, because of dependencies add ascciidoc --- python-3.10.10-0.build.sh | 268 +++++++++++++++++++++----------------- 1 file changed, 148 insertions(+), 120 deletions(-) mode change 100644 => 100755 python-3.10.10-0.build.sh diff --git a/python-3.10.10-0.build.sh b/python-3.10.10-0.build.sh old mode 100644 new mode 100755 index 7343426..d66a827 --- a/python-3.10.10-0.build.sh +++ b/python-3.10.10-0.build.sh @@ -8,12 +8,14 @@ # ---------------------------------------------------------------- Preamble +#set -x + PKG=python -VERSION=3.10.8 +VERSION=3.10.10 BUILD=0 PYTHONVER=${VERSION%.*} -CUDADIR=/pkg/cuda-11.5.2-0 +CUDADIR=/pkg/cuda-11.7.1-0 PREFIX=/pkg/$PKG-$VERSION-$BUILD if [ -n "$TESTING" ]; then PREFIX=/scratch/local2/$PKG-$VERSION-$BUILD ; fi @@ -83,10 +85,11 @@ function install() { # ---------------------------------------- Build Python & support libraries ( - # orig: https://www.python.org/ftp/python/3.10.8/Python-3.10.8.tgz - BEEHIVE=https://beehive.molgen.mpg.de/fbe3fff11893916ad1756b15c8a48834/Python-3.10.8.tgz - test -e Python-$VERSION.tgz || wget -nv $BEEHIVE - test -d Python-$VERSION || tar -xf Python-$VERSION.tgz + # orig: https://www.python.org/ftp/python/3.10.10/Python-3.10.10.tar.xz + BEEHIVE=https://beehive.molgen.mpg.de/7bf85df71bbe7f95e5370b983e6ae684/Python-3.10.10.tar.xz + + test -e Python-$VERSION.tar.xz || wget -nv $BEEHIVE + test -d Python-$VERSION || tar -xf Python-$VERSION.tar.xz cd Python-$VERSION # BerkeleyDB, the undead ... @@ -131,10 +134,11 @@ piplist; track START install meson ( - DBUS_PYTHON_VERSION=1.2.18 - - # https://files.pythonhosted.org/packages/b1/5c/ccfc167485806c1936f7d3ba97db6c448d0089c5746ba105b6eb22dba60e/dbus-python-1.2.18.tar.gz - BEEHIVE=https://beehive.molgen.mpg.de/468874f3bf61d1b7deac98bbe2cfd8ac/dbus-python-1.2.18.tar.gz + DBUS_PYTHON_VERSION=1.3.2 + + #PyPi + # https://files.pythonhosted.org/packages/c1/d3/6be85a9c772d6ebba0cc3ab37390dd6620006dcced758667e0217fb13307/dbus-python-1.3.2.tar.gz + BEEHIVE=https://beehive.molgen.mpg.de/33be8a4a766e1c7c9a377b8f934ce21a/dbus-python-1.3.2.tar.gz test -e dbus-python-$DBUS_PYTHON_VERSION.tar.gz || wget -nv $BEEHIVE test -d dbus-python-$DBUS_PYTHON_VERSION || tar -xf dbus-python-$DBUS_PYTHON_VERSION.tar.gz @@ -147,10 +151,11 @@ install meson ) ( - PYCAIRO_VERSION=1.21.0 - - # https://files.pythonhosted.org/packages/92/a4/506564f574fa74c90b98690e8ecc8dbae1629f31fcfe0be69de45d9e1605/pycairo-1.21.0.tar.gz - BEEHIVE=https://beehive.molgen.mpg.de/682238eaa8bd7032e36a20b6f53824d1/pycairo-1.21.0.tar.gz + PYCAIRO_VERSION=1.23.0 + + #PyPi + # https://files.pythonhosted.org/packages/69/ca/9e9fa2e8be0876a9bbf046a1be7ee33e61d4fdfbd1fd25c76c1bdfddf8c4/pycairo-1.23.0.tar.gz + BEEHIVE=https://beehive.molgen.mpg.de/7a3729d21659098e1b9a411b62e88966/pycairo-1.23.0.tar.gz test -e pycairo-$PYCAIRO_VERSION.tar.gz || wget -nv $BEEHIVE test -d pycairo-$PYCAIRO_VERSION || tar -xf pycairo-$PYCAIRO_VERSION.tar.gz @@ -170,10 +175,10 @@ install meson ) ( - PYGOBJECT3_VERSION=3.42.2 - - # https://files.pythonhosted.org/packages/fe/40/9afaeb8d3b453fb8596fcb6c7bc2b64e434868c91eda19955742778eff74/PyGObject-3.42.2.tar.gz - BEEHIVE=https://beehive.molgen.mpg.de/80ad843b2a49ccfcc30c6b756b755c09/PyGObject-3.42.2.tar.gz + PYGOBJECT3_VERSION=3.44.0 + + # https://files.pythonhosted.org/packages/07/73/a034fc1bcd6d402d6f72ff618c093f91ac6921f968cc19806b6a1b1b19c8/PyGObject-3.44.0.tar.gz + BEEHIVE=https://beehive.molgen.mpg.de/35d27b533be6a98c7f17ddb6bd0e87d6/PyGObject-3.44.0.tar.gz test -e PyGObject-$PYGOBJECT3_VERSION.tar.gz || wget -nv $BEEHIVE test -d PyGObject-$PYGOBJECT3_VERSION || tar -xf PyGObject-$PYGOBJECT3_VERSION.tar.gz @@ -196,18 +201,15 @@ piplist; track various pythonbindings # build support to use QT from python -- see www.riverbankcomputing.com ( # sip: tool to create Python bindings for C and C++ libraries. - SIP_VERSION=6.6.2 + SIP_VERSION=6.7.7 # https://files.pythonhosted.org/packages/5b/cb/c27c925ae07bd03a2597fa1db17bfc2a4ac57da61aeb90f8ec98ffbb975b/sip-6.6.2.tar.gz - BEEHIVE=https://beehive.molgen.mpg.de/620eb75a8b22fb6af9c6044aa015782d/sip-6.6.2.tar.gz + BEEHIVE=https://beehive.molgen.mpg.de/a131efd79649d31ee11601b19d1e3784/sip-6.7.7.tar.gz test -e sip-$SIP_VERSION.tar.gz || wget -nv $BEEHIVE test -d sip-$SIP_VERSION || tar -xf sip-$SIP_VERSION.tar.gz cd sip-$SIP_VERSION - sed -ne '/^#Epatch:sip1/ s/^#Epatch:\S* // p' $ME | patch -p1 --verbose - sed -ne '/^#Epatch:sip2/ s/^#Epatch:\S* // p' $ME | patch -p1 --verbose - python3 setup.py build python3 setup.py install --skip-build --optimize=1 @@ -219,10 +221,11 @@ install PyQt5-sip install PyQt-builder ( - PYQT_VERSION=5.15.7 + PYQT_VERSION=5.15.9 - # orig: https://files.pythonhosted.org/packages/e1/57/2023316578646e1adab903caab714708422f83a57f97eb34a5d13510f4e1/PyQt5-5.15.7.tar.gz - BEEHIVE=https://beehive.molgen.mpg.de/ae2c68e38b9b36fdf5f932419353a2b3/PyQt5-5.15.7.tar.gz + #PyPi + # orig: https://files.pythonhosted.org/packages/5c/46/b4b6eae1e24d9432905ef1d4e7c28b6610e28252527cdc38f2a75997d8b5/PyQt5-5.15.9.tar.gz + BEEHIVE=https://beehive.molgen.mpg.de/9d97fc06b7ae75e654e946c49e07ff12/PyQt5-5.15.9.tar.gz test -e PyQt5-$PYQT_VERSION.tar.gz || wget -nv $BEEHIVE test -d PyQt5-$PYQT_VERSION || tar -xf PyQt5-$PYQT_VERSION.tar.gz @@ -247,10 +250,10 @@ install PyQt-builder ) ( - QSCINTILLA_VERSION=2.13.4.dev2206171421 # no 2.14 in sight ... + QSCINTILLA_VERSION=2.13.4 # no 2.14 in sight ... - # orig: https://www.riverbankcomputing.com/static/Downloads/QScintilla/${PKGVERSION}/QScintilla_src-${PKGVERSION}.tar.gz - BEEHIVE=https://beehive.molgen.mpg.de/d196ebd441f40474dd7732d4d492de69/QScintilla_src-2.13.4.dev2206171421.tar.gz + # orig: https://www.riverbankcomputing.com/static/Downloads/QScintilla/2.13.4/QScintilla_src-2.13.4.tar.gz + BEEHIVE=https://beehive.molgen.mpg.de/4f83a4a4ad7da40eae80ad23f9fb18f2/QScintilla_src-2.13.4.tar.gz test -e QScintilla_src-$QSCINTILLA_VERSION.tar.gz || wget -nv $BEEHIVE test -d QScintilla_src-$QSCINTILLA_VERSION || tar -xf QScintilla_src-$QSCINTILLA_VERSION.tar.gz @@ -308,7 +311,8 @@ piplist; track legacy-libxml2 cd numba-$NUMBA_VERSION # numba assumes that libcudart.so and friends reside in 'CUDA_HOME/lib64' - sed -ne '/^#Epatch:numba/ s/^#Epatch:\S* // p' $ME | patch -p1 --verbose + sed -ne '/^#Epatch:numba1/ s/^#Epatch:\S* // p' $ME | patch -p1 --verbose + sed -ne '/^#Epatch:numba2/ s/^#Epatch:\S* // p' $ME | patch -p1 --verbose install . # useful to see if numba works cp -p numba/misc/numba_sysinfo.py $PREFIX/bin @@ -316,25 +320,27 @@ piplist; track legacy-libxml2 ) piplist; track numba - -# 'distributed' doesn't like the 'new' tornado 6.2 -- reason: a deprecation warning makes the CI choke (geht's noch?) +# ------------------------------------------------ build tool fuer Thomas ( - DISTRIBUTED_VERSION=2022.9.0 - - # orig: https://files.pythonhosted.org/packages/df/46/e8ef41f8dfd553327b6a12f4ab78d9351b54299596fe5b8b165ba40b1550/distributed-2022.9.0.tar.gz - BEEHIVE=https://beehive.molgen.mpg.de/335d718f1ba331ee8e85e40e564559a1/distributed-2022.9.0.tar.gz - test -e distributed-$DISTRIBUTED_VERSION.tar.gz || wget -nv $BEEHIVE - test -d distributed-$DISTRIBUTED_VERSION || tar -xf distributed-$DISTRIBUTED_VERSION.tar.gz - cd distributed-$DISTRIBUTED_VERSION - sed -i -e '/tornado/ s/.*/tornado/' requirements.txt - sed -i -e '/tornado/ s/.*/tornado/' distributed.egg-info/requires.txt - install . + GYP_VERSION=20230301_c6d8b9f7 + # orig: https://mirror.netcologne.de/slackware/slackware64-current/source/d/gyp/ + BEEHIVE=https://beehive.molgen.mpg.de/ba0357be23ca55555714261afccc7aab/gyp-20230301_c6d8b9f7.tar.xz + test -e gyp-${GYP_VERSION}.tar.xz || wget -nv $BEEHIVE + test -d gyp-${GYP_VERSION} || tar -xf gyp-${GYP_VERSION}.tar.xz + cd gyp-${GYP_VERSION} + sed -ne '/^#Epatch:gyp1/ s/^#Epatch:\S* // p' $ME | patch -p1 --verbose + sed -ne '/^#Epatch:gyp2/ s/^#Epatch:\S* // p' $ME | patch -p1 --verbose + python3 setup.py build + python3 setup.py install --prefix $PREFIX ) -piplist; track distributed and tornado +piplist; track gyp PACKAGES=$(sed -e s/#.*$// <<- __PKGLIST__ protobuf==3.19.4 # tensorflow likes to have an slightly older one [< 3.20], no conflicts with this - Matplotlib==3.6.0 # 3.6.1 is the first bugfix release of the 3.6.x series... Well, it is buggy + onnx==1.12.0 # newer onnx (dep helen) needs newer protobuf + Matplotlib==3.6.3 # 3.6.3 last bugfix for 4.6.x... Well, it is buggy, hopefullt not :) + keras==2.11.0 # tensorflow 2.11.1 requires keras<2.12,>=2.11.0 + Sphinx==4.5.0 # hic2cool(0.8.3) moecht gern was aelteres ipython[all] SciPy @@ -357,7 +363,6 @@ PACKAGES=$(sed -e s/#.*$// <<- __PKGLIST__ pygraphviz deeptools HTSeq - keras keras_preprocessing # tensorflow ... MotifScan # Alena 30.8.2018 MAmotif @@ -417,6 +422,7 @@ PACKAGES=$(sed -e s/#.*$// <<- __PKGLIST__ CrossMap cooltools # cause trouble with numba/nupy versions -- Maria Valieva 17.7.2019 scanpy + asciidoc __PKGLIST__ ) @@ -429,7 +435,7 @@ install pyopengl # Tk binding creates an error, so remove it (Expects Tk Togl in rm -rf ${PREFIX}/lib/python$PYTHONVER/site-packages/OpenGL/Tk # torch bundled with a recent CUDA-Toolkit -install torch torchvision torchaudio --extra-index-url https://download.pytorch.org/whl/cu116 +install torch torchvision torchaudio --extra-index-url https://download.pytorch.org/whl/cu118 # install helen after our torch, otherwise we might catch the default torch from pip ... install helen # HD, a dependency from a request by helene @@ -508,31 +514,34 @@ mkdir -vp $PREFIX/share/jupyter/lab/settings # try to defeat a silly error in j ) ( + IDR_VERSION=2.0.3 # orig: https://github.com/nboley/idr/archive/2.0.3/idr-2.0.3.tar.gz # HD: Tobias Zehnder, 18.3.21 BEEHIVE=https://beehive.molgen.mpg.de/1bec61b526bb1dcf92a5ab99c27852d0/idr-2.0.3.tar.gz - test -e idr-2.0.3.tar.gz || wget -nv $BEEHIVE - test -d idr-2.0.3 || tar -xf idr-2.0.3.tar.gz - cd idr-2.0.3 + test -e idr-${IDR_VERSION}.tar.gz || wget -nv $BEEHIVE + test -d idr-${IDR_VERSION} || tar -xf idr-${IDR_VERSION}.tar.gz + cd idr-${IDR_VERSION} python3 setup.py build python3 setup.py install --prefix $PREFIX ) ( + STGIT_VERSSION=1.0 # orig: https://github.com/stacked-git/stgit/archive/v1.0/stgit-1.0.tar.gz # Paul mariux64/pkg-scripts/issues/152 - BEEHIVE=https://beehive.molgen.mpg.de/b20ab5a197fc3a141f4b00c5859c0a3b/stgit-1.0.tar.gz - test -e stgit-1.0.tar.gz || wget -nv $BEEHIVE - test -d stgit-1.0 || tar -xf stgit-1.0.tar.gz - cd stgit-1.0 + BEEHIVE=https://beehive.molgen.mpg.de/b20ab5a197fc3a141f4b00c5859c0a3b/stgit-1.0.tar.gz + test -e stgit-${STGIT_VERSSION}.tar.gz || wget -nv $BEEHIVE + test -d stgit-${STGIT_VERSSION} || tar -xf stgit-${STGIT_VERSSION}.tar.gz + cd stgit-${STGIT_VERSSION} python3 setup.py build python3 setup.py install --prefix $PREFIX ) ( + METH_VERSION=0.2.5 # https://github.com/brentp/bwa-meth/archive/refs/tags/v0.2.5.tar.gz BEEHIVE=https://beehive.molgen.mpg.de/33a4c416760dd67e77f17e07791527e2/bwa-meth-0.2.5.tar.gz - test -e bwa-meth-0.2.5.tar.gz || wget -nv $BEEHIVE - test -d bwa-meth-0.2.5 || tar -xf bwa-meth-0.2.5.tar.gz - cd bwa-meth-0.2.5 + test -e bwa-meth-${METH_VERSION}.tar.gz || wget -nv $BEEHIVE + test -d bwa-meth-${METH_VERSION} || tar -xf bwa-meth-${METH_VERSION}.tar.gz + cd bwa-meth-${METH_VERSION} python3 setup.py build python3 setup.py install --prefix $PREFIX ) @@ -545,13 +554,13 @@ install wheel # to build our tf-wheel (i.e. zip archive) ( test -n "$SKIPTENSORFLOW" && exit - TFVERSION=2.10.0 + TFVERSION=2.11.1 NCCLSHORTVERSION=$(pkg-config nccl --modversion | grep -Po '\d+\.\d+') . /pkg/bazel-5.1.0-0/profile - # orig: https://github.com/tensorflow/tensorflow/archive/refs/tags/v2.10.0.tar.gz - BEEHIVE=https://beehive.molgen.mpg.de/7ceb5277d482f10d2df8644deb412061/tensorflow-2.10.0.tar.gz + # orig: https://github.com/tensorflow/tensorflow/archive/refs/tags/v2.11.1.tar.gz + BEEHIVE=https://beehive.molgen.mpg.de/e1b60c6e074f8b4c83f184e2c298774f/tensorflow-2.11.1.tar.gz test -e tensorflow-${TFVERSION}.tar.gz || wget -nv $BEEHIVE test -d tensorflow-${TFVERSION} || tar -xf tensorflow-${TFVERSION}.tar.gz @@ -594,7 +603,7 @@ install wheel # to build our tf-wheel (i.e. zip archive) export TF_CUDNN_VERSION=$(sed -n 's/^#define CUDNN_MAJOR\s*\(.*\).*/\1/p' ${CUDADIR}/include/cudnn_version.h) # hardware older than sm_52 is said to be unsupported, compute_86 denotes an emulation export TF_CUDA_COMPUTE_CAPABILITIES=sm_52,sm_53,sm_60,sm_61,sm_62,sm_70,sm_72,sm_75,sm_80,sm_86,compute_86 - + # stay compatible with the cluster machines export CC_OPT_FLAGS="-march=nehalem" export TF_NEED_CUDA=1 @@ -656,8 +665,11 @@ echo "# check for unreadable files" cd $PREFIX find \! -perm -004 -exec chmod -c a+r {} + -exit +echo "For Deeper checks:" +echo "cd ${BUILDDIR} ; git log --patch " + +exit # -------------------------------------------------------- Included patches #Epatch:pip # Operation 'Forever young', disable version-check per default. @@ -675,64 +687,80 @@ exit #Epatch:pip + help="Ignore this option, the version check IS disabled.", #Epatch:pip ) -# https://riverbankcomputing.com/hg/sip/raw-rev/1430b279a3c9 -> sip-fix-exceptions.patch -#Epatch:sip1 Fixed the handling of exceptions that sub-class C++ exceptions. -#Epatch:sip1 diff -r 6eff81a15822 -r 1430b279a3c9 sipbuild/generator/parser/rules.py -#Epatch:sip1 --- a/sipbuild/generator/parser/rules.py Fri Jun 17 14:25:16 2022 +0100 -#Epatch:sip1 +++ b/sipbuild/generator/parser/rules.py Sun Jun 26 10:01:41 2022 +0100 -#Epatch:sip1 @@ -2293,6 +2293,7 @@ -#Epatch:sip1 -#Epatch:sip1 if len(p) == 4: -#Epatch:sip1 base = p[2] -#Epatch:sip1 + base.make_absolute() -#Epatch:sip1 -#Epatch:sip1 # See if it is a project-defined exception. -#Epatch:sip1 for xd in p.parser.pm.spec.exceptions: - -# https://riverbankcomputing.com/hg/sip/raw-rev/323d39a2d602 -> sip-fix-template-values.patch -#Epatch:sip2 Fixed the instantiation of template values. -#Epatch:sip2 diff -r 1430b279a3c9 -r 323d39a2d602 sipbuild/generator/parser/instantiations.py -#Epatch:sip2 --- a/sipbuild/generator/parser/instantiations.py Sun Jun 26 10:01:41 2022 +0100 -#Epatch:sip2 +++ b/sipbuild/generator/parser/instantiations.py Sun Jul 17 09:41:16 2022 +0100 -#Epatch:sip2 @@ -434,7 +434,8 @@ -#Epatch:sip2 proto_name = proto_value.value.result.definition -#Epatch:sip2 -#Epatch:sip2 if proto_name.is_simple: -#Epatch:sip2 - i_name = ScopedName.parse(template_string(proto_name, expansions)) -#Epatch:sip2 + i_name = ScopedName.parse( -#Epatch:sip2 + template_string(proto_name.base_name, expansions)) -#Epatch:sip2 i_result = Argument(type=ArgumentType.DEFINED, definition=i_name) -#Epatch:sip2 i_fcall = FunctionCall(result=i_result, -#Epatch:sip2 args=proto_value.value.args) - -#Epatch:numba # Fix lib location, turn numba_sysinfo.py into a common diag tool -#Epatch:numba --- a/numba/cuda/cuda_paths.py 2022-10-14 09:57:25.616827200 +0200 -#Epatch:numba +++ b/numba/cuda/cuda_paths.py 2022-10-20 11:20:15.106019523 +0200 -#Epatch:numba @@ -66,3 +66,3 @@ -#Epatch:numba else: -#Epatch:numba - return 'lib64' -#Epatch:numba + return 'lib' -#Epatch:numba -#Epatch:numba --- a/numba/misc/numba_sysinfo.py 2022-10-14 09:57:25.628827000 +0200 -#Epatch:numba +++ b/numba/misc/numba_sysinfo.py 2022-10-20 11:02:54.056767540 +0200 -#Epatch:numba @@ -1 +1,2 @@ -#Epatch:numba +#! /usr/bin/env python3 -#Epatch:numba import json -#Epatch:numba @@ -367,3 +368,3 @@ -#Epatch:numba with redirect_stdout(output): -#Epatch:numba - cudadrv.libs.test(sys.platform, print_paths=False) -#Epatch:numba + cudadrv.libs.test(sys.platform, print_paths=True) -#Epatch:numba sys_info[_cu_lib_test] = output.getvalue() -#Epatch:numba @@ -626,9 +627,2 @@ -#Epatch:numba ("",), -#Epatch:numba - ("__Conda Information__",), -#Epatch:numba - (DisplayMap({k: v for k, v in info.items() -#Epatch:numba - if k.startswith('Conda')}) or ("Conda not available.",)), -#Epatch:numba - ("",), -#Epatch:numba - ("__Installed Packages__",), -#Epatch:numba - DisplaySeq(info.get(_inst_pkg, ("Couldn't retrieve packages info.",))), -#Epatch:numba - ("",), -#Epatch:numba ("__Error log__" if info.get(_errors, []) +#Epatch:numba1 # Fix lib location, turn numba_sysinfo.py into a common diag tool +#Epatch:numba1 --- a/numba/cuda/cuda_paths.py 2022-10-14 09:57:25.616827200 +0200 +#Epatch:numba1 +++ b/numba/cuda/cuda_paths.py 2022-10-20 11:20:15.106019523 +0200 +#Epatch:numba1 @@ -68,3 +68,3 @@ +#Epatch:numba1 else: +#Epatch:numba1 - return 'lib64' +#Epatch:numba1 + return 'lib' + +#Epatch:numba2 --- a/numba/misc/numba_sysinfo.py 2022-10-14 09:57:25.628827000 +0200 +#Epatch:numba2 +++ b/numba/misc/numba_sysinfo.py 2022-10-20 11:02:54.056767540 +0200 +#Epatch:numba2 @@ -1 +1,2 @@ +#Epatch:numba2 +#! /usr/bin/env python3 +#Epatch:numba2 import json +#Epatch:numba2 @@ -367,3 +368,3 @@ +#Epatch:numba2 with redirect_stdout(output): +#Epatch:numba2 - cudadrv.libs.test(sys.platform, print_paths=False) +#Epatch:numba2 + cudadrv.libs.test(sys.platform, print_paths=True) +#Epatch:numba2 sys_info[_cu_lib_test] = output.getvalue() +#Epatch:numba2 @@ -626,9 +627,2 @@ +#Epatch:numba2 ("",), +#Epatch:numba2 - ("__Conda Information__",), +#Epatch:numba2 - (DisplayMap({k: v for k, v in info.items() +#Epatch:numba2 - if k.startswith('Conda')}) or ("Conda not available.",)), +#Epatch:numba2 - ("",), +#Epatch:numba2 - ("__Installed Packages__",), +#Epatch:numba2 - DisplaySeq(info.get(_inst_pkg, ("Couldn't retrieve packages info.",))), +#Epatch:numba2 - ("",), +#Epatch:numba2 ("__Error log__" if info.get(_errors, []) + +#Epatch:gyp1 --- a/pylib/gyp/generator/cmake.py +#Epatch:gyp1 +++ b/pylib/gyp/generator/cmake.py +#Epatch:gyp1 @@ -40,9 +40,9 @@ +#Epatch:gyp1 +#Epatch:gyp1 try: +#Epatch:gyp1 # maketrans moved to str in python3. +#Epatch:gyp1 + _maketrans = str.maketrans +#Epatch:gyp1 +except NameError: +#Epatch:gyp1 _maketrans = string.maketrans +#Epatch:gyp1 -except NameError: +#Epatch:gyp1 - _maketrans = str.maketrans +#Epatch:gyp1 +#Epatch:gyp1 generator_default_variables = { +#Epatch:gyp1 'EXECUTABLE_PREFIX': '', +#Epatch:gyp1 @@ -281,7 +281,7 @@ +#Epatch:gyp1 dirs = set(dir for dir in (os.path.dirname(o) for o in outputs) if dir) +#Epatch:gyp1 +#Epatch:gyp1 if int(action.get('process_outputs_as_sources', False)): +#Epatch:gyp1 - extra_sources.extend(zip(cmake_outputs, outputs)) +#Epatch:gyp1 + extra_sources.extend(list(zip(cmake_outputs, outputs))) +#Epatch:gyp1 +#Epatch:gyp1 # add_custom_command +#Epatch:gyp1 output.write('add_custom_command(OUTPUT ') +#Epatch:gyp1 @@ -987,7 +987,7 @@ +#Epatch:gyp1 +#Epatch:gyp1 # XCode settings +#Epatch:gyp1 xcode_settings = config.get('xcode_settings', {}) +#Epatch:gyp1 - for xcode_setting, xcode_value in xcode_settings.viewitems(): +#Epatch:gyp1 + for xcode_setting, xcode_value in xcode_settings.items(): +#Epatch:gyp1 SetTargetProperty(output, cmake_target_name, +#Epatch:gyp1 "XCODE_ATTRIBUTE_%s" % xcode_setting, xcode_value, +#Epatch:gyp1 '' if isinstance(xcode_value, str) else ' ') + +#Epatch:gyp2 diff --git a/pylib/gyp/input.py b/pylib/gyp/input.py +#Epatch:gyp2 index 4c12891..2bea334 100644 +#Epatch:gyp2 --- a/pylib/gyp/input.py +#Epatch:gyp2 +++ b/pylib/gyp/input.py +#Epatch:gyp2 @@ -1183,7 +1183,7 @@ +#Epatch:gyp2 if variable_name in variables: +#Epatch:gyp2 # If the variable is already set, don't set it. +#Epatch:gyp2 continue +#Epatch:gyp2 - if the_dict_key is 'variables' and variable_name in the_dict: +#Epatch:gyp2 + if the_dict_key == 'variables' and variable_name in the_dict: +#Epatch:gyp2 # If the variable is set without a % in the_dict, and the_dict is a +#Epatch:gyp2 # variables dict (making |variables| a varaibles sub-dict of a +#Epatch:gyp2 # variables dict), use the_dict's definition. # -------------------------------------------------------- This is the end. -