gnue forms/setup.py reports/setup.py

[Jason Cater]

CVSROOT:        /home/cvs
Module name:    gnue
Changes by:     Jason Cater <address@hidden>    02/05/31 00:10:46

Modified files:
        forms          : setup.py 
        reports        : setup.py 

Log message:
        more fixes to setup.py

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/forms/setup.py.diff?cvsroot=OldCVS&tr1=1.64&tr2=1.65&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/reports/setup.py.diff?cvsroot=OldCVS&tr1=1.8&tr2=1.9&r1=text&r2=text

Patches:
Index: gnue/forms/setup.py
diff -c gnue/forms/setup.py:1.64 gnue/forms/setup.py:1.65
*** gnue/forms/setup.py:1.64    Thu May 30 23:44:22 2002
--- gnue/forms/setup.py Fri May 31 00:10:46 2002
***************
*** 52,113 ****
      except:
        pass
  
- def developer_install():
-   pwd = os.getcwd()
-   gfcvs = """
- #!/bin/sh
-      if [ "z$GNUE_CONNECTIONS" = "z" ]
-       then
-        if [ -f /usr/local/gnue/etc/connections.conf ]
-        then
-          GNUE_CONNECTIONS=/usr/local/gnue/etc/connections.conf
-          export GNUE_CONNECTIONS
-        fi
-      fi
-      if [ "z$INSTALL_PREFIX" = "z" ]
-      then
-        INSTALL_PREFIX=/usr/local/gnue/
-        export INSTALL_PREFIX
-      fi
-      PYTHONPATH=%s/.cvsdevelbase:$PYTHONPATH; export PYTHONPATH
-      %s %s/.cvsdevelbase/gnue/forms/GFClient.py $*
-   """ % (pwd, sys.executable, pwd)
- 
-   if os.path.isdir('.cvsdevelbase'):
-     os.system ('rm -rf .cvsdevelbase')
- 
-   os.makedirs('.cvsdevelbase/gnue')
-   os.system ("""
-     cd .cvsdevelbase/gnue
-     mkdir designer
-     ln -s ../../src/__init__.py .
-     ln -s ../../../common/src common
-     ln -s ../../../reports/src reports
-     ln -s ../../src forms
-     cd designer
-     ln -s ../../../../designer/src/* .
-     ln -s ../../../../designer/templates templates
-   """)
- 
-   print "Creating client/gfcvs"
-   file = open('client/gfcvs','w')
-   file.write(gfcvs)
-   file.close
-   os.system ('chmod 700 client/gfcvs')
- 
-   if not os.path.islink('/usr/local/bin/gfcvs'):
-     print "We will now create a symlink to client/gfcvs in /usr/local/bin"
-     print "You will be prompted for the root password on the machine to do 
this."
-     raw_input ("Press Control-D to abort or any other key to continue")
- 
-     string = 'su root -c "ln -s `pwd`/client/gfcvs /usr/local/bin/gfcvs; 
chmod o+rx `pwd`/client/gfcvs"'
-     os.system(string)
- 
-   sys.exit()
- 
- # bypass the install for devel installs
- if 'devel' in sys.argv:
-   developer_install()
  
  try:
    from distutils.core import setup
--- 52,57 ----
Index: gnue/reports/setup.py
diff -c gnue/reports/setup.py:1.8 gnue/reports/setup.py:1.9
*** gnue/reports/setup.py:1.8   Thu May 30 18:27:54 2002
--- gnue/reports/setup.py       Fri May 31 00:10:46 2002
***************
*** 115,131 ****
  
  class my_build_scripts(build_scripts):
    def finalize_options(self):
      build_scripts.finalize_options(self)
  
      if self.finalized:
        return
  
-     dict = self.distribution.get_option_dict("install")
  
      if sys.platform != 'win32':
        gnue_env = \
             "#######\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] \
--- 115,135 ----
  
  class my_build_scripts(build_scripts):
    def finalize_options(self):
+ 
      build_scripts.finalize_options(self)
  
      if self.finalized:
        return
  
  
      if sys.platform != 'win32':
+       dict = self.distribution.get_option_dict("install")
+       install_prefix = dict['prefix'][1]
+ 
        gnue_env = \
             "#######\n" \
!          + "# The following variable were set when GNUe was installed\n" \
!          + "import os, sys\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] \
***************
*** 134,146 ****
           + "#######\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)                  
\
!          + config_line \
!          + "#######\n"
  
      for script in self.scripts:
        print "Building %s..."% (script),
--- 138,163 ----
           + "#######\n"
      else:
        gnue_env = \
!                "#######\n" \
!              + "# The following variables were set when GNUe was installed\n" 
   \
!              + "# (Generated for a Win32 system)\n" \
!              + "import os, sys\n" \
!              + "if __name__ == '__main__': \n" \
!              + "  _BASE = 
os.path.abspath(os.path.join(os.path.dirname(sys.argv[0]),'..'))\n" \
!              + "  try:\n" \
!              + "    os.environ['PATH']= 
os.path.abspath(os.path.dirname(sys.argv[0])) + ';' + os.environ['PATH']\n" \
!              + "  except KeyError:\n" \
!              + "    os.environ['PATH']= 
os.path.abspath(os.path.dirname(sys.argv[0]))\n" \
!              + "else: \n" \
!              + "  _BASE = 
os.path.abspath(os.path.join(os.path.dirname(__file__),'..'))\n" \
!              + 
"INST_GNUE_CONNECTIONS=os.path.join(_BASE,'etc','connections.conf')\n" \
!              + "os.environ['INSTALL_PREFIX']=_BASE\n"                \
!              + "os.environ['INSTALL_LIB']=_BASE\n"                   \
!              + "os.putenv('PYTHONCASEOK','1')\n" \
!              + config_line \
!              + "if os.path.isdir(os.path.join(_BASE,'extras')):\n" \
!              + "  sys.path.append(os.path.join(_BASE,'extras'))\n" \
!              + "#######\n\n"
  
      for script in self.scripts:
        print "Building %s..."% (script),