r5536 - in trunk: gnue-designer/src/base gnue-designer/src/templates gnue-forms/src gnue-forms/src/uidrivers/_base gnue-pointofsale/src

[btami]

Author: btami
Date: 2004-03-26 16:57:10 -0600 (Fri, 26 Mar 2004)
New Revision: 5536

Modified:
   trunk/gnue-designer/src/base/Instance.py
   trunk/gnue-designer/src/templates/__init__.py
   trunk/gnue-forms/src/GFClient.py
   trunk/gnue-forms/src/GFInstance.py
   trunk/gnue-forms/src/uidrivers/_base/UIdriver.py
   trunk/gnue-pointofsale/src/POSClient.py
Log:
switching win32 .exe installer to py2exe (part 1)

Modified: trunk/gnue-designer/src/base/Instance.py
===================================================================
--- trunk/gnue-designer/src/base/Instance.py    2004-03-26 22:23:50 UTC (rev 
5535)
+++ trunk/gnue-designer/src/base/Instance.py    2004-03-26 22:57:10 UTC (rev 
5536)
@@ -664,45 +664,27 @@
   def loadWizards(self, package):
     templates = []
 
-############################
-# This is a workaround for McMillan packaging!!!
-# McMillan sets sys.frozen=1 in packaged exe file.
-############################
-    if hasattr(sys, 'frozen'):
-      exec "from %s import WIZARDS" % package.__name__
-      for wizard in WIZARDS:
+    basedir = os.path.dirname(package.__file__)
+    processed = []  # Base file names processed (e.g., base of Simple.py*
+                  # is Simple) This will keep us from importing Simple
+                  # three times if Simple.py, Simple.pyc, and Simple.lib
+                  # all exist.
+
+    for dir in dircache.listdir(basedir):
+      base = string.split(dir,'.')[0]
+      if not dir[0] in ('.','_') and not base in processed:
+        processed.append(base)
         try:
-          templates.append(dyn_import('%s.%s' % 
(package.__name__,wizard)).TemplateInformation)
-        except ImportError:
-          pass
+          templates.append(dyn_import(
+             '%s.%s' % (package.__name__,base)).TemplateInformation)
+        except ImportError, mesg:
+          GDebug.printMesg(2,"%s.%s doesn't appear to be a valid wizard" % 
(package.__name__, base))
+          GDebug.printMesg(5,' --> %s' % (mesg))
         except AttributeError:
-          pass
-    else:
-############
-# end of workaround
-############
+          GDebug.printMesg(2,'Wizard %s for package %s is missing'
+                   ' an \'TemplateInformation\' attribute.' %
+                           (base,package.__name__))
 
-      basedir = os.path.dirname(package.__file__)
-      processed = []  # Base file names processed (e.g., base of Simple.py*
-                    # is Simple) This will keep us from importing Simple
-                    # three times if Simple.py, Simple.pyc, and Simple.lib
-                    # all exist.
-
-      for dir in dircache.listdir(basedir):
-        base = string.split(dir,'.')[0]
-        if not dir[0] in ('.','_') and not base in processed:
-          processed.append(base)
-          try:
-            templates.append(dyn_import(
-               '%s.%s' % (package.__name__,base)).TemplateInformation)
-          except ImportError, mesg:
-            GDebug.printMesg(2,"%s.%s doesn't appear to be a valid wizard" % 
(package.__name__, base))
-            GDebug.printMesg(5,' --> %s' % (mesg))
-          except AttributeError:
-            GDebug.printMesg(2,'Wizard %s for package %s is missing'
-                     ' an \'TemplateInformation\' attribute.' %
-                             (base,package.__name__))
-
     for template in templates:
       try:
         location = template['MenuLocation']

Modified: trunk/gnue-designer/src/templates/__init__.py
===================================================================
--- trunk/gnue-designer/src/templates/__init__.py       2004-03-26 22:23:50 UTC 
(rev 5535)
+++ trunk/gnue-designer/src/templates/__init__.py       2004-03-26 22:57:10 UTC 
(rev 5536)
@@ -65,36 +65,19 @@
 def GetAvailableTemplates(package):
   templates = []
 
