Lerking/Phoenix
1
0
Fork 0
mirror of https://github.com/wxWidgets/Phoenix.git synced 2026-01-06 12:00:13 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Streamline fetching WX_CONFIG from the environment

Browse Source
This commit is contained in:
Robin Dunn
2020-03-23 14:50:52 -07:00
parent 9b122237c9
commit 52c00542eb
2 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
build.py
View File

@@ -1573,9 +1573,8 @@ def cmd_build_py(options, args):
os.environ['WXPYTHON_RELEASE'] = 'yes' os.environ['WXPYTHON_RELEASE'] = 'yes'
if not isWindows: if not isWindows:
if 'WX_CONFIG' in os.environ: WX_CONFIG = os.environ.get('WX_CONFIG', None)
WX_CONFIG = os.environ['WX_CONFIG'] if WX_CONFIG is None:
else:
WX_CONFIG = posixjoin(BUILD_DIR, 'wx-config') WX_CONFIG = posixjoin(BUILD_DIR, 'wx-config')
if options.use_syswx: if options.use_syswx:
wxcfg = posixjoin(options.prefix, 'bin', 'wx-config') wxcfg = posixjoin(options.prefix, 'bin', 'wx-config')

5
buildtools/config.py
View File

@@ -400,10 +400,7 @@ class Configuration(object):
""" """
# if WX_CONFIG hasn't been set to an explicit value then construct one. # if WX_CONFIG hasn't been set to an explicit value then construct one.
if self.WX_CONFIG is None: if self.WX_CONFIG is None:
if 'WX_CONFIG' in os.environ: self.WX_CONFIG = os.environ.get('WX_CONFIG', 'wx-config')
self.WX_CONFIG = os.environ['WX_CONFIG']
else:
self.WX_CONFIG='wx-config'
port = self.WXPORT port = self.WXPORT
if port == "x11": if port == "x11":
port = "x11univ" port = "x11univ"