gnue-forms setup.py

[Jan Ischebeck]

CVSROOT:        /cvsroot/gnue
Module name:    gnue-forms
Branch:         
Changes by:     Jan Ischebeck <address@hidden>  03/10/05 19:51:22

Modified files:
        .              : setup.py 

Log message:
        add test for gtk2
        reenable test for wxPython and add test for DISPLAY var on posix

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-forms/setup.py.diff?tr1=1.87&tr2=1.88&r1=text&r2=text

Patches:
Index: gnue-forms/setup.py
diff -c gnue-forms/setup.py:1.87 gnue-forms/setup.py:1.88
*** gnue-forms/setup.py:1.87    Sun Oct  5 05:35:57 2003
--- gnue-forms/setup.py Sun Oct  5 19:51:21 2003
***************
*** 21,27 ****
  # write to the Free Software Foundation, Inc., 59 Temple Place
  # - Suite 330, Boston, MA 02111-1307, USA.
  #
! # $Id: setup.py,v 1.87 2003/10/05 09:35:57 reinhard Exp $
  
  import sys
  import os
--- 21,27 ----
  # write to the Free Software Foundation, Inc., 59 Temple Place
  # - Suite 330, Boston, MA 02111-1307, USA.
  #
! # $Id: setup.py,v 1.88 2003/10/05 23:51:21 siesel Exp $
  
  import sys
  import os
***************
*** 123,139 ****
        pass
  
      # wxPython
! #   print "checking wxPython library"
! #   try:
! #     from wxPython.wx import *
! #     UIOK = 1
! #   except ImportError:
! #     pass
  
!     # FIXME: We have more UIDrivers!
  
!     # We have no reliable way of verifying the above! FIXME
!     UIOK = 1
  
      if UIOK != 1:
        print "---"
--- 123,159 ----
        pass
  
      # wxPython
!     print "checking wxPython library: ",
!     if (os.environ.has_key('DISPLAY') and len(os.environ["DISPLAY"])) or \
!        os.name!='posix': 
!       try:
!         from wxPython import wx 
!       if wx.__version__[0:2]=='2.4':
!         print "ok (%s)" % wx.__version__
!           UIOK = 1
!       else:
!         print "Version 2.4 or greater needed"
!       except ImportError:
!         pass
!     else:
!       print "check not possible, X11 not working, assuming wxPython is there" 
    
!       UIOK = 1
  
!     # pyGTK 2.0
!     print "checking pyGTK 2.0 library: ",
!     try:
!       import pygtk
!       pygtk.require('2.0')
!       import gtk
!       UIOK = 1
!       print 'ok.'
!     except ImportError:
!       print 'not found.'
!     except RuntimeError:
!       print 'found (but X is not running).'
!       UIOK = 1
  
!     # FIXME: We have more UIDrivers, add check for qt!
  
      if UIOK != 1:
        print "---"
***************
*** 141,146 ****
--- 161,167 ----
  No valid UI drivers are installed on this machine.
  Please install one of the following packages:
    wxPython      - www.wxpython.org
+   pyGTK2        - ftp://ftp.gtk.org/pub/gtk/python/v2.0/
    pyncurses     - pyncurses.sourceforge.net
    python curses - Read python install docs on how to activate
  The file 'INSTALL' contains more information about dependencies.