-############################
-# This is a workaround for McMillan packaging!!!
-# McMillan sets sys.frozen=1 in packaged exe file.
-############################
-  import sys
-  if hasattr(sys, 'frozen'):
-    exec "from %s import TEMPLATES" % package.__name__
-    for template in TEMPLATES:
+  basedir = os.path.dirname(package.__file__)
+  processed = []  # Base file names processed (e.g., base of Simply.py*
+                # is Simple) This will keep us from importing Simple
+                # three times if Simple.py, Simple.pyc, and Simple.lib
+                # all exist.
+
+  for dir in dircache.listdir(basedir):
+    base = string.split(dir,'.')[0]
+    if not dir[0] in ('.','_') and not base in processed:
+      processed.append(base)
       try:
-        templates.append(dyn_import('%s.%s' % 
(package.__name__,template)).TemplateInformation)
+        templates.append(dyn_import(
+           '%s.%s' % (package.__name__,base)).TemplateInformation)
       except ImportError:
         pass
-  else:
-############
-# end of workaround
-############
-
-    basedir = os.path.dirname(package.__file__)
-    processed = []  # Base file names processed (e.g., base of Simply.py*
-                  # is Simple) This will keep us from importing Simple
-                  # three times if Simple.py, Simple.pyc, and Simple.lib
-                  # all exist.
-
-    for dir in dircache.listdir(basedir):
-      base = string.split(dir,'.')[0]
-      if not dir[0] in ('.','_') and not base in processed:
-        processed.append(base)
-        try:
-          templates.append(dyn_import(
-             '%s.%s' % (package.__name__,base)).TemplateInformation)
-        except ImportError:
-          pass
   return templates

Modified: trunk/gnue-forms/src/GFClient.py
===================================================================
--- trunk/gnue-forms/src/GFClient.py    2004-03-26 22:23:50 UTC (rev 5535)
+++ trunk/gnue-forms/src/GFClient.py    2004-03-26 22:57:10 UTC (rev 5536)
@@ -152,10 +152,6 @@
     #
     self.getConnectionManager().setLoginHandler(self._ui.UILoginHandler())
 
-    # Hack for McMillan packaging on win32
-    if hasattr(sys, 'frozen') and self.ui_type == 'wx':
-      self._ui.UILoginHandler().getDummyLogin()
-
     #
     # Create the Instance that will control the loaded form(s)
     #

Modified: trunk/gnue-forms/src/GFInstance.py
===================================================================
--- trunk/gnue-forms/src/GFInstance.py  2004-03-26 22:23:50 UTC (rev 5535)
+++ trunk/gnue-forms/src/GFInstance.py  2004-03-26 22:57:10 UTC (rev 5536)
@@ -171,47 +171,27 @@
     # Import and register dialogs
     #
 
-############################
-# 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:
-          self.addFormFromBuffer(dialog.buildForm())
-        except StandardError, mesg:
-          print "WARNING: Cannot build %s form \n%s" % (dialog,mesg)
-    else:
-############
-# end of workaround
-############
+    basedir  = os.path.dirname(sys.modules[self.__module__].__file__)
+    basedir +='/dialogs/'
+    for dialogName in dircache.listdir(basedir):
+       #try:
+         if dialogName[0] != '_' and dialogName != '.svn':
 
-      basedir  = os.path.dirname(sys.modules[self.__module__].__file__)
-      basedir +='/dialogs/'
-      for dialogName in dircache.listdir(basedir):
-         #try:
-           if dialogName[0] != '_' and dialogName != '.svn':
+          if os.path.isfile(basedir+dialogName) and 
os.path.splitext(dialogName)[1] == ".py":
+             dialogName = os.path.splitext(dialogName)[0]
+             dialog = dyn_import('gnue.forms.dialogs.%s' %(dialogName))
+           elif os.path.isdir(basedir+dialogName):
+             dialog = dyn_import('gnue.forms.dialogs.%s' %(dialogName))
+           try:
+             self.addFormFromBuffer(dialog.buildForm())
+           except StandardError, mesg:
+             print "WARNING: Cannot build %s form \n%s" % (dialogName,mesg)
 
