commit-gnue
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

gnue-appserver setup.py


From: Reinhard Mueller
Subject: gnue-appserver setup.py
Date: Mon, 22 Sep 2003 15:09:11 -0400

CVSROOT:        /cvsroot/gnue
Module name:    gnue-appserver
Branch:         
Changes by:     Reinhard Mueller <address@hidden>       03/09/22 15:09:11

Modified files:
        .              : setup.py 

Log message:
        Build all necessary files when trying to install from CVS.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-appserver/setup.py.diff?tr1=1.22&tr2=1.23&r1=text&r2=text

Patches:
Index: gnue-appserver/setup.py
diff -c gnue-appserver/setup.py:1.22 gnue-appserver/setup.py:1.23
*** gnue-appserver/setup.py:1.22        Fri Sep 19 17:17:38 2003
--- gnue-appserver/setup.py     Mon Sep 22 15:09:11 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.22 2003/09/19 21:17:38 btami Exp $
  
  import sys
  import string
--- 21,27 ----
  # write to the Free Software Foundation, Inc., 59 Temple Place
  # - Suite 330, Boston, MA 02111-1307, USA.
  #
! # $Id: setup.py,v 1.23 2003/09/22 19:09:11 reinhard Exp $
  
  import sys
  import string
***************
*** 29,35 ****
  import copy
  
  from distutils.core import setup
! from distutils.command.build_scripts import build_scripts
  from distutils.command.install import install
  
  from src import PACKAGE, VERSION
--- 29,35 ----
  import copy
  
  from distutils.core import setup
! from distutils.command.build import build
  from distutils.command.install import install
  
  from src import PACKAGE, VERSION
***************
*** 62,71 ****
        pass
  
  # 
-----------------------------------------------------------------------------
! # sdist (Source distribution): build documentation, SQL scripts and manpage
  # 
-----------------------------------------------------------------------------
  
! if "sdist" in sys.argv:
    # First check if we have everything installed we need to build the
    # distribution
  
--- 62,72 ----
        pass
  
  # 
-----------------------------------------------------------------------------
! # Build files to be distributed and installed
  # 
-----------------------------------------------------------------------------
  
! def build_files ():
! 
    # First check if we have everything installed we need to build the
    # distribution
  
***************
*** 127,132 ****
--- 128,140 ----
      sys.exit (1)
  
  # 
-----------------------------------------------------------------------------
+ # Source distribution: Build files to be distributed
+ # 
-----------------------------------------------------------------------------
+ 
+ if "sdist" in sys.argv:
+   build_files ()
+ 
+ # 
-----------------------------------------------------------------------------
  # User can supply a path to the config file
  # 
-----------------------------------------------------------------------------
  
***************
*** 140,149 ****
    config_line = ""
  
  # 
=============================================================================
  # Before installation: check dependencies and create real scripts
  # 
=============================================================================
  
! class my_install (install):
  
    # 
---------------------------------------------------------------------------
    # Check dependencies
--- 148,171 ----
    config_line = ""
  
  # 
=============================================================================
+ # Before build: if done from CVS, build files to be installed
+ # 
=============================================================================
+ 
+ class gnue_build (build):
+ 
+   def finalize_options (self):
+     build.finalize_options (self)
+     if self.finalized:
+       return
+ 
+     if not os.path.isfile ("PKG-INFO"):         # downloaded from CVS?
+       build_files ()
+ 
+ # 
=============================================================================
  # Before installation: check dependencies and create real scripts
  # 
=============================================================================
  
! class gnue_install (install):
  
    # 
---------------------------------------------------------------------------
    # Check dependencies
***************
*** 324,329 ****
--- 346,355 ----
  # Call the actual setup routine
  # 
-----------------------------------------------------------------------------
  
+ datafiles = ["src/classrep/repository.ini"]
+ 
+ grpcfiles = ["grpc/appserver.grpc"]
+ 
  manfiles = []
  for file in ("man/gnue-appserver.1",):
    if os.path.isfile(file):
***************
*** 350,359 ****
    else:
      print "WARNING: File %s does not exist... not installing!" % file
  
- grpcfiles = ["grpc/appserver.grpc"]
- 
- datafiles = ["src/classrep/repository.ini"]
- 
  setup (name = "GNUe-AppServer",
         version = VERSION + suffix,
         description = "GNU Enterprise Application Server",
--- 376,381 ----
***************
*** 364,377 ****
         license = "GPL",
  
         # Override certain command classes with our own ones
!        cmdclass = {"install": my_install},
  
!        data_files = [ ("share/man/man1",                   manfiles),
!                       ("share/doc/gnue-appserver",         docfiles),
!                       ("share/doc/gnue-appserver/samples", samplefiles),
!                       ("shared/grpc",                      grpcfiles),
!                       ("share/gnue-appserver",             datafiles)
!                        ],
  
         packages = ["gnue.appserver",
                     "gnue.appserver.classrep",
--- 386,399 ----
         license = "GPL",
  
         # Override certain command classes with our own ones
!        cmdclass = {"build": gnue_build,
!                    "install": gnue_install},
  
!        data_files = [("share/gnue-appserver",             datafiles),
!                      ("shared/grpc",                      grpcfiles),
!                      ("share/man/man1",                   manfiles),
!                      ("share/doc/gnue-appserver",         docfiles),
!                      ("share/doc/gnue-appserver/samples", samplefiles)],
  
         packages = ["gnue.appserver",
                     "gnue.appserver.classrep",




reply via email to

[Prev in Thread] Current Thread [Next in Thread]