gnue gnue-common/setup.py gnuef/setup.py gnue-c...

[James Thompson]

CVSROOT:        /cvs
Module name:    gnue
Changes by:     James Thompson <address@hidden> 01/06/29 16:27:23

Modified files:
        gnue-common    : setup.py 
        gnuef          : setup.py 
Added files:
        gnue-common    : setup.cfg.in 
        gnuef          : setup.cfg.in 
Removed files:
        gnue-common    : setup.cfg 
        gnuef          : setup.cfg 

Log message:
        Changes required to reflect the manual manipulation of the cvs 
repository

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-common/setup.cfg.in?cvsroot=OldCVS&rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-common/setup.py.diff?cvsroot=OldCVS&tr1=1.10&tr2=1.11&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnuef/setup.cfg.in?cvsroot=OldCVS&rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnuef/setup.py.diff?cvsroot=OldCVS&tr1=1.30&tr2=1.31&r1=text&r2=text

Patches:
Index: gnue/gnue-common/setup.py
diff -u gnue/gnue-common/setup.py:1.10 gnue/gnue-common/setup.py:1.11
--- gnue/gnue-common/setup.py:1.10      Fri Jun 29 15:55:58 2001
+++ gnue/gnue-common/setup.py   Fri Jun 29 16:27:23 2001
@@ -22,6 +22,7 @@
 
 import sys
 import string
+import os
 
 if sys.platform != 'win32':
   os.system (""" cp setup.cfg.in setup.cfg""")
@@ -82,7 +83,8 @@
                    "gnue.common.dbdrivers.postgresql"
                  ],
        
-       package_dir = {"gnue" : "gnue"},
+       package_dir = {"gnue": '',
+                      "gnue.common" : "src"},
        )
 
 
Index: gnue/gnuef/setup.py
diff -u gnue/gnuef/setup.py:1.30 gnue/gnuef/setup.py:1.31
--- gnue/gnuef/setup.py:1.30    Fri Jun 29 15:55:58 2001
+++ gnue/gnuef/setup.py Fri Jun 29 16:27:23 2001
@@ -25,9 +25,8 @@
 import os
 import os.path
 
+#import py2exe
 
-#print sys.prefix
-#print sys.exec_prefix
 
 if sys.platform != 'win32':
   os.system (""" cp setup.cfg.in setup.cfg""")
@@ -61,7 +60,7 @@
   os.system ("""
     cd .cvsdevelbase/gnue
     ln -s ../../src/__init__.py .
-    ln -s ../../../gnue-common/gnue/common common
+    ln -s ../../../gnue-common/src common
     ln -s ../../../reports/src reports
     ln -s ../../../designer/src designer
     ln -s ../../src forms 
@@ -90,7 +89,7 @@
 try:
   from distutils.core import setup
   from distutils.command.build_scripts import build_scripts
-  from setupext import Data_Files, install_Data_Files
+#  from setupext import Data_Files, install_Data_Files
 except ImportError:
   print """
 Setup requires that python's distutils be
@@ -187,8 +186,10 @@
     sys.exit()
 
 class my_build_scripts(build_scripts): 
-  def finalize_options(self): 
+  def finalize_options(self):
+    print "Hi mom!"
     build_scripts.finalize_options(self)
+    print "Bye mom!"
 
     if self.finalized: 
       return
@@ -210,6 +211,8 @@
          + "#######\n"
 
     for script in self.scripts: 
+      print "Building %s..."% (script),
+      
 
       fin = open(script+".in", "r")
       fout = open(script, "w")
@@ -223,31 +226,10 @@
           lines[i] = gnue_env
 
       fout.writelines(lines)
-
       fin.close()
       fout.close()
+      print "OK"
           
-  
-              
-
-
-#
-# 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/forms",
-               template = string.split(docfiles,"\n"),
-               preserve_path = 1)
-      ]
-
 setup (name = "GNUe-Forms",
        version = "0.0.8",
        description = "GNU Enterprise Forms",
@@ -255,18 +237,16 @@
        author = "GNUe Forms Team",
        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},
+       cmdclass = {'build_scripts':my_build_scripts},
 
-       data_files = docs,
-       
+       data_files = [ ('doc/forms',['doc/techref.txt']) ],
               
        packages = ["gnue.forms", "gnue.forms.GFObjects"],
        package_dir = {"gnue.forms" : "src"},
        scripts = ["client/gfclient"]
        )
-
 
 if 'install' in sys.argv:
     print """