gnue designer/MANIFEST.in designer/setup.py des...

[James Thompson]

CVSROOT:        /cvs
Module name:    gnue
Changes by:     James Thompson <address@hidden> 01/06/30 15:58:26

Modified files:
        designer       : MANIFEST.in setup.py 
        designer/src   : GFDesigner.py Instance.py RuntimeSettings.py 
        gnue-common    : MANIFEST.in setup.py 
        gnuef          : INSTALL INSTALL.win32 MANIFEST.in build_win.bat 
                         setup.py 
        gnuef/samples/history: myform.gfd 
        gnuef/src/GFObjects: GFBlock.py 
Added files:
        designer       : INSTALL 

Log message:
        Switch designer RuntimeSettings to use $HOME var (you can use this in 
windows)
        Changes to make an installed designer work properly
        Misc setup tweaks for win32/unix
        Docs updates
        Misc stuff I've forgotten

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/designer/INSTALL?cvsroot=OldCVS&rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/designer/MANIFEST.in.diff?cvsroot=OldCVS&tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/designer/setup.py.diff?cvsroot=OldCVS&tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/designer/src/GFDesigner.py.diff?cvsroot=OldCVS&tr1=1.13&tr2=1.14&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/designer/src/Instance.py.diff?cvsroot=OldCVS&tr1=1.13&tr2=1.14&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/designer/src/RuntimeSettings.py.diff?cvsroot=OldCVS&tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-common/MANIFEST.in.diff?cvsroot=OldCVS&tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-common/setup.py.diff?cvsroot=OldCVS&tr1=1.12&tr2=1.13&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnuef/INSTALL.diff?cvsroot=OldCVS&tr1=1.15&tr2=1.16&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnuef/INSTALL.win32.diff?cvsroot=OldCVS&tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnuef/MANIFEST.in.diff?cvsroot=OldCVS&tr1=1.9&tr2=1.10&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnuef/build_win.bat.diff?cvsroot=OldCVS&tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnuef/setup.py.diff?cvsroot=OldCVS&tr1=1.34&tr2=1.35&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnuef/samples/history/myform.gfd.diff?cvsroot=OldCVS&tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnuef/src/GFObjects/GFBlock.py.diff?cvsroot=OldCVS&tr1=1.1&tr2=1.2&r1=text&r2=text

Patches:
Index: gnue/designer/MANIFEST.in
diff -u gnue/designer/MANIFEST.in:1.1 gnue/designer/MANIFEST.in:1.2
--- gnue/designer/MANIFEST.in:1.1       Sat Jun 30 12:54:29 2001
+++ gnue/designer/MANIFEST.in   Sat Jun 30 15:58:26 2001
@@ -8,3 +8,4 @@
 include FAQ
 
 include client/gfdesigner.in
+include setup.cfg.in
\ No newline at end of file
Index: gnue/designer/setup.py
diff -u gnue/designer/setup.py:1.6 gnue/designer/setup.py:1.7
--- gnue/designer/setup.py:1.6  Sat Jun 30 12:54:29 2001
+++ gnue/designer/setup.py      Sat Jun 30 15:58:26 2001
@@ -24,10 +24,21 @@
 import string
 import os
 import os.path
-
-if sys.platform != 'win32':
-    os.system (""" cp setup.cfg.in setup.cfg""")
+#
+# hack to deal w/ fact distutils won't
+# allow us to set absolute path prefix
+# on windows
+#
 
+if not 'sdist' in sys.argv:
+    if sys.platform != 'win32':
+        os.system ("""cp setup.cfg.in setup.cfg""")
+    else:
+        try:
+            os.remove('setup.cfg')
+        except:
+            pass
+                                
 def developer_install():
   pwd = os.getcwd()
 
@@ -138,16 +149,13 @@
 
     if sys.platform != 'win32':
       gnue_env = \
-           "#######\n" \
-         + "# The following variable were set when GNUe was installed\n\n" \
-         + "PYTHONPATH=%s:$PYTHONPATH\n" % dict['install_lib'][1] \
-         + "INST_GNUE_CONNECTIONS=%s/etc/connections.conf\n" % 
dict['prefix'][1] \
-         + "PYTHON=python\n" \
-         + "INSTALL_LIB=%s\n" % dict['install_lib'][1] \
-         + "INSTALL_PREFIX=%s\n" % dict['prefix'][1] \
-         + "export INST_GNUE_CONNECTIONS PYTHON INSTALL_LIB\n" \
-         + "export INSTALL_PREFIX PYTHONPATH\n" \
-         + "#######\n"
+               "#######\n" \
+               + "# The following variable were set when GNUe was 
installed\n\n" \
+               + "sys.path.append('%s')\n" % dict['install_lib'][1] \
+               + "INST_GNUE_CONNECTIONS='%s/etc/connections.conf'\n" % 
dict['prefix'][1] \
+               + "os.environ['INSTALL_LIB']='%s'\n" % dict['install_lib'][1] \
+               + "os.environ['INSTALL_PREFIX']='%s'\n" % dict['prefix'][1] \
+               + "#######\n"
     else:
       gnue_env = \
                "#######\n" \
