[taler-build-common] 26/50: Merge branch 'master' of git.taler.net:taler-build-scripts

[gnunet]

This is an automated email from the git hooks/post-receive script.

ng0 pushed a commit to branch master
in repository build-common.

commit 4c77f5d09b8b9100cdb172232537f41c0815c5e3
Merge: c9671db cbc00c0
Author: ng0 <address@hidden>
AuthorDate: Wed Oct 9 14:55:25 2019 +0000

    Merge branch 'master' of git.taler.net:taler-build-scripts

 configure.py | 1 +
 1 file changed, 1 insertion(+)

diff --cc configure.py
index b08df2d,f78d932..6b53321
--- a/configure.py
+++ b/configure.py
@@@ -43,48 -43,12 +43,49 @@@ def tool_version(name)
      return subprocess.getstatusoutput(name)[1]
  
  
 -def _tool_node():
 +def tool_emscripten():
 +    if _existence('emcc') is None:
 +        return f"emscripten compiler not found"
 +    else:
 +        emscripten_version = _tool_version('emcc --version')
 +        return f"emscripten version {emscripten_version} found"
 +
 +
 +# TODO: Extract python binary version suffix from
 +# sys.executable ?
 +def tool_pybabel():
 +    if _existence('pybable'):
 +        return 'pybable'
 +    # pybable is not pybable:
 +    # construct dictionary of possible binary names
 +    # try for each key if _existence(value) checks out
 +    # to be true.
 +    # if true, return the matching name
 +
 +
++# Far from ideal list.
 +def tool_browser():
 +    if 'BROWSER' in os.environ:
 +        return os.environ.get('BROWSER')
 +    elif _existence('firefox'):
 +        return 'firefox'
 +    elif _existence('chrome'):
 +        return 'chrome'
 +    elif _existence('chromium'):
 +        return 'chromium'
 +    else:
 +        pass
 +
 +
 +def tool_node():
      if _existence('node') is None:
 -        sys.exit('Error: node executable not found.\nIf you are using Linux, 
Ubuntu or Debian, try installing the\nnode-legacy package or symlink node to 
nodejs.')
 +        sys.exit(
 +            'Error: node executable not found.\nIf you are using Ubuntu Linux 
or Debian Linux, try installing the\nnode-legacy package or symlink node to 
nodejs.'
 +        )
      else:
 -        if subprocess.getstatusoutput("node -p 
'process.exit(!(/v([0-9]+)/.exec(process.version)[1] >= 4))'")[1] is not '':
 -            # and exit(1) here?
 +        if subprocess.getstatusoutput(
 +            "node -p 'process.exit(!(/v([0-9]+)/.exec(process.version)[1] >= 
4))'"
 +        )[1] is not '':
              sys.exit('Your node version is too old, use Node 4.x or newer')
          else:
              node_version = _tool_version("node --version")

-- 
To stop receiving notification emails like this one, please contact
address@hidden.