gnue-common ./setup-cvs-win.py ./setup-cvs.py ....

[Reinhard Mueller]

CVSROOT:        /cvsroot/gnue
Module name:    gnue-common
Branch:         
Changes by:     Reinhard Mueller <address@hidden>       03/09/25 19:23:57

Modified files:
        .              : setup-cvs-win.py setup-cvs.py setup.py 
        src/apps       : GConfig.py 
        src/datasources/drivers/special/configfile: Driver.py 

Log message:
        Removed environment variable INSTALL_PREFIX. This value can now be 
received
        from 'gnue.paths.data'.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-common/setup-cvs-win.py.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-common/setup-cvs.py.diff?tr1=1.53&tr2=1.54&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-common/setup.py.diff?tr1=1.70&tr2=1.71&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-common/src/apps/GConfig.py.diff?tr1=1.35&tr2=1.36&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-common/src/datasources/drivers/special/configfile/Driver.py.diff?tr1=1.7&tr2=1.8&r1=text&r2=text

Patches:
Index: gnue-common/setup-cvs-win.py
diff -c gnue-common/setup-cvs-win.py:1.3 gnue-common/setup-cvs-win.py:1.4
*** gnue-common/setup-cvs-win.py:1.3    Thu Sep 25 09:34:59 2003
--- gnue-common/setup-cvs-win.py        Thu Sep 25 19:23:57 2003
***************
*** 447,457 ****
             export GNUE_CONNECTIONS

           fi

         fi

-        if [ "z$INSTALL_PREFIX" = "z" ]

-        then

-          INSTALL_PREFIX=%(CONFDIR)s

-          export INSTALL_PREFIX

