gnue-designer scripts/gnue-designer src/base/In...

[Bajusz Tamás]

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

Modified files:
        scripts        : gnue-designer 
        src/base       : Instance.py 
        src/forms/wizards: __init__.py 
        src/navigator/wizards: __init__.py 
        src/reports/wizards: __init__.py 
        src/schema/wizards: __init__.py 
        src/templates  : __init__.py 
        src/templates/forms: __init__.py 
        src/templates/reports: __init__.py 
        src/templates/schema: __init__.py 

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

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-designer/scripts/gnue-designer.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-designer/src/base/Instance.py.diff?tr1=1.119&tr2=1.120&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-designer/src/forms/wizards/__init__.py.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-designer/src/navigator/wizards/__init__.py.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-designer/src/reports/wizards/__init__.py.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-designer/src/schema/wizards/__init__.py.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-designer/src/templates/__init__.py.diff?tr1=1.12&tr2=1.13&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-designer/src/templates/forms/__init__.py.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-designer/src/templates/reports/__init__.py.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-designer/src/templates/schema/__init__.py.diff?tr1=1.2&tr2=1.3&r1=text&r2=text

Patches:
Index: gnue-designer/scripts/gnue-designer
diff -c gnue-designer/scripts/gnue-designer:1.1 
gnue-designer/scripts/gnue-designer:1.2
*** gnue-designer/scripts/gnue-designer:1.1     Sun Oct  5 05:34:56 2003
--- gnue-designer/scripts/gnue-designer Sun Oct  5 14:05:05 2003
***************
*** 21,43 ****
  # write to the Free Software Foundation, Inc., 59 Temple Place
  # - Suite 330, Boston, MA 02111-1307, USA.
  #
! # $Id: gnue-designer,v 1.1 2003/10/05 09:34:56 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.designer import Designer
  
--- 21,27 ----
  # write to the Free Software Foundation, Inc., 59 Temple Place
  # - Suite 330, Boston, MA 02111-1307, USA.
  #
! # $Id: gnue-designer,v 1.2 2003/10/05 18:05:05 btami Exp $
  
  from gnue.designer import Designer
  
Index: gnue-designer/src/base/Instance.py
diff -c gnue-designer/src/base/Instance.py:1.119 
gnue-designer/src/base/Instance.py:1.120
*** gnue-designer/src/base/Instance.py:1.119    Fri Aug 22 14:39:18 2003
--- gnue-designer/src/base/Instance.py  Sun Oct  5 14:05:05 2003
***************
*** 665,687 ****
  
  ############################
  # This is a workaround for McMillan packaging!!!
- # gnue.designer.WizardFiles.py
- # is autocreated at McMillan's analysis time by
- # hook-gnue.designer.Designer.py
- # It contains a list of available wizards.
  # McMillan sets sys.frozen=1 in packaged exe file.
  ############################
      if hasattr(sys, 'frozen'):
!       from gnue.designer import WizardFiles
!       for template in WizardFiles.WizardFiles:
!         t = template.split('.')
!         if '.'.join(t[0:4]) == package.__name__:
!           try:
!             templates.append(dyn_import('%s' % template).TemplateInformation)
!           except ImportError:
!             pass
!           except AttributeError:
!             pass
      else:
  ############
  # end of workaround
--- 665,681 ----
  
  ############################
  # 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:
!         try:
!           templates.append(dyn_import('%s.%s' % 
(package.__name__,wizard)).TemplateInformation)
!         except ImportError:
!           pass
!         except AttributeError:
!           pass
      else:
  ############
  # end of workaround
