gnue gnue-common/setup.py gnue-common/src/GConf...

[Jason Cater]

CVSROOT:        /home/cvs
Module name:    gnue
Changes by:     Jason Cater <address@hidden>    01/11/02 18:00:29

Modified files:
        gnue-common    : setup.py 
        gnue-common/src: GConfig.py 
        gnuef/src      : UIwxpython.py 

Log message:
        win32 changes

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-common/setup.py.diff?cvsroot=OldCVS&tr1=1.22&tr2=1.23&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-common/src/GConfig.py.diff?cvsroot=OldCVS&tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnuef/src/UIwxpython.py.diff?cvsroot=OldCVS&tr1=1.113&tr2=1.114&r1=text&r2=text

Patches:
Index: gnue/gnue-common/setup.py
diff -u gnue/gnue-common/setup.py:1.22 gnue/gnue-common/setup.py:1.23
--- gnue/gnue-common/setup.py:1.22      Fri Nov  2 15:19:25 2001
+++ gnue/gnue-common/setup.py   Fri Nov  2 18:00:29 2001
@@ -104,14 +104,15 @@
       return
 
     dict = self.distribution.get_option_dict("install")
+    options = []
 
     # This statement stops the "search path" error messages
     try: 
       sys.path.append(dict['install_lib'][1])
     except KeyError: 
-      pass
+      if sys.platform == 'win32': 
+        options.append('%s = r"%s"' % sys.prefix)
 
-    options = []
     for key in dict.keys():
       options.append('%s = "%s"' % (key, 
string.replace(dict[key][1],'"','\\"')))
 
@@ -167,7 +168,7 @@
        data_files = dfiles,
        packages = ["gnue",
                    "gnue.common",
-#                   "gnue.common.FormatMasks",
+                   "gnue.common.FormatMasks",
                    "gnue.common.installer",
                    "gnue.common.dbdrivers",
                    "gnue.common.dbdrivers._dbsig",
@@ -200,13 +201,14 @@
   if sys.platform != 'win32':
     os.remove ("setup.cfg")
 
+if 'install' in sys.argv: 
   # This is a nasty hack to get GNUe.py (and only GNUe.py)
   # to install to site_packages
   file = open ("setup.cfg","w")
   file.write ("[build]\n"
-              "build_base=build.1\n"
+              "build_base=build.3\n"
               "[install_lib]\n"
-              "build_dir=build.1\n")
+              "build_dir=build.3\n")
   file.close()
 
 
Index: gnue/gnue-common/src/GConfig.py
diff -u gnue/gnue-common/src/GConfig.py:1.6 gnue/gnue-common/src/GConfig.py:1.7
--- gnue/gnue-common/src/GConfig.py:1.6 Fri Jul  6 17:53:25 2001
+++ gnue/gnue-common/src/GConfig.py     Fri Nov  2 18:00:29 2001
@@ -31,9 +31,8 @@
 #
 
 from GConfigParser import * 
-import os
+import os, sys, string
 from gnue.common import openResource
-import string
 import GDebug
 import GDataObjects
 import GLoginHandler
Index: gnue/gnuef/src/UIwxpython.py
diff -u gnue/gnuef/src/UIwxpython.py:1.113 gnue/gnuef/src/UIwxpython.py:1.114
--- gnue/gnuef/src/UIwxpython.py:1.113  Fri Oct 12 20:06:18 2001
+++ gnue/gnuef/src/UIwxpython.py        Fri Nov  2 18:00:29 2001
@@ -63,7 +63,8 @@
 
   if __wxApp == None: 
     __wxApp = GFwxApp(0)
-    __wxApp.MainLoop()
+#    __wxApp.MainLoop()
+    GDebug.printMesg(7,"WxApp initializing3")
 
   return __wxApp