-        fi

         PYTHONPATH=%(BASEDIR)s:$PYTHONPATH; export PYTHONPATH

         %(PYTHONBIN)s %(GNUEDIR)s/%%s "$@"

      """ % globals()

--- 447,452 ----
Index: gnue-common/setup-cvs.py
diff -c gnue-common/setup-cvs.py:1.53 gnue-common/setup-cvs.py:1.54
*** gnue-common/setup-cvs.py:1.53       Thu Sep 25 09:34:59 2003
--- gnue-common/setup-cvs.py    Thu Sep 25 19:23:57 2003
***************
*** 346,356 ****
           export GNUE_CONNECTIONS
         fi
       fi
-      if [ "z$INSTALL_PREFIX" = "z" ]
-      then
-        INSTALL_PREFIX=%(CONFDIR)s
-        export INSTALL_PREFIX
-      fi
       PYTHONPATH=%(BASEDIR)s:$PYTHONPATH; export PYTHONPATH
       SCRIPT="%%s"
       if [ "$SCRIPT" != "" ] 
--- 346,351 ----
Index: gnue-common/setup.py
diff -c gnue-common/setup.py:1.70 gnue-common/setup.py:1.71
*** gnue-common/setup.py:1.70   Thu Sep 25 18:45:28 2003
--- gnue-common/setup.py        Thu Sep 25 19:23:57 2003
***************
*** 177,189 ****
  
    def _write_config (self):
  
      output = open ("module/base/paths.py", "w")
      output.write ("# This file was generated during installation.\n")
      output.write ("\n")
      output.write ("lib = \"%s\"\n" % self.install_lib)
      output.write ("scripts = \"%s\"\n" % self.install_scripts)
      output.write ("data = \"%s\"\n" % self.install_data)
! #   output.write ("config = \"%s\"\n" % self.install_config)
      output.close ()
  
      # 
-------------------------------------------------------------------------
--- 177,191 ----
  
    def _write_config (self):
  
+     self.install_config = os.path.join (self.install_data, "etc") # FIXME!
+ 
      output = open ("module/base/paths.py", "w")
      output.write ("# This file was generated during installation.\n")
      output.write ("\n")
      output.write ("lib = \"%s\"\n" % self.install_lib)
      output.write ("scripts = \"%s\"\n" % self.install_scripts)
      output.write ("data = \"%s\"\n" % self.install_data)
!     output.write ("config = \"%s\"\n" % self.install_config)
      output.close ()
  
      # 
-------------------------------------------------------------------------
***************
*** 258,264 ****
          + "INST_GNUE_CONNECTIONS='%s/etc/connections.conf'\n" % self.prefix \
          + path_line \
          + "import os\n" \
-         + "os.environ['INSTALL_PREFIX']='%s'\n" % self.prefix \
          + config_line \
          + "#######\n"
      else:
--- 260,265 ----
***************
*** 276,282 ****
          + "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.putenv('PYTHONCASEOK','1')\n" \
          + "if os.path.isdir(os.path.join(_BASE,'extras')):\n" \
          + "  sys.path.append(os.path.join(_BASE,'extras'))\n" \
--- 277,282 ----
Index: gnue-common/src/apps/GConfig.py
diff -c gnue-common/src/apps/GConfig.py:1.35 
gnue-common/src/apps/GConfig.py:1.36
*** gnue-common/src/apps/GConfig.py:1.35        Thu Sep  4 17:03:09 2003
--- gnue-common/src/apps/GConfig.py     Thu Sep 25 19:23:57 2003
***************
*** 30,35 ****
--- 30,36 ----
  
  from ConfigParser import *
  import os, sys, string
+ from gnue import paths
  from gnue.common.utils.FileUtils import openResource
  from gnue.common.utils.TextUtils import lineWrap
  from gnue.common import GCConfig
***************
*** 220,225 ****
--- 221,228 ----
  
  _site_config = {}
  
+ # highest priority: site_config.cfg (depreciated -- will be removed)
+ 
  if os.environ.has_key('GNUE_INSTALLED_SITE_CFG'):
    try:
      input = open(os.environ['GNUE_INSTALLED_SITE_CFG'],'r')
***************
*** 232,237 ****
--- 235,243 ----
    # The resulting namespace is stored as a dict in _site_config.
    eval (compile(text, '<string>', 'exec'), _site_config)
  
+ # second priority: INSTALL_PREFIX environment variable (depreciated -- will be
+ # removed)
+ 
  elif os.environ.has_key('INSTALL_PREFIX'):
  
    install_prefix = os.environ['INSTALL_PREFIX']
***************
*** 243,247 ****
        'common_shared': os.path.join(install_prefix,'shared')
    }
  
! 
! 
--- 249,258 ----
        'common_shared': os.path.join(install_prefix,'shared')
    }
  
! else:
!   _site_config = {
!     "install_prefix": paths.data,
!     "common_etc": os.path.join (paths.data, "etc"),     # FIXME: paths.config
!     "common_images": os.path.join (paths.data, "shared", "images"),
!     "common_appbase": paths.data,
!     "common_shared": os.path.join (paths.data, "shared")}
Index: gnue-common/src/datasources/drivers/special/configfile/Driver.py
diff -c gnue-common/src/datasources/drivers/special/configfile/Driver.py:1.7 
gnue-common/src/datasources/drivers/special/configfile/Driver.py:1.8
*** gnue-common/src/datasources/drivers/special/configfile/Driver.py:1.7        
Wed Jun  4 19:23:35 2003
--- gnue-common/src/datasources/drivers/special/configfile/Driver.py    Thu Sep 
25 19:23:57 2003
***************
*** 45,50 ****
--- 45,51 ----
  
  from gnue.common.datasources import GDataObjects, GConditions
  from gnue.common.apps import GDebug
+ from gnue import paths
  import string
  import types
  import md5
***************
*** 267,273 ****
  
        # replace placeholder "%configdir%"
        if self._filename[0:11]=="%configdir%":
!         self._filename=os.environ["INSTALL_PREFIX"]+"/etc"+self._filename[11:]
                     
        # try to open and parse file        
        self._dataConnection = ConfigParser.ConfigParser()
--- 268,274 ----
  
        # replace placeholder "%configdir%"
        if self._filename[0:11]=="%configdir%":
!         self._filename=paths.config+self._filename[11:]
                     
        # try to open and parse file        
        self._dataConnection = ConfigParser.ConfigParser()