diff options
Diffstat (limited to 'Utilities')
| -rw-r--r-- | Utilities/Release/linux/x86_64/Dockerfile | 2 | ||||
| -rwxr-xr-x | Utilities/Sphinx/create_identifiers.py | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/Utilities/Release/linux/x86_64/Dockerfile b/Utilities/Release/linux/x86_64/Dockerfile index 41391d2..972913e 100644 --- a/Utilities/Release/linux/x86_64/Dockerfile +++ b/Utilities/Release/linux/x86_64/Dockerfile @@ -5,6 +5,7 @@ # Build using the CMake source directory as the build context. # The resulting image will have an '/out' directory containing the package. +# Keep this in sync with the `.gitlab-ci.yml` `release_linux` image. ARG FROM_IMAGE_NAME=kitware/cmake:build-linux-x86_64-deps-2020-04-02 ARG FROM_IMAGE_DIGEST=@sha256:77e9ab183f34680990db9da5945473e288f0d6556bce79ecc1589670d656e157 ARG FROM_IMAGE=$FROM_IMAGE_NAME$FROM_IMAGE_DIGEST @@ -20,7 +21,6 @@ RUN : \ && cp ../cmake/Utilities/Release/linux/x86_64/cache.txt CMakeCache.txt \ && source /opt/rh/devtoolset-6/enable \ && source /opt/rh/rh-python36/enable \ - && export LANG=en_US.UTF-8 \ && set -x \ && ../cmake/bootstrap --parallel=$(nproc) --docdir=doc/cmake \ && nice make -j $(nproc) \ diff --git a/Utilities/Sphinx/create_identifiers.py b/Utilities/Sphinx/create_identifiers.py index b5cd914..e35f127 100755 --- a/Utilities/Sphinx/create_identifiers.py +++ b/Utilities/Sphinx/create_identifiers.py @@ -1,17 +1,17 @@ #!/usr/bin/env python -import sys, os +import sys if len(sys.argv) != 2: sys.exit(-1) name = sys.argv[1] + "/CMake.qhp" -f = open(name) +f = open(name, "rb") if not f: sys.exit(-1) -lines = f.read().splitlines() +lines = f.read().decode("utf-8").splitlines() if not lines: sys.exit(-1) @@ -38,7 +38,7 @@ for line in lines: for domain_object_string, domain_object_type in mapping: if "<keyword name=\"" + domain_object_string + "\"" in line: - if not "id=\"" in line and not "#index-" in line: + if "id=\"" not in line and "#index-" not in line: prefix = "<keyword name=\"" + domain_object_string + "\" " part1, part2 = line.split(prefix) head, tail = part2.split("#" + domain_object_type + ":") @@ -46,5 +46,5 @@ for line in lines: line = part1 + prefix + "id=\"" + domain_object_type + "/" + domain_object + "\" " + part2 newlines.append(line + "\n") -f = open(name, "w") -f.writelines(newlines) +f = open(name, "wb") +f.writelines(map(lambda line: line.encode("utf-8"), newlines)) |