gnue-forms scripts/gnue-forms src/GFInstance.py...

[Bajusz Tamás]

CVSROOT:        /cvsroot/gnue
Module name:    gnue-forms
Branch:         
Changes by:     Bajusz Tamás <address@hidden>   03/10/05 14:04:34

Modified files:
        scripts        : gnue-forms 
        src            : GFInstance.py 
        src/dialogs    : __init__.py 
        src/uidrivers/_base: UIdriver.py 
        src/uidrivers/_base/widgets: __init__.py 

Log message:
        updating "magic" code needed for mcmillan packaging on win32

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-forms/scripts/gnue-forms.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-forms/src/GFInstance.py.diff?tr1=1.118&tr2=1.119&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-forms/src/dialogs/__init__.py.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-forms/src/uidrivers/_base/UIdriver.py.diff?tr1=1.103&tr2=1.104&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-forms/src/uidrivers/_base/widgets/__init__.py.diff?tr1=1.1&tr2=1.2&r1=text&r2=text

Patches:
Index: gnue-forms/scripts/gnue-forms
diff -c gnue-forms/scripts/gnue-forms:1.2 gnue-forms/scripts/gnue-forms:1.3
*** gnue-forms/scripts/gnue-forms:1.2   Sun Oct  5 04:44:00 2003
--- gnue-forms/scripts/gnue-forms       Sun Oct  5 14:04:34 2003
***************
*** 21,43 ****
  # write to the Free Software Foundation, Inc., 59 Temple Place
  # - Suite 330, Boston, MA 02111-1307, USA.
  #
! # $Id: gnue-forms,v 1.2 2003/10/05 08:44:00 reinhard Exp $
! 
! import os
! import sys
! 
! if sys.platform == "win32":
!   if __name__ == "__main__":
!     _BASE = os.path.abspath (os.path.join (os.path.dirname (sys.argv[0]), 
".."))
!     _newpath = os.path.abspath (os.path.dirname (sys.argv[0]))
!     if os.environ.has_key ("PATH"):
!       _newpath = _newpath + ";" + os.environ ["PATH"]
!     os.environ ["PATH"] = _newpath
!   else:
!     _BASE = os.path.abspath (os.path.join (os.path.dirname (__file__), ".."))
!   os.putenv ("PYTHONCASEOK","1")
!   if os.path.isdir (os.path.join (_BASE, "extras")):
!     sys.path.append (os.path.join (_BASE, "extras"))
  
  from  gnue.forms import GFClient
  
--- 21,27 ----
  # write to the Free Software Foundation, Inc., 59 Temple Place
  # - Suite 330, Boston, MA 02111-1307, USA.
  #
! # $Id: gnue-forms,v 1.3 2003/10/05 18:04:34 btami Exp $
  
  from  gnue.forms import GFClient
  
Index: gnue-forms/src/GFInstance.py
diff -c gnue-forms/src/GFInstance.py:1.118 gnue-forms/src/GFInstance.py:1.119
*** gnue-forms/src/GFInstance.py:1.118  Thu Sep  4 17:06:51 2003
--- gnue-forms/src/GFInstance.py        Sun Oct  5 14:04:34 2003
***************
*** 169,185 ****
  
  ############################
  # This is a workaround for McMillan packaging!!!
- # gnue.forms.dialogs.DialogFiles.py
- # is autocreated at McMillan's analysis time by
- # hook-gnue.forms.GFInstance.py
- # It contains a list of available dialogs.
  # McMillan sets sys.frozen=1 in packaged exe file.
  ############################
      if hasattr(sys, 'frozen'):
!       from gnue.forms.dialogs import DialogFiles
!       for dialog in DialogFiles.DialogFiles:
          try:
!           dialog = dyn_import('%s' % dialog)
          except ImportError:
            print 'ImportError',dialog
          try:
--- 169,181 ----
  
  ############################
  # This is a workaround for McMillan packaging!!!
  # McMillan sets sys.frozen=1 in packaged exe file.
  ############################
      if hasattr(sys, 'frozen'):
