gnue-common ./MANIFEST.in ./setup.py src/setup/...

[Reinhard Mueller]

CVSROOT:        /cvsroot/gnue
Module name:    gnue-common
Branch:         
Changes by:     Reinhard Mueller <address@hidden>       03/10/06 14:33:16

Modified files:
        .              : MANIFEST.in setup.py 
        src/setup      : GSetup.py 
Added files:
        doc/man        : gnue-schema.1 

Log message:
        Include manfile in cvs, do not build man files while installing. Do not 
install
        technotes.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-common/MANIFEST.in.diff?tr1=1.13&tr2=1.14&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-common/setup.py.diff?tr1=1.86&tr2=1.87&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-common/doc/man/gnue-schema.1?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-common/src/setup/GSetup.py.diff?tr1=1.3&tr2=1.4&r1=text&r2=text

Patches:
Index: gnue-common/MANIFEST.in
diff -c gnue-common/MANIFEST.in:1.13 gnue-common/MANIFEST.in:1.14
*** gnue-common/MANIFEST.in:1.13        Mon Sep 29 18:16:00 2003
--- gnue-common/MANIFEST.in     Mon Oct  6 14:33:15 2003
***************
*** 8,14 ****
  include THANKS
  include TODO
  
! recursive-include doc *.txt *.lyx *.sxw *.dtd *.html
  include etc/sample.*
  include images/*
  recursive-include packaging *
--- 8,14 ----
  include THANKS
  include TODO
  
! recursive-include doc *
  include etc/sample.*
  include images/*
  recursive-include packaging *
Index: gnue-common/setup.py
diff -c gnue-common/setup.py:1.86 gnue-common/setup.py:1.87
*** gnue-common/setup.py:1.86   Sun Oct  5 14:01:54 2003
--- gnue-common/setup.py        Mon Oct  6 14:33:16 2003
***************
*** 62,69 ****
      [Data_Files (base_dir = 'install_data',
                   copy_to = 'share/gnue',
                   template = ['recursive-include images *.png',
-                              'recursive-include images *.xpm',
-                              'recursive-include images *.ico',
                               'recursive-include images *.bmp'],
                   preserve_path = 1),
       Data_Files (base_dir = 'install_config',
--- 62,67 ----
***************
*** 77,86 ****
                   strip_dirs = 1,
                   preserve_path = 1),
       Data_Files (base_dir = 'install_data',
                   copy_to = 'share/doc/gnue-common',
                   template = ['recursive-include doc *',
                               'prune doc/CVS',
!                              'prune doc/technotes/CVS'],
                   strip_dirs = 1, # This is a number, not true/false
                   preserve_path = 1)]
  
--- 75,89 ----
                   strip_dirs = 1,
                   preserve_path = 1),
       Data_Files (base_dir = 'install_data',
+                  copy_to = 'share/man/man1',
+                  template = ['recursive-include doc/man *.1'],
+                  preserve_path = 0),
+      Data_Files (base_dir = 'install_data',
                   copy_to = 'share/doc/gnue-common',
                   template = ['recursive-include doc *',
                               'prune doc/CVS',
!                              'prune doc/man',
!                              'prune doc/technotes'],
                   strip_dirs = 1, # This is a number, not true/false
                   preserve_path = 1)]
  
***************
*** 116,122 ****
  import distutils.command.sdist
  import distutils.command.build
  import distutils.command.install
- import distutils.command.install_scripts
  from setupext import Data_Files, install_Data_Files
  
  # 
-----------------------------------------------------------------------------
--- 119,124 ----
***************
*** 326,353 ****
  
      distutils.command.install.install.run (self)
  
- # 
=============================================================================
- # install_scripts: Generate man pages after installing
- # 
=============================================================================
- 
- class install_scripts (distutils.command.install_scripts.install_scripts):
- 
-   def run (self):
-     distutils.command.install_scripts.install_scripts.run (self)
- 
-     if os.name == "posix":
-       instcmd = self.get_finalized_command ("install")
-       man1dir = os.path.join (instcmd.install_data, "share", "man", "man1")
-       if not os.path.isdir (man1dir):
-         os.makedirs (man1dir)
-       olddir = os.getcwd ()
-       os.chdir (man1dir)
-       for script in self.get_outputs ():
-         print "building man page for %s" % os.path.basename (script)
-         os.system ("PYTHONPATH=" + instcmd.install_lib + " " + \
-                    script + " --generate-man-page")
-       os.chdir (olddir)
- 
  # 
-----------------------------------------------------------------------------
  # Get all packages in a directory
  # 
-----------------------------------------------------------------------------
--- 328,333 ----
***************
*** 407,413 ****
         cmdclass = {"sdist": sdist,
                     "build": build,
                     "install": install,
-                    "install_scripts": install_scripts,
                     "install_data": install_Data_Files})
  
  # 
-----------------------------------------------------------------------------
--- 387,392 ----
Index: gnue-common/src/setup/GSetup.py
diff -c gnue-common/src/setup/GSetup.py:1.3 gnue-common/src/setup/GSetup.py:1.4
*** gnue-common/src/setup/GSetup.py:1.3 Sat Oct  4 12:25:05 2003
--- gnue-common/src/setup/GSetup.py     Mon Oct  6 14:33:16 2003
***************
*** 19,25 ****
  #
  # Copyright 2001-2003 Free Software Foundation
  #
! # $Id: GSetup.py,v 1.3 2003/10/04 16:25:05 reinhard Exp $
  
  import sys
  import string
--- 19,25 ----
  #
  # Copyright 2001-2003 Free Software Foundation
  #
! # $Id: GSetup.py,v 1.4 2003/10/06 18:33:16 reinhard Exp $
  
  import sys
  import string
***************
*** 28,34 ****
  import distutils.command.sdist
  import distutils.command.build
  import distutils.command.install
- import distutils.command.install_scripts
  import gnue.paths
  
  # 
-----------------------------------------------------------------------------
--- 28,33 ----
***************
*** 121,148 ****
      distutils.command.install.install.run (self)
  
  # 
=============================================================================
- # install_scripts: Generate man pages after installing
- # 
=============================================================================
- 
- class install_scripts (distutils.command.install_scripts.install_scripts):
- 
-   def run (self):
-     distutils.command.install_scripts.install_scripts.run (self)
- 
-     if os.name == "posix":
-       instcmd = self.get_finalized_command ("install")
-       man1dir = os.path.join (instcmd.install_data, "share", "man", "man1")
-       if not os.path.isdir (man1dir):
-         os.makedirs (man1dir)
-       olddir = os.getcwd ()
-       os.chdir (man1dir)
-       for script in self.get_outputs ():
-         print "building man page for %s" % os.path.basename (script)
-         os.system ("PYTHONPATH=" + instcmd.install_lib + " " + \
-                    script + " --generate-man-page")
-       os.chdir (olddir)
- 
- # 
=============================================================================
  # GSetup: Basic class for setup scripts of GNUe packages
  # 
=============================================================================
  
--- 120,125 ----
***************
*** 242,246 ****
             # Override certain command classes with our own ones
             cmdclass = {"sdist": sdist,
                         "build": build,
!                        "install": install,
!                        "install_scripts": install_scripts})
--- 219,222 ----
             # Override certain command classes with our own ones
             cmdclass = {"sdist": sdist,
                         "build": build,
!                        "install": install})