X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/543cba025254ca094cca0db9765f2beb6433ec7a..db679b8c836e69c111cdc31e62cf92cebe4f938f:/wxPython/config.py

diff --git a/wxPython/config.py b/wxPython/config.py
index 597377354e..e87325e8fe 100644
--- a/wxPython/config.py
+++ b/wxPython/config.py
@@ -241,8 +241,9 @@ WXPYTHON_TYPE_TABLE = '_wxPython_table'
 #----------------------------------------------------------------------
 
 # Boolean (int) flags
-for flag in ['BUILD_GLCANVAS', 'BUILD_OGL', 'BUILD_STC', 
-             'BUILD_GIZMOS', 'BUILD_DLLWIDGET', 'BUILD_IEWIN', 'BUILD_ACTIVEX',
+for flag in [ 'BUILD_ACTIVEX', 'BUILD_ANIMATE', 'BUILD_DLLWIDGET',
+              'BUILD_GIZMOS', 'BUILD_GLCANVAS', 'BUILD_IEWIN',
+              'BUILD_OGL', 'BUILD_STC',     
              'CORE_ONLY', 'PREP_ONLY', 'USE_SWIG', 'UNICODE',
              'UNDEF_NDEBUG', 'NO_SCRIPTS', 'NO_HEADERS', 'BUILD_RENAMERS',
              'FULL_DOCS', 'INSTALL_MULTIVERSION', 'EP_ADD_OPTS',
@@ -842,7 +843,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.
  
 wxfilesdir = ""
-i_subdir = opj("include", "wx", "wxPython", "i_files")
+i_subdir = opj("include", getExtraPath(), "wx", "wxPython", "i_files")
 if os.name != "nt":
     wxfilesdir = opj(WXPREFIX, i_subdir)
 else:
@@ -886,7 +887,7 @@ depends = [ #'include/wx/wxPython/wxPython.h',
 # BuildRenamers
 ####################################
 
-import pprint
+import pprint, shutil
 try:
     import libxml2
     FOUND_LIBXML2 = True
@@ -972,11 +973,14 @@ class BuildRenamers:
         # blow away the old one if they are different.
         for dest, temp in [(swigDest, swigDestTemp),
                            (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):
-                os.rename(temp, dest)
+                shutil.copyfile(temp, dest)
             elif open(dest).read() != open(temp).read():
                 os.unlink(dest)
-                os.rename(temp, dest)
+                shutil.copyfile(temp, dest)
             else:
                 print dest + " not changed."
                 os.unlink(temp)