gnue-appserver ./setup.py src/geasRpcServer.py ...

[Reinhard Mueller]

CVSROOT:        /cvsroot/gnue
Module name:    gnue-appserver
Branch:         
Changes by:     Reinhard Mueller <address@hidden>       03/09/29 18:28:59

Modified files:
        .              : setup.py 
        src            : geasRpcServer.py 
        src/classrep   : __init__.py 

Log message:
        Install files more into a standard location.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-appserver/setup.py.diff?tr1=1.29&tr2=1.30&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-appserver/src/geasRpcServer.py.diff?tr1=1.26&tr2=1.27&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-appserver/src/classrep/__init__.py.diff?tr1=1.12&tr2=1.13&r1=text&r2=text

Patches:
Index: gnue-appserver/setup.py
diff -c gnue-appserver/setup.py:1.29 gnue-appserver/setup.py:1.30
*** gnue-appserver/setup.py:1.29        Mon Sep 29 18:09:16 2003
--- gnue-appserver/setup.py     Mon Sep 29 18:28:58 2003
***************
*** 21,27 ****
  # write to the Free Software Foundation, Inc., 59 Temple Place
  # - Suite 330, Boston, MA 02111-1307, USA.
  #
! # $Id: setup.py,v 1.29 2003/09/29 22:09:16 reinhard Exp $
  
  import sys
  import os
--- 21,27 ----
  # write to the Free Software Foundation, Inc., 59 Temple Place
  # - Suite 330, Boston, MA 02111-1307, USA.
  #
! # $Id: setup.py,v 1.30 2003/09/29 22:28:58 reinhard Exp $
  
  import sys
  import os
***************
*** 64,83 ****
  
      # The Data
      datafiles   = ["src/classrep/repository.ini"]
-     grpcfiles   = ["grpc/appserver.grpc"]
-     docfiles    = ["doc/api/api.txt", "doc/whitepaper/whitepaper.txt"]
-     samplefiles = self.allfiles ("samples")
      wfefiles    = ["extensions/webfrontend/gnue-forms.js",
                     "extensions/webfrontend/vcXMLRPC.js"]
      wfeimages   = self.allfiles ("extensions/webfrontend/images")
  
      params ["data_files"] = \
!       [("share/gnue-appserver",                    datafiles),
!        ("shared/grpc",                             grpcfiles),
         ("share/doc/gnue-appserver",                docfiles),
!        ("share/doc/gnue-appserver/samples",        samplefiles),
!        ("share/gnue-appserver/webfrontend",        wfefiles),
!        ("share/gnue-appserver/webfrontend/images", wfeimages)]
  
    # 
---------------------------------------------------------------------------
    # Build files to be distributed and installed:
--- 64,83 ----
  
      # The Data
      datafiles   = ["src/classrep/repository.ini"]
      wfefiles    = ["extensions/webfrontend/gnue-forms.js",
                     "extensions/webfrontend/vcXMLRPC.js"]
      wfeimages   = self.allfiles ("extensions/webfrontend/images")
+     grpcfiles   = ["grpc/appserver.grpc"]
+     docfiles    = ["doc/api/api.txt", "doc/whitepaper/whitepaper.txt"]
+     samplefiles = self.allfiles ("samples")
  
      params ["data_files"] = \
!       [("share/gnue/appserver",                    datafiles),
!        ("share/gnue/appserver/webfrontend",        wfefiles),
!        ("share/gnue/appserver/webfrontend/images", wfeimages),
!        ("share/gnue/grpc",                         grpcfiles),
         ("share/doc/gnue-appserver",                docfiles),
!        ("share/doc/gnue-appserver/samples",        samplefiles)]
  
    # 
---------------------------------------------------------------------------
    # Build files to be distributed and installed:
Index: gnue-appserver/src/classrep/__init__.py
diff -c gnue-appserver/src/classrep/__init__.py:1.12 
gnue-appserver/src/classrep/__init__.py:1.13
*** gnue-appserver/src/classrep/__init__.py:1.12        Thu Sep 25 19:13:54 2003
--- gnue-appserver/src/classrep/__init__.py     Mon Sep 29 18:28:59 2003
***************
*** 19,25 ****
  # write to the Free Software Foundation, Inc., 59 Temple Place 
  # - Suite 330, Boston, MA 02111-1307, USA.
  #
! # $Id: __init__.py,v 1.12 2003/09/25 23:13:54 reinhard Exp $
  
  import os, sys
  
--- 19,25 ----
  # write to the Free Software Foundation, Inc., 59 Temple Place 
  # - Suite 330, Boston, MA 02111-1307, USA.
  #
! # $Id: __init__.py,v 1.13 2003/09/29 22:28:59 reinhard Exp $
  
  import os, sys
  
***************
*** 46,52 ****
    except:
      basedir  = os.path.dirname(__file__)    
    if not os.path.isfile (os.path.join (basedir, "repository.ini")):
!     basedir = os.path.join (paths.data, "share", "gnue-appserver")
    modules = ModuleDict (None, RepositoryDefinition (os.path.join (basedir,
                                                              
"repository.ini")))
    classes = ClassDict (None, modules)
--- 46,52 ----
    except:
      basedir  = os.path.dirname(__file__)    
    if not os.path.isfile (os.path.join (basedir, "repository.ini")):
!     basedir = os.path.join (paths.data, "share", "gnue", "appserver")
    modules = ModuleDict (None, RepositoryDefinition (os.path.join (basedir,
                                                              
"repository.ini")))
    classes = ClassDict (None, modules)
Index: gnue-appserver/src/geasRpcServer.py
diff -c gnue-appserver/src/geasRpcServer.py:1.26 
gnue-appserver/src/geasRpcServer.py:1.27
*** gnue-appserver/src/geasRpcServer.py:1.26    Mon Sep  1 14:01:45 2003
--- gnue-appserver/src/geasRpcServer.py Mon Sep 29 18:28:58 2003
***************
*** 19,25 ****
  #
  # Copyright 2001-2003 Free Software Foundation
  #
! # $Id: geasRpcServer.py,v 1.26 2003/09/01 18:01:45 reinhard Exp $
  
  from gnue.appserver import VERSION
  from gnue.appserver import geasSessionManager
--- 19,25 ----
  #
  # Copyright 2001-2003 Free Software Foundation
  #
! # $Id: geasRpcServer.py,v 1.27 2003/09/29 22:28:58 reinhard Exp $
  
  from gnue.appserver import VERSION
  from gnue.appserver import geasSessionManager
***************
*** 29,34 ****
--- 29,35 ----
  from gnue.common.apps import GConfig
  from gnue.common.utils.FileUtils import openResource
  from gnue.common.apps.GServerApp import GServerApp
+ import gnue.paths
  import time, os, sys
  
  # 
=============================================================================
***************
*** 155,162 ****
        return
  
      # Create the various servers
!     servers = GComm.bind (GConfig.getInstalledBase ('install_prefix') + \
!                           '/shared/grpc/appserver.grpc',
                            self._transports,
                            {'SessionManager': self.requestSessionManager})
  
--- 156,162 ----
        return
  
      # Create the various servers
!     servers = GComm.bind (gnue.paths.data + '/share/gnue/grpc/appserver.grpc',
                            self._transports,
                            {'SessionManager': self.requestSessionManager})