@@ -201,8 +209,9 @@
        scripts = ["client/gfdesigner"]
        )
 
-if sys.platform != 'win32':
-    os.system (""" /bin/rm -rf setup.cfg""")
+if not 'sdist' in sys.argv:
+    if sys.platform != 'win32':
+        os.system (""" /bin/rm -rf setup.cfg""")
 
     
 
Index: gnue/designer/src/GFDesigner.py
diff -u gnue/designer/src/GFDesigner.py:1.13 
gnue/designer/src/GFDesigner.py:1.14
--- gnue/designer/src/GFDesigner.py:1.13        Mon Jun 25 21:49:19 2001
+++ gnue/designer/src/GFDesigner.py     Sat Jun 30 15:58:26 2001
@@ -34,7 +34,7 @@
 import TemplateParser
 
 
-TITLE = "GNU Enterprise Designer"
+#TITLE = "GNU Enterprise Designer"
 VERSION = "pre0.0.1"
 
 class GFDesigner(GClientApp, wxApp):
Index: gnue/designer/src/Instance.py
diff -u gnue/designer/src/Instance.py:1.13 gnue/designer/src/Instance.py:1.14
--- gnue/designer/src/Instance.py:1.13  Sun Jun 24 19:59:30 2001
+++ gnue/designer/src/Instance.py       Sat Jun 30 15:58:26 2001
@@ -31,16 +31,19 @@
 from gnue.common import GDebug, GConfig
 from gnue.common.GClientApp import GClientApp
 from gnue.forms import GFForm, GFInstance, GFParser, GFObjects, GFTrigger, 
GFLibrary, UIwxpython
-from Debugger import DebugSession
-from GFDesigner import *
-from MenuBar import *
-from LayoutEditor import *
-from TreeView import *
-from PropertyEditor import * 
-from TriggerEditor import *
-import RuntimeSettings
-from Incubator import elements
-from ToolFrame import ToolFrame
+from gnue.designer.Debugger import DebugSession
+#from gnue.designer.GFDesigner import *
+from gnue.designer.MenuBar import *
+from gnue.designer.LayoutEditor import *
+from gnue.designer.TreeView import *
+from gnue.designer.PropertyEditor import * 
+from gnue.designer.TriggerEditor import *
+from gnue.designer import RuntimeSettings
+from gnue.designer.Incubator import elements
+from gnue.designer.ToolFrame import ToolFrame
+
+TITLE =  "GNU Enterprise Designer"
+
 
 class GFDInstance(GFInstance.GFInstance, wxFrame):
   def __init__(self, app, location=None): 
Index: gnue/designer/src/RuntimeSettings.py
diff -u gnue/designer/src/RuntimeSettings.py:1.3 
gnue/designer/src/RuntimeSettings.py:1.4
--- gnue/designer/src/RuntimeSettings.py:1.3    Mon Jun 25 21:49:19 2001
+++ gnue/designer/src/RuntimeSettings.py        Sat Jun 30 15:58:26 2001
@@ -29,21 +29,15 @@
 
 import sys, os, ConfigParser
 
-if os.name == 'posix': 
-  location = os.path.expanduser ('~/.gnue/gnue-des.ini')
+if os.environ.has_key('HOME'):
   try: 
-    os.makedirs(os.path.expanduser('~/.gnue'))
-  except: 
+    os.makedirs(os.environ['HOME']+'/.gnue')
+  except:
     pass
-else: 
-
-  # TODO: Using os.path.expanduser does not work under 
-  # TODO: Windows?? Therefore, saving RuntimeSettings 
-  # TODO: currently isn't working for windows.
-
-  location = os.path.expanduser ('~/gnue-des.ini')
+  location = os.environ['HOME']+'/.gnue/gnue-des.ini'
+else:
+  location = None
 
-
 try: 
   config = ConfigParser.ConfigParser()
   config.read(location)
@@ -73,21 +67,22 @@
 # Save the runtime settings
 # 
 def saveRuntimeSettings(instance): 
-  try: 
-    fh = open(location,'w')
+  if location:
     try:
-      for h in instance._runtimes: 
-        section, hash = h.saveRuntimeSettings()
-
-        fh.write ("\n[%s]\n" % section)
-        for key in hash.keys(): 
-          fh.write ("%s=%s\n" % (key, hash[key]))
-      fh.write("\n") 
+      fh = open(location,'w')
+      try:
+        for h in instance._runtimes: 
+          section, hash = h.saveRuntimeSettings()
+
+          fh.write ("\n[%s]\n" % section)
+          for key in hash.keys(): 
+            fh.write ("%s=%s\n" % (key, hash[key]))
+        fh.write("\n") 
+      except: 
+        print "\nWarning: Unable to save session data to %s\n" % location
+      fh.close()
     except: 
       print "\nWarning: Unable to save session data to %s\n" % location
