don't give error msg when deleting non existing keys neither (part of patch 830049)

[wxWidgets.git] / wxPython / setup.py

diff --git a/wxPython/setup.py b/wxPython/setup.py
index e554d4c4394a251711feaac218e7688184b0a7dc..43bcbe66119f3206031d898cff886e892e491b94 100755 (executable)
--- a/wxPython/setup.py
+++ b/wxPython/setup.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 #----------------------------------------------------------------------
 
 #!/usr/bin/env python
 #----------------------------------------------------------------------
 

-import sys, os, glob, fnmatch
+import sys, os, glob, fnmatch, commands

 from distutils.core      import setup, Extension
 from distutils.file_util import copy_file
 from distutils.dir_util  import mkpath
 from distutils.core      import setup, Extension
 from distutils.file_util import copy_file
 from distutils.dir_util  import mkpath


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

-LICENSE          = "wxWindows (LGPL derivative)"
+DOWNLOAD_URL     = "http://wxPython.org/download.php"
+LICENSE          = "wxWindows Library License (LGPL derivative)"
+PLATFORMS        = "WIN32,OSX,POSIX"
+KEYWORDS         = "GUI,wx,wxWindows,cross-platform"
+

 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


@@ -32,6 +36,22 @@ feel (by using the native widgets) on the platforms it is supported
 on.
 """
 
 on.
 """
 

+CLASSIFIERS      = """\
+Development Status :: 6 - Mature
+Environment :: MacOS X :: Carbon
+Environment :: Win32 (MS Windows)
+Environment :: X11 Applications :: GTK
+Intended Audience :: Developers
+License :: OSI Approved
+Operating System :: MacOS :: MacOS X
+Operating System :: Microsoft :: Windows :: Windows 95/98/2000
+Operating System :: POSIX
+Programming Language :: Python
+Topic :: Software Development :: User Interfaces
+"""
+
+## License :: OSI Approved :: wxWindows Library Licence
+

 
 # Config values below this point can be reset on the setup.py command line.
 
 
 # Config values below this point can be reset on the setup.py command line.
 


@@ -479,6 +499,8 @@ elif os.name == 'posix':
     if debug:
         cflags.append('-g')
         cflags.append('-O0')
     if debug:
         cflags.append('-g')
         cflags.append('-O0')

+    else:
+        cflags.append('-O3')

 
     lflags = os.popen(WX_CONFIG + ' --libs', 'r').read()[:-1]
     lflags = lflags.split()
 
     lflags = os.popen(WX_CONFIG + ' --libs', 'r').read()[:-1]
     lflags = lflags.split()


@@ -517,11 +539,12 @@ elif os.name == 'posix':
 
         cflags += portcfg.split()
 
 
         cflags += portcfg.split()
 

-        # Some distros (e.g. Mandrake) put libGLU in /usr/X11R6/lib, but
-        # wx-config doesn't output that for some reason.  For now, just
-        # add it unconditionally but we should really check if the lib is
-        # really found there or wx-config should be fixed.
-        libdirs.append("/usr/X11R6/lib")
+    # If you get unresolved symbol errors on Solaris and are using gcc, then
+    # uncomment this block to add the right flags to the link step and build
+    # again.
+    ## if os.uname()[0] == 'SunOS':
+    ##     libs.append('gcc')
+    ##     libdirs.append(commands.getoutput("gcc -print-search-dirs | grep '^install' | awk '{print $2}'")[:-1])

 
 
     # Move the various -I, -D, etc. flags we got from the *config scripts
 
 
     # Move the various -I, -D, etc. flags we got from the *config scripts


@@ -995,8 +1018,12 @@ if __name__ == "__main__":
               author           = AUTHOR,
               author_email     = AUTHOR_EMAIL,
               url              = URL,
               author           = AUTHOR,
               author_email     = AUTHOR_EMAIL,
               url              = URL,

+              download_url     = DOWNLOAD_URL,

               license          = LICENSE,
               license          = LICENSE,

-
+              platforms        = PLATFORMS,
+              classifiers      = filter(None, CLASSIFIERS.split("\n")),
+              keywords         = KEYWORDS,
+              

               packages = ['wxPython',
                           'wxPython.lib',
                           'wxPython.lib.colourchooser',
               packages = ['wxPython',
                           'wxPython.lib',
                           'wxPython.lib.colourchooser',