Index: gnue-designer/src/forms/wizards/__init__.py
diff -c gnue-designer/src/forms/wizards/__init__.py:1.1 
gnue-designer/src/forms/wizards/__init__.py:1.2
*** gnue-designer/src/forms/wizards/__init__.py:1.1     Mon Jul  8 23:06:13 2002
--- gnue-designer/src/forms/wizards/__init__.py Sun Oct  5 14:05:06 2003
***************
*** 0 ****
--- 1,13 ----
+ WIZARDS = [
+   'AddBlock',
+   'AddBox',
+   'AddButton',
+   'AddCheckbox',
+   'AddDataSource',
+   'AddDropDown',
+   'AddEntry',
+   'AddLabel',
+   'AddPage',
+ #  'CreateSchema',
+   'CreateWebForm',
+   ]
Index: gnue-designer/src/navigator/wizards/__init__.py
diff -c gnue-designer/src/navigator/wizards/__init__.py:1.1 
gnue-designer/src/navigator/wizards/__init__.py:1.2
*** gnue-designer/src/navigator/wizards/__init__.py:1.1 Tue Jul  9 00:03:45 2002
--- gnue-designer/src/navigator/wizards/__init__.py     Sun Oct  5 14:05:06 2003
***************
*** 0 ****
--- 1 ----
+ WIZARDS = []
Index: gnue-designer/src/reports/wizards/__init__.py
diff -c gnue-designer/src/reports/wizards/__init__.py:1.1 
gnue-designer/src/reports/wizards/__init__.py:1.2
*** gnue-designer/src/reports/wizards/__init__.py:1.1   Tue Jul  9 00:03:45 2002
--- gnue-designer/src/reports/wizards/__init__.py       Sun Oct  5 14:05:06 2003
***************
*** 0 ****
--- 1 ----
+ WIZARDS = []
Index: gnue-designer/src/schema/wizards/__init__.py
diff -c gnue-designer/src/schema/wizards/__init__.py:1.1 
gnue-designer/src/schema/wizards/__init__.py:1.2
*** gnue-designer/src/schema/wizards/__init__.py:1.1    Tue Jul  9 00:03:45 2002
--- gnue-designer/src/schema/wizards/__init__.py        Sun Oct  5 14:05:06 2003
***************
*** 0 ****
--- 1,4 ----
+ WIZARDS = [
+   'AddTable',
+ #  'WriteSchema',
+   ]
Index: gnue-designer/src/templates/__init__.py
diff -c gnue-designer/src/templates/__init__.py:1.12 
gnue-designer/src/templates/__init__.py:1.13
*** gnue-designer/src/templates/__init__.py:1.12        Mon Feb 17 02:32:53 2003
--- gnue-designer/src/templates/__init__.py     Sun Oct  5 14:05:06 2003
***************
*** 67,88 ****
  
  ############################
  # This is a workaround for McMillan packaging!!!
- # gnue.designer.TemplateFiles.py
- # is autocreated at McMillan's analysis time by
- # hook-gnue.designer.TemplateChooser.py
- # It contains a list of available templates.
  # McMillan sets sys.frozen=1 in packaged exe file.
  ############################
    import sys
    if hasattr(sys, 'frozen'):
!     from gnue.designer import TemplateFiles
!     for template in TemplateFiles.TemplateFiles:
!       t = template.split('.')
!       if '.'.join(t[0:4]) == package.__name__:
!         try:
!           templates.append(dyn_import('%s' % template).TemplateInformation)
!         except ImportError:
!           pass
    else:
  ############
  # end of workaround
--- 67,82 ----
  
  ############################
  # 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:
!       try:
!         templates.append(dyn_import('%s.%s' % 
(package.__name__,template)).TemplateInformation)
!       except ImportError:
!         pass
    else:
  ############
  # end of workaround
Index: gnue-designer/src/templates/forms/__init__.py
diff -c gnue-designer/src/templates/forms/__init__.py:1.5 
gnue-designer/src/templates/forms/__init__.py:1.6
*** gnue-designer/src/templates/forms/__init__.py:1.5   Wed Jan  1 19:45:47 2003
--- gnue-designer/src/templates/forms/__init__.py       Sun Oct  5 14:05:06 2003
***************
*** 28,30 ****
--- 28,31 ----
  # Our package name
  PACKAGE = 'Forms'
  
+ TEMPLATES = ['FormBuilder', 'Simple',]
Index: gnue-designer/src/templates/reports/__init__.py
diff -c gnue-designer/src/templates/reports/__init__.py:1.4 
gnue-designer/src/templates/reports/__init__.py:1.5
*** gnue-designer/src/templates/reports/__init__.py:1.4 Wed Jan  1 19:45:47 2003
--- gnue-designer/src/templates/reports/__init__.py     Sun Oct  5 14:05:06 2003
***************
*** 28,30 ****
--- 28,31 ----
  # Our package name
  PACKAGE = 'Reports'
  
+ TEMPLATES = ['Labels', 'MailMerge', 'SimpleReport',]
Index: gnue-designer/src/templates/schema/__init__.py
diff -c gnue-designer/src/templates/schema/__init__.py:1.2 
gnue-designer/src/templates/schema/__init__.py:1.3
*** gnue-designer/src/templates/schema/__init__.py:1.2  Wed Jan  1 19:45:47 2003
--- gnue-designer/src/templates/schema/__init__.py      Sun Oct  5 14:05:06 2003
***************
*** 28,30 ****
--- 28,31 ----
  # Our package name
  PACKAGE = 'Schema'
  
+ TEMPLATES = ['Introspection',]