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

Extension fix for multiversion installs, and allow copying of files across devices using shutil.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33964 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Kevin Ollivier
2005-05-05 21:25:13 +00:00
parent 7e0aee7229
commit bbc916e23c
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
wxPython/config.py
View File

@@ -842,7 +842,7 @@ VERSION = "%s.%s.%s.%s%s" % (VER_MAJOR, VER_MINOR, VER_RELEASE,
# dirs as includes so we don't have to guess which is correct. # dirs as includes so we don't have to guess which is correct.
wxfilesdir = "" wxfilesdir = ""
i_subdir = opj("include", "wx", "wxPython", "i_files") i_subdir = opj("include", getExtraPath(), "wx", "wxPython", "i_files")
if os.name != "nt": if os.name != "nt":
wxfilesdir = opj(WXPREFIX, i_subdir) wxfilesdir = opj(WXPREFIX, i_subdir)
else: else:
@@ -886,7 +886,7 @@ depends = [ #'include/wx/wxPython/wxPython.h',
# BuildRenamers # BuildRenamers
#################################### ####################################
import pprint import pprint, shutil
try: try:
import libxml2 import libxml2
FOUND_LIBXML2 = True FOUND_LIBXML2 = True
@@ -972,11 +972,14 @@ class BuildRenamers:
# blow away the old one if they are different. # blow away the old one if they are different.
for dest, temp in [(swigDest, swigDestTemp), for dest, temp in [(swigDest, swigDestTemp),
(pyDest, pyDestTemp)]: (pyDest, pyDestTemp)]:
# NOTE: we don't use shutil.move() because it was introduced
# in Python 2.3. Eventually we can switch to it when people
# stop building using 2.2.
if not os.path.exists(dest): if not os.path.exists(dest):
os.rename(temp, dest) shutil.copyfile(temp, dest)
elif open(dest).read() != open(temp).read(): elif open(dest).read() != open(temp).read():
os.unlink(dest) os.unlink(dest)
os.rename(temp, dest) shutil.copyfile(temp, dest)
else: else:
print dest + " not changed." print dest + " not changed."
os.unlink(temp) os.unlink(temp)