-             if os.path.isfile(basedir+dialogName) and 
os.path.splitext(dialogName)[1] == ".py":
-               dialogName = os.path.splitext(dialogName)[0]
-               dialog = dyn_import('gnue.forms.dialogs.%s' %(dialogName))
-             elif os.path.isdir(basedir+dialogName):
-               dialog = dyn_import('gnue.forms.dialogs.%s' %(dialogName))
-             try:
-               self.addFormFromBuffer(dialog.buildForm())
-             except StandardError, mesg:
-               print "WARNING: Cannot build %s form \n%s" % (dialogName,mesg)
+       #except ImportError, mesg:
+       #  GDebug.printMesg(2,"dialogs.%s doesn't appear to be a valid dialog" 
% (dialogName))
+       #  GDebug.printMesg(5,' --> %s' % (mesg))
 
-         #except ImportError, mesg:
-         #  GDebug.printMesg(2,"dialogs.%s doesn't appear to be a valid 
dialog" % (dialogName))
-         #  GDebug.printMesg(5,' --> %s' % (mesg))
 
-
   #
   # addFormFromBuffer
   #

Modified: trunk/gnue-forms/src/uidrivers/_base/UIdriver.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/_base/UIdriver.py    2004-03-26 22:23:50 UTC 
(rev 5535)
+++ trunk/gnue-forms/src/uidrivers/_base/UIdriver.py    2004-03-26 22:57:10 UTC 
(rev 5536)
@@ -122,48 +122,29 @@
     #
     self._supportedWidgets = {}
 
-############################
-# 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]
+    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] != '_':
+          if os.path.isfile(basedir+widgetName) and 
os.path.splitext(widgetName)[1] == ".py":
+            widgetName = os.path.splitext(widgetName)[0]
+            widget = dyn_import('gnue.forms.uidrivers.%s.widgets.%s' 
%(uiDriver,widgetName))
+          elif os.path.isdir(basedir+widgetName):
+            widget = dyn_import('gnue.forms.uidrivers.%s.widgets.%s' 
%(uiDriver,widgetName))
+          else:
+            raise ImportError, "How the fsck did I get here?"
 
-      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
-############
+          try:
+            self._supportedWidgets[widget.configuration['provides']]=widget
+          except Exception,mesg:
+            raise ImportError, mesg
 
-      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] != '_':
-            if os.path.isfile(basedir+widgetName) and 
os.path.splitext(widgetName)[1] == ".py":
-              widgetName = os.path.splitext(widgetName)[0]
-              widget = dyn_import('gnue.forms.uidrivers.%s.widgets.%s' 
%(uiDriver,widgetName))
-            elif os.path.isdir(basedir+widgetName):
-              widget = dyn_import('gnue.forms.uidrivers.%s.widgets.%s' 
%(uiDriver,widgetName))
-            else:
-              raise ImportError, "How the fsck did I get here?"
+      except ImportError, mesg:
+        GDebug.printMesg(2,"%s.widgets.%s doesn't appear to be a valid ui 
widget" % (uiDriver,widgetName))
+        GDebug.printMesg(5,' --> %s' % (mesg))
 
-            try:
-              self._supportedWidgets[widget.configuration['provides']]=widget
-            except Exception,mesg:
-              raise ImportError, mesg
-
-        except ImportError, mesg:
-          GDebug.printMesg(2,"%s.widgets.%s doesn't appear to be a valid ui 
widget" % (uiDriver,widgetName))
-          GDebug.printMesg(5,' --> %s' % (mesg))
-
     ############################################################
     #
     # Things you may need to  adjust in the individual UI drivers

Modified: trunk/gnue-pointofsale/src/POSClient.py
===================================================================
--- trunk/gnue-pointofsale/src/POSClient.py     2004-03-26 22:23:50 UTC (rev 
5535)
+++ trunk/gnue-pointofsale/src/POSClient.py     2004-03-26 22:57:10 UTC (rev 
5536)
@@ -110,11 +110,6 @@
     #
     ##userParameters = self.getCommandLineParameters(self.ARGUMENTS[1:])
 
-    # Hack for McMillan packaging on win32
-    # TODO: This was copied over from GFClient in forms; does PoS need it?
-    if hasattr(sys, 'frozen'):
-      self.frontend.UILoginHandler().getDummyLogin()
-
     self.handler.run()
 
     #