define wxART_* constanst in way that will make adding XRC support easier

[wxWidgets.git] / wxPython / setup.py

diff --git a/wxPython/setup.py b/wxPython/setup.py
index ecd5a4a8700ad86904451b01f78c33f04c06f0ef..2c65f03fb8ed6fbcf14643b16b7ed00a4ec65c12 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.3pre4"
+VERSION          = "2.3.3pre6"

 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


@@ -36,11 +36,11 @@ BUILD_GIZMOS = 1   # Build a module for the gizmos contrib library
 BUILD_DLLWIDGET = 1# Build a module that enables unknown wx widgets
                    # to be loaded from a DLL and 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
 


@@ -64,6 +64,9 @@ UNDEF_NDEBUG = 1   # Python 2.2 on Unix/Linux by default defines NDEBUG,
                    # on then you end up with mismatched class structures,
                    # and wxPython will crash.
 
                    # on then you end up with mismatched class structures,
                    # and wxPython will crash.
 

+NO_SCRIPTS = 0     # Don't install the tool scripts
+
+

 WX_CONFIG = "wx-config"    # Usually you shouldn't need to touch this,
                            # but you can set it to pass an alternate
                            # version of wx-config or alternate flags,
 WX_CONFIG = "wx-config"    # Usually you shouldn't need to touch this,
                            # but you can set it to pass an alternate
                            # version of wx-config or alternate flags,


@@ -137,8 +140,9 @@ 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', 'NO_SCRIPTS',

              '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 +174,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':


@@ -306,6 +311,7 @@ elif os.name == 'posix' and sys.platform[:6] == "darwin":
     lflags = os.popen(WX_CONFIG + ' --libs', 'r').read()[:-1]
     lflags = string.split(lflags)
 
     lflags = os.popen(WX_CONFIG + ' --libs', 'r').read()[:-1]
     lflags = string.split(lflags)
 

+    NO_SCRIPTS = 1

 
 
 elif os.name == 'posix':
 
 
 elif os.name == 'posix':


@@ -383,7 +389,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 +692,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,


@@ -871,15 +878,25 @@ if not GL_ONLY and BUILD_DLLWIDGET:
 # Tools and scripts
 #----------------------------------------------------------------------
 
 # Tools and scripts
 #----------------------------------------------------------------------
 

-TOOLS = [("wxPython/tools",        glob.glob("tools/*.py")),
-         ("wxPython/tools/XRCed",  glob.glob("tools/XRCed/*.py") +
-                                   glob.glob("tools/XRCed/*.xrc") +
-                                   ["tools/XRCed/CHANGES",
-                                    "tools/XRCed/TODO",
-                                    "tools/XRCed/README"]),
-         ]
+## TOOLS = [("wxPython/tools",        glob.glob("tools/*.py")),
+##          ("wxPython/tools/XRCed",  glob.glob("tools/XRCed/*.py") +
+##                                    glob.glob("tools/XRCed/*.xrc") +
+##                                    ["tools/XRCed/CHANGES",
+##                                     "tools/XRCed/TODO",
+##                                     "tools/XRCed/README"]),
+##          ]

 
 
 
 

+if NO_SCRIPTS:
+    SCRIPTS = None
+else:
+    SCRIPTS = [opj('scripts/img2png'),
+               opj('scripts/img2xpm'),
+               opj('scripts/img2py'),
+               opj('scripts/xrced'),
+               opj('scripts/pyshell'),
+               opj('scripts/pycrust'),
+               ]

 
 
 #----------------------------------------------------------------------
 
 
 #----------------------------------------------------------------------


@@ -895,21 +912,24 @@ 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',
                           PKGDIR+'.lib.editor',
                           PKGDIR+'.lib.mixins',
                           PKGDIR+'.lib.PyCrust',
 
               packages = [PKGDIR,
                           PKGDIR+'.lib',
                           PKGDIR+'.lib.editor',
                           PKGDIR+'.lib.mixins',
                           PKGDIR+'.lib.PyCrust',

+                          PKGDIR+'.tools',
+                          PKGDIR+'.tools.XRCed',

                           ],
 
               ext_package = PKGDIR,
               ext_modules = wxpExtensions,
 
                           ],
 
               ext_package = PKGDIR,
               ext_modules = wxpExtensions,
 

-              options = { 'build' : { 'build_base' : BUILD_BASE }}
+              options = { 'build' : { 'build_base' : BUILD_BASE }},

 
               ##data_files = TOOLS,
 
               ##data_files = TOOLS,

+              scripts = SCRIPTS,

               )
 
     else:
               )
 
     else:


@@ -920,7 +940,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" ],