mirrors/CLI11
1
0
Fork 0
mirror of https://github.com/CLIUtils/CLI11.git synced 2025-04-30 12:43:52 +00:00
Code Issues Releases Wiki Activity

Adding Python 2.6 support

Browse Source
This commit is contained in:
Henry Fredrick Schreiner 2018-07-28 07:36:00 +02:00 committed by Henry Schreiner
parent b9492305c0
commit 521696f551
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
scripts/MakeSingleHeader.py
View File

@ -7,9 +7,10 @@ import re
import argparse import argparse
import operator import operator
from copy import copy from copy import copy
from subprocess import check_output, CalledProcessError
from functools import reduce from functools import reduce
import subprocess
includes_local = re.compile(r"""^#include "(.*)"$""", re.MULTILINE) includes_local = re.compile(r"""^#include "(.*)"$""", re.MULTILINE)
includes_system = re.compile(r"""^#include \<(.*)\>$""", re.MULTILINE) includes_system = re.compile(r"""^#include \<(.*)\>$""", re.MULTILINE)
version_finder = re.compile(r"""^#define CLI11_VERSION \"(.*)\"$""", re.MULTILINE) version_finder = re.compile(r"""^#define CLI11_VERSION \"(.*)\"$""", re.MULTILINE)
@ -44,7 +45,7 @@ class HeaderFile(object):
# add self.verbatim # add self.verbatim
if 'CLI11:verbatim' in inner: if 'CLI11:verbatim' in inner:
self.verbatim = ["\n\n// Verbatim copy from {}:".format(inc)] self.verbatim = ["\n\n// Verbatim copy from {0}:".format(inc)]
self.verbatim += verbatim_all.findall(inner) self.verbatim += verbatim_all.findall(inner)
inner = verbatim_all.sub("", inner) inner = verbatim_all.sub("", inner)
else: else:
@ -52,7 +53,7 @@ class HeaderFile(object):
self.headers = set(includes_system.findall(inner)) self.headers = set(includes_system.findall(inner))
self.body = '\n// From {}:\n\n'.format(inc) + inner[inner.find('namespace'):] self.body = '\n// From {0}:\n\n'.format(inc) + inner[inner.find('namespace'):]
self.namespace = None self.namespace = None
@ -111,8 +112,11 @@ class HeaderFile(object):
def MakeHeader(output, main_header, include_dir = '../include', namespace=None, macro=None): def MakeHeader(output, main_header, include_dir = '../include', namespace=None, macro=None):
# Set tag if possible to class variable # Set tag if possible to class variable
try: try:
HeaderFile.TAG = check_output(['git', 'describe', '--tags', '--always'], cwd=str(DIR)).decode("utf-8").strip() proc = subprocess.Popen(['git', 'describe', '--tags', '--always'], cwd=str(DIR), stdout=subprocess.PIPE)
except CalledProcessError: out, _ = proc.communicate()
if proc.returncode == 0:
HeaderFile.TAG = out.decode("utf-8").strip()
except OSError:
pass pass
base_dir = os.path.abspath(os.path.join(DIR, include_dir)) base_dir = os.path.abspath(os.path.join(DIR, include_dir))