-    fh.close()
-  except: 
-    print "\nWarning: Unable to save session data to %s\n" % location
 #
 # Any object (class) that has settings it wants saved should 
 # register with this method.  The object should define a
Index: gnue/gnue-common/MANIFEST.in
diff -u gnue/gnue-common/MANIFEST.in:1.3 gnue/gnue-common/MANIFEST.in:1.4
--- gnue/gnue-common/MANIFEST.in:1.3    Mon Jun 25 21:32:46 2001
+++ gnue/gnue-common/MANIFEST.in        Sat Jun 30 15:58:26 2001
@@ -7,6 +7,7 @@
 include THANKS
 include TODO
 
+include setup.cfg.in
 include images/*.png
 include setupext/*.py
 include etc/*
Index: gnue/gnue-common/setup.py
diff -u gnue/gnue-common/setup.py:1.12 gnue/gnue-common/setup.py:1.13
--- gnue/gnue-common/setup.py:1.12      Sat Jun 30 12:54:29 2001
+++ gnue/gnue-common/setup.py   Sat Jun 30 15:58:26 2001
@@ -24,8 +24,20 @@
 import string
 import os
 
-if sys.platform != 'win32':
-  os.system (""" cp setup.cfg.in setup.cfg""")
+#
+# hack to deal w/ fact distutils won't
+# allow us to set absolute path prefix
+# on windows
+#
+
+if not 'sdist' in sys.argv:
+  if sys.platform != 'win32':
+    os.system ("""cp setup.cfg.in setup.cfg""")
+  else:
+    try:
+      os.remove('setup.cfg')
+    except:
+      pass
   
 try:
   from distutils.core import setup
@@ -103,8 +115,9 @@
   directory.  Typically this can be found at 
/usr/lib/python1.5/site-packages/gnue
   """
 
-if sys.platform != 'win32':
-  os.system (""" /bin/rm -rf setup.cfg""")
+if not 'sdist' in sys.argv:
+  if sys.platform != 'win32':
+    os.remove ("setup.cfg")
 
 
 
Index: gnue/gnuef/INSTALL
diff -u gnue/gnuef/INSTALL:1.15 gnue/gnuef/INSTALL:1.16
--- gnue/gnuef/INSTALL:1.15     Mon Jun 25 05:27:19 2001
+++ gnue/gnuef/INSTALL  Sat Jun 30 15:58:26 2001
@@ -15,7 +15,8 @@
 
 GNUe-Forms needs some prerequisites to work. You need a database
 managment system, a user-interface library, python as programming
-language and a xml-handling library.
+language and a xml-handling library.  As of this writting GNUe Forms 
+allows you to use geas, postgresql, mysql, db2, oracle, or odbc.
 
 Later there will be available interoperability for a variety of
 database systems via libgda and GNUe-forms itself is a wrapper around
@@ -26,7 +27,7 @@
 wxWindows which is available for X-Windows.
 
 The (wx-)GNUe-forms client which interpret the forms definition is
-written in Python. It is being tested with python 1.5 and 2.0.
+written in Python. It is being tested with python 1.5 and 2.0.1
 
 The rest of the document describes the steps to install GNUe-forms on
 a Debian 2.2, i386 platform.
Index: gnue/gnuef/INSTALL.win32
diff -u gnue/gnuef/INSTALL.win32:1.2 gnue/gnuef/INSTALL.win32:1.3
--- gnue/gnuef/INSTALL.win32:1.2        Mon Jun 25 05:27:19 2001
+++ gnue/gnuef/INSTALL.win32    Sat Jun 30 15:58:26 2001
@@ -1,11 +1,13 @@
 Installation instructions for GNUe-Forms on Win32 platforms
 
-Changes in 0.0.8 have left Win32 support broken until 0.0.9 is released
+0.0.9 marks the return of windows support.  At this time the
+software isn't as fully tested on windows on *nix based 
+systems.
 
 Prerequisite software packages
 ================================
 
-Python 2.0      www.python.org
+Python 2.0.1    www.python.org
 PyGreSQL 3.1    Access to Postgresql databases
                 www.druid.net/pygresql is the main site however
                 a win32 version of the software is located at
@@ -21,14 +23,14 @@
 You should grab the most recent versions of the following packages
 from www.gnue.org
 
-GNUe Python Base (windows) 
+GNUe Common (windows) 
 GNUe Forms (windows)
 
 Installation
 ============
 
 Installation is fairly simple.  First you must install all of the prerequisite
-software packages starting with Python 2.0.  Then install GNUe Python Base 
+software packages starting with Python 2.0.  Then install GNUe Common
 followed by GNUe Forms
 
 The one package that isn't easily installed is PyGreSQL.  It is contained in
@@ -41,6 +43,7 @@
   python setup.py install
 
 Now you can delete the temporary directory
+
 Using
 =====
 
@@ -59,7 +62,7 @@
 
 Now GNUe Forms can be ran via
 
-python c:\Python20\scripts\gfclient c:\path\to\some\form.gfd
+pythonw c:\Python20\scripts\gfclient c:\path\to\some\form.gfd
 
 To make this easier just create a shortcut that contains this line.
 
@@ -67,3 +70,4 @@
 
 Open Questions:
 ===============
+
Index: gnue/gnuef/MANIFEST.in
diff -u gnue/gnuef/MANIFEST.in:1.9 gnue/gnuef/MANIFEST.in:1.10
--- gnue/gnuef/MANIFEST.in:1.9  Sat Jun 30 12:54:29 2001
+++ gnue/gnuef/MANIFEST.in      Sat Jun 30 15:58:26 2001
@@ -7,6 +7,7 @@
 include TODO
 include FAQ
 
+include setup.cfg.in
 include client/gfclient.in
 recursive-include samples *
 recursive-include setupext *
Index: gnue/gnuef/build_win.bat
diff -u gnue/gnuef/build_win.bat:1.1 gnue/gnuef/build_win.bat:1.2
--- gnue/gnuef/build_win.bat:1.1        Fri Jun 29 22:03:07 2001
+++ gnue/gnuef/build_win.bat    Sat Jun 30 15:58:26 2001
@@ -1,2 +1,3 @@
-python setup.py py2exe -i 
sys,gnue,gnue.forms,gnue.forms.GFObjects,gnue.forms.GFObjects.GFBlock,gnue.common,gnue.common.dbdrivers,xml,xml.sax
+python setup.py py2exe -p sys,gnue,xml
+
 
Index: gnue/gnuef/samples/history/myform.gfd
diff -u gnue/gnuef/samples/history/myform.gfd:1.2 
gnue/gnuef/samples/history/myform.gfd:1.3
--- gnue/gnuef/samples/history/myform.gfd:1.2   Fri Dec 22 15:14:43 2000
+++ gnue/gnuef/samples/history/myform.gfd       Sat Jun 30 15:58:26 2001
@@ -9,13 +9,7 @@
 
   <page>
     <block name="style1">
-      <label>
-        <options>
-          <x>1</x>
-         <y>1</y>
-         <text>Who told you</text>
-        </options>
-      </label>
+      <label x="1" y="1" text="Who told you"/>
       <label text="That you could stop coding?" x="1" y="2"/>
     </block>
   </page>
Index: gnue/gnuef/setup.py
diff -u gnue/gnuef/setup.py:1.34 gnue/gnuef/setup.py:1.35
--- gnue/gnuef/setup.py:1.34    Sat Jun 30 12:54:29 2001
+++ gnue/gnuef/setup.py Sat Jun 30 15:58:26 2001
@@ -31,9 +31,20 @@
   pass
 
 
-if sys.platform != 'win32':
-  os.system (""" cp setup.cfg.in setup.cfg""")
-  
+#
+# hack to deal w/ fact distutils won't
+# allow us to set absolute path prefix
+# on windows
+#
+
+if not 'sdist' in sys.argv:
+  if sys.platform != 'win32':
+    os.system ("""cp setup.cfg.in setup.cfg""")
+  else:
+    try:
+      os.remove('setup.cfg')
+    except:
+      pass
 
 def developer_install():
   pwd = os.getcwd()
@@ -262,5 +273,6 @@
     A sample is provided in that directory that you can typically just copy 
over.
     """
   
-if sys.platform != 'win32':
-  os.system (""" /bin/rm -rf setup.cfg""")
+if not 'sdist' in sys.argv:
+  if sys.platform != 'win32':
+    os.system (""" /bin/rm -rf setup.cfg""")
Index: gnue/gnuef/src/GFObjects/GFBlock.py
diff -u gnue/gnuef/src/GFObjects/GFBlock.py:1.1 
gnue/gnuef/src/GFObjects/GFBlock.py:1.2
--- gnue/gnuef/src/GFObjects/GFBlock.py:1.1     Fri Jun 29 15:55:58 2001
+++ gnue/gnuef/src/GFObjects/GFBlock.py Sat Jun 30 15:58:26 2001
@@ -34,6 +34,7 @@
 from gnue.common.GObjects import * 
 from gnue.common.dbdrivers.factory import factory
 from gnue.forms.GFEvent import *
+from gnue.forms.GFObjects.GFDataSource import GFDataSource
 
 from gnue.common import GDebug
 from gnue.common import GConfig