Installation file

[wxWidgets.git] / wxPython / setup.py

diff --git a/wxPython/setup.py b/wxPython/setup.py
index 73a6bf34929eb50b2e99ae1119dc9915a5afdb5e..3f402d577ecb7c3f425c0c5b1a77225c2bfc3d9c 100755 (executable)
--- a/wxPython/setup.py
+++ b/wxPython/setup.py
@@ -13,12 +13,12 @@ from my_distutils import run_swig, contrib_copy_tree
 # flags and values that affect this script
 #----------------------------------------------------------------------
 
 # flags and values that affect this script
 #----------------------------------------------------------------------
 

-VERSION          = "2.3.3pre3"
+VERSION          = "2.3.3pre5"

 DESCRIPTION      = "Cross platform GUI toolkit for Python"
 AUTHOR           = "Robin Dunn"
 AUTHOR_EMAIL     = "Robin Dunn <robin@alldunn.com>"
 URL              = "http://wxPython.org/"
 DESCRIPTION      = "Cross platform GUI toolkit for Python"
 AUTHOR           = "Robin Dunn"
 AUTHOR_EMAIL     = "Robin Dunn <robin@alldunn.com>"
 URL              = "http://wxPython.org/"

-LICENCE          = "wxWindows (LGPL derivative)"
+LICENSE          = "wxWindows (LGPL derivative)"

 LONG_DESCRIPTION = """\
 wxPython is a GUI toolkit for Python that is a wrapper around the
 wxWindows C++ GUI library.  wxPython provides a large variety of
 LONG_DESCRIPTION = """\
 wxPython is a GUI toolkit for Python that is a wrapper around the
 wxWindows C++ GUI library.  wxPython provides a large variety of


@@ -33,14 +33,14 @@ BUILD_OGL = 1      # If true, build the contrib/ogl extension module
 BUILD_STC = 1      # If true, build the contrib/stc extension module
 BUILD_XRC = 1      # XML based resource system
 BUILD_GIZMOS = 1   # Build a module for the gizmos contrib library
 BUILD_STC = 1      # If true, build the contrib/stc extension module
 BUILD_XRC = 1      # XML based resource system
 BUILD_GIZMOS = 1   # Build a module for the gizmos contrib library

-BUILD_DLLWIDGET = 1# Build a module for that enables unknown wx widgets
-                   # to be loaded from a DLL to be used from Python.
+BUILD_DLLWIDGET = 1# Build a module that enables unknown wx widgets
+                   # to be loaded from a DLL and to be used from Python.

 
 

-BUILD_IEWIN = 0    # Internet Explorer wrapper (experimental)
+                   # Internet Explorer wrapper (experimental)
+BUILD_IEWIN = (os.name == 'nt')

 
 CORE_ONLY = 0      # if true, don't build any of the above
 
 
 CORE_ONLY = 0      # if true, don't build any of the above
 

-

 GL_ONLY = 0        # Only used when making the -gl RPM.  See the "b" script
                    # for the ugly details
 
 GL_ONLY = 0        # Only used when making the -gl RPM.  See the "b" script
                    # for the ugly details
 


@@ -137,8 +137,8 @@ if bcpp_compiling:
 
 # Boolean (int) flags
 for flag in ['BUILD_GLCANVAS', 'BUILD_OGL', 'BUILD_STC', 'BUILD_XRC',
 
 # Boolean (int) flags
 for flag in ['BUILD_GLCANVAS', 'BUILD_OGL', 'BUILD_STC', 'BUILD_XRC',

-             'BUILD_GIZMOS', 'BUILD_DLLWIDGET',
-             'CORE_ONLY', 'USE_SWIG', 'IN_CVS_TREE', 'UNICODE', 'UNDEF_NDEBUG'
+             'BUILD_GIZMOS', 'BUILD_DLLWIDGET', 'BUILD_IEWIN',
+             'CORE_ONLY', 'USE_SWIG', 'IN_CVS_TREE', 'UNICODE', 'UNDEF_NDEBUG',

              'FINAL', 'HYBRID', ]:
     for x in range(len(sys.argv)):
         if string.find(sys.argv[x], flag) == 0:
              'FINAL', 'HYBRID', ]:
     for x in range(len(sys.argv)):
         if string.find(sys.argv[x], flag) == 0:


