Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Install tweaks

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29688 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2004-10-06 21:54:49 +00:00
parent f3d618fdde
commit b6536d60cf
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
wxPython/config.py
View File

@@ -134,9 +134,11 @@ INSTALL_MULTIVERSION = 1 # Install the packages such that multiple versions
FLAVOUR = "" # Optional flavour string to be appended to VERSION FLAVOUR = "" # Optional flavour string to be appended to VERSION
# in MULTIVERSION installs # in MULTIVERSION installs
INSTALL_WXRC = 0 # Should the Python version of wxrc be installed?
EP_ADD_OPTS = 0 # When doing MULTIVERSION installs the wx port and
# ansi/unicode settings can optionally be added to the
# subdir path used in site-packages
WX_CONFIG = None # Usually you shouldn't need to touch this, but you can set WX_CONFIG = None # Usually you shouldn't need to touch this, but you can set
# it to pass an alternate version of wx-config or alternate # it to pass an alternate version of wx-config or alternate
# flags, eg. as required by the .deb in-tree build. By # flags, eg. as required by the .deb in-tree build. By
@@ -234,7 +236,7 @@ for flag in ['BUILD_GLCANVAS', 'BUILD_OGL', 'BUILD_STC',
'BUILD_GIZMOS', 'BUILD_DLLWIDGET', 'BUILD_IEWIN', 'BUILD_ACTIVEX', 'BUILD_GIZMOS', 'BUILD_DLLWIDGET', 'BUILD_IEWIN', 'BUILD_ACTIVEX',
'CORE_ONLY', 'PREP_ONLY', 'USE_SWIG', 'UNICODE', 'CORE_ONLY', 'PREP_ONLY', 'USE_SWIG', 'UNICODE',
'UNDEF_NDEBUG', 'NO_SCRIPTS', 'NO_HEADERS', 'BUILD_RENAMERS', 'UNDEF_NDEBUG', 'NO_SCRIPTS', 'NO_HEADERS', 'BUILD_RENAMERS',
'FULL_DOCS', 'INSTALL_MULTIVERSION', 'INSTALL_WXRC', 'FULL_DOCS', 'INSTALL_MULTIVERSION', 'EP_ADD_OPTS',
'FINAL', 'HYBRID', ]: 'FINAL', 'HYBRID', ]:
for x in range(len(sys.argv)): for x in range(len(sys.argv)):
if sys.argv[x].find(flag) == 0: if sys.argv[x].find(flag) == 0:
@@ -285,6 +287,8 @@ def Verify_WX_CONFIG():
msg("Found wx-config: " + fp) msg("Found wx-config: " + fp)
msg(" Using flags: " + flags) msg(" Using flags: " + flags)
WX_CONFIG = fp + flags WX_CONFIG = fp + flags
if hasattr(sys, 'setup_is_main') and not sys.setup_is_main:
WX_CONFIG += " 2>/dev/null "
break break
else: else:
msg("ERROR: WX_CONFIG not specified and wx-config not found on the $PATH") msg("ERROR: WX_CONFIG not specified and wx-config not found on the $PATH")

5
wxPython/setup.py
View File

@@ -655,10 +655,9 @@ else:
opj('scripts/pyshell'), opj('scripts/pyshell'),
opj('scripts/pywrap'), opj('scripts/pywrap'),
opj('scripts/pywrap'), opj('scripts/pywrap'),
opj('scripts/pywxrc'),
opj('scripts/xrced'), opj('scripts/xrced'),
] ]
if INSTALL_WXRC:
SCRIPTS += [opj('scripts/wxrc')]
@@ -681,7 +680,7 @@ else:
if INSTALL_MULTIVERSION: if INSTALL_MULTIVERSION:
EXTRA_PATH = getExtraPath() EXTRA_PATH = getExtraPath(addOpts=EP_ADD_OPTS)
open("src/wx.pth", "w").write(EXTRA_PATH) open("src/wx.pth", "w").write(EXTRA_PATH)
CLEANUP.append("src/wx.pth") CLEANUP.append("src/wx.pth")
else: else: