gnue designer/AUTHORS designer/setup.py gnue-co...

[James Thompson]

CVSROOT:        /cvs
Module name:    gnue
Changes by:     James Thompson <address@hidden> 01/06/30 12:54:29

Modified files:
        designer       : AUTHORS setup.py 
        gnue-common    : setup.py 
        gnuef          : MANIFEST.in setup.py 
Added files:
        designer       : MANIFEST.in setup.cfg.in 
        designer/client: gfdesigner.in 
        gnue-common/gnue: __init__.py 
Removed files:
        designer/client: gfclient.in 

Log message:
        setup changes, start of designer setup scripts

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/designer/MANIFEST.in?cvsroot=OldCVS&rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/designer/setup.cfg.in?cvsroot=OldCVS&rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/designer/AUTHORS.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.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/designer/client/gfdesigner.in?cvsroot=OldCVS&rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-common/setup.py.diff?cvsroot=OldCVS&tr1=1.11&tr2=1.12&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-common/gnue/__init__.py?cvsroot=OldCVS&rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnuef/MANIFEST.in.diff?cvsroot=OldCVS&tr1=1.8&tr2=1.9&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnuef/setup.py.diff?cvsroot=OldCVS&tr1=1.33&tr2=1.34&r1=text&r2=text

Patches:
Index: gnue/designer/AUTHORS
diff -u gnue/designer/AUTHORS:1.1 gnue/designer/AUTHORS:1.2
--- gnue/designer/AUTHORS:1.1   Sat Jun 23 17:41:17 2001
+++ gnue/designer/AUTHORS       Sat Jun 30 12:54:29 2001
@@ -1,6 +1,9 @@
 Jason Cater <address@hidden>
   Everything and the kitchen sink. 
 
+James Thompson <address@hidden>
+  GConfig
+
 Designer is largely based on code contained within the forms and reports 
 tools so the authors of those tools contributed greatly to this
 tool as well. 
Index: gnue/designer/setup.py
diff -u gnue/designer/setup.py:1.5 gnue/designer/setup.py:1.6
--- gnue/designer/setup.py:1.5  Fri Jun 29 15:55:58 2001
+++ gnue/designer/setup.py      Sat Jun 30 12:54:29 2001
@@ -25,6 +25,9 @@
 import os
 import os.path
 
+if sys.platform != 'win32':
+    os.system (""" cp setup.cfg.in setup.cfg""")
+
 def developer_install():
   pwd = os.getcwd()
 
@@ -69,7 +72,6 @@
 try:
   from distutils.core import setup
   from distutils.command.build_scripts import build_scripts
-  from setupext import Data_Files, install_Data_Files
 except ImportError:
   print """
 Setup requires that python's distutils be
@@ -89,24 +91,6 @@
   raw_input ("Press Control-D to abort or any other key to continue") 
   
 if 'build' in sys.argv:
-  # Verify that gnue-common is installed
-#  try:
-#    print "Checking for GNUe-Common....",
-#    from gnue import common
-#    if common.__dict__.has_key('VERSION'): 
-#      print "OK (version %s)" % common.VERSION
-#    else: 
-#      print "OK"
-#  except ImportError:
-#    print """
-#You will need to install gnue-common
-#before gnuef will function.  You can
-#obtain a copy from 
-#
-#http://gnue.org/index.cgi/downloads
-#"""
-#    sys.exit()
-
   # Verify that PyXML is installed
   try:
     print "Checking for PyXML....",
@@ -127,41 +111,19 @@
   #
   UIOK = 0
 
-  print "Checking for available UI drivers...."
-  # PyNcurses 
-  try: 
-    print "  Pyncurses....",
-    import ncurses.form
-    print "OK"
-    UIOK = 1
-  except ImportError:
-    print "No"
-
-  # Curses
-  try:
-    print "  Curses....",
-    import curses
-    print "OK"
-    UIOK = 1
-  except ImportError:
-    print "No"
-
   # wxPython
   try:
     print "  wxPython....",
-#    from wxPython.wx import *
+    from wxPython.wx import *
     print "OK"
     UIOK = 1
   except ImportError:
     print "No"
 
-
   if UIOK != 1:
     print """
 No valid UI drivers are installed on this machine:
   wxPython - www.wxpython.org
-  pyncurses - pyncurses.sourceforge.net
-  python curses - Read python install docs on how to activate
 """
     sys.exit()
 
@@ -173,9 +135,9 @@
       return
 
     dict = self.distribution.get_option_dict("install")
-    print dict
 
-    gnue_env = \
+    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] \
@@ -186,6 +148,15 @@
          + "export INST_GNUE_CONNECTIONS PYTHON INSTALL_LIB\n" \
          + "export INSTALL_PREFIX PYTHONPATH\n" \
          + "#######\n"
+    else:
+      gnue_env = \
+               "#######\n" \
+             + "# The following variable were set when GNUe was installed\n\n" 
   \
+             + "INST_GNUE_CONNECTIONS='%s/etc/connections.conf'\n" % 
(sys.prefix) \
+             + "os.environ['INSTALL_PREFIX']='%s'\n" % (sys.prefix)            
   \
+             + "os.environ['INSTALL_LIB']='%s'\n" % (sys.prefix)               
   \
+             + "#######\n"
+            
 
     for script in self.scripts: 
 
@@ -213,19 +184,6 @@
 # Verify DB driver of some sort installed
 #
 #  Maybe later :)
-docfiles="""
-  recursive-include doc *.txt
-  recursive-include doc *.html
-  """
-
-docs = [
-    Data_Files( 
-               base_dir = "install_data",
-               copy_to = "doc/designer",
-               template = string.split(docfiles,"\n"),
-               preserve_path = 1)
-      ]
-
 setup (name = "GNUe-Designer",
        version = "0.0.1",
        description = "GNU Enterprise Designer",
@@ -234,19 +192,17 @@
        author_email = "address@hidden",
        url = "http://www.gnue.org";,
        # Override certain command classes with our own ones
-       cmdclass = {'install_data':install_Data_Files, 
-                   'build_scripts':my_build_scripts},
-
-       data_files = docs,
-       
-              
+       cmdclass = {'build_scripts':my_build_scripts},
        packages = ["gnue.designer"],
        package_dir = {"gnue.designer" : "src",
                       "gnue.designer.templates" : "templates",
                       "gnue.designer.templates.forms" : "templates.forms",
                       "gnue.designer.templates.reports" : "templates.reports"},
-       scripts = ["client/gdesigner"]
+       scripts = ["client/gfdesigner"]
        )
 
+if sys.platform != 'win32':
+    os.system (""" /bin/rm -rf setup.cfg""")
 
+    
 
Index: gnue/gnue-common/setup.py
diff -u gnue/gnue-common/setup.py:1.11 gnue/gnue-common/setup.py:1.12
--- gnue/gnue-common/setup.py:1.11      Fri Jun 29 16:27:23 2001
+++ gnue/gnue-common/setup.py   Sat Jun 30 12:54:29 2001
@@ -62,7 +62,7 @@
   ]
 
 setup (name = "GNUe-Common",
-       version = "0.0.2",
+       version = "0.0.3",
        description = "Base files of a GNU Enterprise Tools install",
        long_description = "",
        author = "GNUe Project",
@@ -83,7 +83,7 @@
                    "gnue.common.dbdrivers.postgresql"
                  ],
        
-       package_dir = {"gnue": '',
+       package_dir = {"gnue": 'gnue',
                       "gnue.common" : "src"},
        )
 
Index: gnue/gnuef/MANIFEST.in
diff -u gnue/gnuef/MANIFEST.in:1.8 gnue/gnuef/MANIFEST.in:1.9
--- gnue/gnuef/MANIFEST.in:1.8  Mon Jun 25 05:27:19 2001
+++ gnue/gnuef/MANIFEST.in      Sat Jun 30 12:54:29 2001
@@ -8,7 +8,6 @@
 include FAQ
 
 include client/gfclient.in
-include designer/GFDesigner.py
 recursive-include samples *
 recursive-include setupext *
 recursive-include doc *.txt *.html
Index: gnue/gnuef/setup.py
diff -u gnue/gnuef/setup.py:1.33 gnue/gnuef/setup.py:1.34
--- gnue/gnuef/setup.py:1.33    Fri Jun 29 22:03:07 2001
+++ gnue/gnuef/setup.py Sat Jun 30 12:54:29 2001
@@ -209,6 +209,10 @@
     else:
       gnue_env = \
            "#######\n" \
+         + "# The following variable were set when GNUe was installed\n\n"    \
+         + "INST_GNUE_CONNECTIONS='%s/etc/connections.conf'\n" % (sys.prefix) \
+         + "os.environ['INSTALL_PREFIX']='%s'\n" % (sys.prefix)               \
+         + "os.environ['INSTALL_LIB']='%s'\n" % (sys.prefix)                  \
          + "#######\n"
 
     for script in self.scripts: 
@@ -232,7 +236,7 @@
       print "OK"
           
 setup (name = "GNUe-Forms",
-       version = "0.0.8",
+       version = "0.0.9",
        description = "GNU Enterprise Forms",
        long_description = "",
        author = "GNUe Forms Team",