!       from gnue.forms.dialogs import DIALOGS
!       for dialog in DIALOGS:
          try:
!           dialog = dyn_import('gnue.forms.dialogs.%s' % dialog)
          except ImportError:
            print 'ImportError',dialog
          try:
Index: gnue-forms/src/dialogs/__init__.py
diff -c gnue-forms/src/dialogs/__init__.py:1.1 
gnue-forms/src/dialogs/__init__.py:1.2
*** gnue-forms/src/dialogs/__init__.py:1.1      Wed Feb 12 22:33:32 2003
--- gnue-forms/src/dialogs/__init__.py  Sun Oct  5 14:04:34 2003
***************
*** 0 ****
--- 1 ----
+ DIALOGS = ['about', 'jumpto', 'messageBox',]
\ No newline at end of file
Index: gnue-forms/src/uidrivers/_base/UIdriver.py
diff -c gnue-forms/src/uidrivers/_base/UIdriver.py:1.103 
gnue-forms/src/uidrivers/_base/UIdriver.py:1.104
*** gnue-forms/src/uidrivers/_base/UIdriver.py:1.103    Sat Jul  5 18:06:35 2003
--- gnue-forms/src/uidrivers/_base/UIdriver.py  Sun Oct  5 14:04:34 2003
***************
*** 114,137 ****
  
  ############################
  # This is a workaround for McMillan packaging!!!
- # gnue.forms.uidrivers._base.WidgetFiles.py
- # is autocreated at McMillan's analysis time by
- # hook-gnue.forms.uidrivers._base.UIdriver.py
- # It contains a list of available widgets.
  # McMillan sets sys.frozen=1 in packaged exe file.
  ############################
      if hasattr(sys, 'frozen'):
!       basedir  = os.path.dirname(sys.modules[self.__module__].__file__)
!       uiDriver = os.path.basename(basedir)
        
!       from gnue.forms.uidrivers._base import WidgetFiles
!       for widgetName in WidgetFiles.WidgetFiles:
!         if widgetName.count(uiDriver):
!           try:
!             widget = dyn_import('%s' % widgetName)
!           except ImportError:
!             print 'ImportError',widgetName
!           self._supportedWidgets[widget.configuration['provides']]=widget
      else:
  ############
  # end of workaround
--- 114,131 ----
  
  ############################
  # This is a workaround for McMillan packaging!!!
  # McMillan sets sys.frozen=1 in packaged exe file.
  ############################
      if hasattr(sys, 'frozen'):
!       uiDriver = sys.modules[self.__module__].__file__.split('.')[-2]
        
!       from gnue.forms.uidrivers._base.widgets import WIDGETS
!       for widgetName in WIDGETS:
!         try:
!           widget = dyn_import('gnue.forms.uidrivers.%s.widgets.%s' 
%(uiDriver,widgetName))
!         except ImportError:
!           print 'ImportError',widgetName
!         self._supportedWidgets[widget.configuration['provides']]=widget
      else:
  ############
  # end of workaround
***************
*** 140,146 ****
        basedir  = os.path.dirname(sys.modules[self.__module__].__file__)
        uiDriver = os.path.basename(basedir)
        basedir +='/widgets/'
-       
        for widgetName in dircache.listdir(basedir):
          try:
            if widgetName[0] != '_':
--- 134,139 ----
Index: gnue-forms/src/uidrivers/_base/widgets/__init__.py
diff -c gnue-forms/src/uidrivers/_base/widgets/__init__.py:1.1 
gnue-forms/src/uidrivers/_base/widgets/__init__.py:1.2
*** gnue-forms/src/uidrivers/_base/widgets/__init__.py:1.1      Mon Feb 10 
21:01:49 2003
--- gnue-forms/src/uidrivers/_base/widgets/__init__.py  Sun Oct  5 14:04:34 2003
***************
*** 0 ****
--- 1,11 ----
+ WIDGETS = [
+   'box',
+   'button',
+   'component',
+   'entry',
+   'form',
+   'image',
+   'label',
+   'page',
+   'scrollbar',
+ ]
\ No newline at end of file