@@ -170,6 +170,7 @@ if CORE_ONLY:
     BUILD_XRC = 0
     BUILD_GIZMOS = 0
     BUILD_DLLWIDGET = 0
     BUILD_XRC = 0
     BUILD_GIZMOS = 0
     BUILD_DLLWIDGET = 0

+    BUILD_IEWIN = 0

 
 
 if UNICODE and os.name != 'nt':
 
 
 if UNICODE and os.name != 'nt':


@@ -341,8 +342,8 @@ else:
 # Check if the version file needs updated
 #----------------------------------------------------------------------
 
 # Check if the version file needs updated
 #----------------------------------------------------------------------
 

-if IN_CVS_TREE and newer('setup.py', 'src/__version__.py'):
-    open('src/__version__.py', 'w').write("ver = '%s'\n" % VERSION)
+#if IN_CVS_TREE and newer('setup.py', 'src/__version__.py'):
+open('src/__version__.py', 'w').write("ver = '%s'\n" % VERSION)

 
 
 
 
 
 


@@ -383,7 +384,7 @@ if not GL_ONLY:
     copy_file('src/__version__.py', PKGDIR, update=1, verbose=0)
     copy_file('src/wxc.pyd.manifest', PKGDIR, update=1, verbose=0)
 
     copy_file('src/__version__.py', PKGDIR, update=1, verbose=0)
     copy_file('src/wxc.pyd.manifest', PKGDIR, update=1, verbose=0)
 

-    if IN_CVS_TREE:   # update the licence files
+    if IN_CVS_TREE:   # update the license files

         mkpath('licence')
         for file in ['preamble.txt', 'licence.txt', 'licendoc.txt', 'lgpl.txt']:
             copy_file(opj(WXDIR, 'docs', file), opj('licence',file), update=1, verbose=0)
         mkpath('licence')
         for file in ['preamble.txt', 'licence.txt', 'licendoc.txt', 'lgpl.txt']:
             copy_file(opj(WXDIR, 'docs', file), opj('licence',file), update=1, verbose=0)


@@ -686,6 +687,7 @@ if not GL_ONLY and BUILD_IEWIN:
 
 
     ext = Extension('iewinc', ['%s/IEHtmlWin.cpp' % location,
 
 
     ext = Extension('iewinc', ['%s/IEHtmlWin.cpp' % location,

+                               '%s/wxactivex.cpp' % location,

                              ] + swig_sources,
 
                     include_dirs =  includes,
                              ] + swig_sources,
 
                     include_dirs =  includes,


@@ -895,7 +897,7 @@ if __name__ == "__main__":
               author           = AUTHOR,
               author_email     = AUTHOR_EMAIL,
               url              = URL,
               author           = AUTHOR,
               author_email     = AUTHOR_EMAIL,
               url              = URL,

-              licence          = LICENCE,
+              license          = LICENSE,

 
               packages = [PKGDIR,
                           PKGDIR+'.lib',
 
               packages = [PKGDIR,
                           PKGDIR+'.lib',


@@ -920,7 +922,7 @@ if __name__ == "__main__":
               author           = AUTHOR,
               author_email     = AUTHOR_EMAIL,
               url              = URL,
               author           = AUTHOR,
               author_email     = AUTHOR_EMAIL,
               url              = URL,

-              licence          = LICENCE,
+              license          = LICENSE,

 
               py_modules = [ "wxPython.glcanvas" ],
 
 
               py_modules = [ "wxPython.glcanvas" ],