gnue-navigator ./.cvsignore ./MANIFEST.in ./set...

[Reinhard Mueller]

CVSROOT:        /cvsroot/gnue
Module name:    gnue-navigator
Branch:         
Changes by:     Reinhard Mueller <address@hidden>       03/10/05 13:45:44

Modified files:
        .              : .cvsignore MANIFEST.in setup.py 
        scripts        : .cvsignore 
        src            : __init__.py 
Added files:
        scripts        : gnue-navigator 
Removed files:
        .              : setup.cfg.in 
        scripts        : gnue-navigator.in 

Log message:
        Changed setup script to use GSetup.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-navigator/.cvsignore.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-navigator/MANIFEST.in.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-navigator/setup.py.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-navigator/scripts/gnue-navigator?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-navigator/scripts/.cvsignore.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-navigator/src/__init__.py.diff?tr1=1.15&tr2=1.16&r1=text&r2=text

Patches:
Index: gnue-navigator/.cvsignore
diff -c gnue-navigator/.cvsignore:1.1 gnue-navigator/.cvsignore:1.2
*** gnue-navigator/.cvsignore:1.1       Mon Apr 22 11:46:21 2002
--- gnue-navigator/.cvsignore   Sun Oct  5 13:45:44 2003
***************
*** 1,35 ****
! *.lo
! *.bak
! *.pyc
! .deps
! .libs
! _libs
! Makefile
! Makefile.in
! aclocal.m4
! config.cache
! config.guess
! config.h
! config.h.in
! config.h.win32
! config.log
! config.status
! config.sub
! configure
! configure.scan
! libtool
! ltconfig
! ltmain.sh
! stamp-h
! stamp-h.in
! stamp.h
! version.h
! config.h.in
! .exrc
! install-sh
! missing
! mkinstalldirs
! ABOUT-NLS
  build
- .cvsdevelbase
- setup.cfg
--- 1,3 ----
! MANIFEST
! dist
  build
Index: gnue-navigator/MANIFEST.in
diff -c gnue-navigator/MANIFEST.in:1.1 gnue-navigator/MANIFEST.in:1.2
*** gnue-navigator/MANIFEST.in:1.1      Fri Sep 20 15:23:57 2002
--- gnue-navigator/MANIFEST.in  Sun Oct  5 13:45:44 2003
***************
*** 1,16 ****
  include AUTHORS
- include BUGS
- include COPYING
  include ChangeLog
! include INSTALL*
  include NEWS
! include README*
  include TODO
- include FAQ
  
! include setup.cfg.in
! recursive-include man *.1
! recursive-include scripts *.in
  recursive-include samples *
- recursive-include setupext *
- recursive-include doc *.txt *.pdf
--- 1,14 ----
  include AUTHORS
  include ChangeLog
! include COPYING
! include FAQ
! include INSTALL
  include NEWS
! include README
  include TODO
  
! include scripts/gnue-navigator
! 
! recursive-include doc *
! recursive-include packaging *
  recursive-include samples *
Index: gnue-navigator/scripts/.cvsignore
diff -c gnue-navigator/scripts/.cvsignore:1.1 
gnue-navigator/scripts/.cvsignore:1.2
*** gnue-navigator/scripts/.cvsignore:1.1       Tue May 21 01:33:11 2002
--- gnue-navigator/scripts/.cvsignore   Sun Oct  5 13:45:44 2003
***************
*** 1,36 ****
- *.lo
- *.bak
- *.pyc
- .deps
- .libs
- _libs
- Makefile
- Makefile.in
- aclocal.m4
- config.cache
- config.guess
- config.h
- config.h.in
- config.h.win32
- config.log
- config.status
- config.sub
- configure
- configure.scan
- libtool
- ltconfig
- ltmain.sh
- stamp-h
- stamp-h.in
- stamp.h
- version.h
- config.h.in
- .exrc
- install-sh
- missing
- mkinstalldirs
- ABOUT-NLS
- build
- .cvsdevelbase
- setup.cfg
  gncvs
--- 1 ----
Index: gnue-navigator/setup.py
diff -c gnue-navigator/setup.py:1.10 gnue-navigator/setup.py:1.11
*** gnue-navigator/setup.py:1.10        Thu Sep 18 23:59:47 2003
--- gnue-navigator/setup.py     Sun Oct  5 13:45:44 2003
***************
*** 1,5 ****
--- 1,9 ----
  #!/usr/bin/env python
  #
+ # GNU Enterprise Navigator - Installation Procedure
+ #
+ # Copyright 2001-2003 Free Software Foundation
+ #
  # This file is part of GNU Enterprise.
  #
  # GNU Enterprise is free software; you can redistribute it
***************
*** 17,247 ****
  # write to the Free Software Foundation, Inc., 59 Temple Place
  # - Suite 330, Boston, MA 02111-1307, USA.
  #
! # Copyright 2001-2003 Free Software Foundation
! #
  
  import sys
- import string
  import os
- import os.path
- import copy
- from src import VERSION
- 
- #
- # Leftover from initial attempt to create a .exe setup file for windows
- #
- try:
-   import py2exe
- except:
-   pass
- 
- 
- #
- # hack to deal w/ fact distutils won't
- # allow us to set absolute path prefix
- # on windows
- #
- 
- if not 'sdist' in sys.argv:
-   if sys.platform != 'win32' and '--prefix' not in sys.argv and '--root' not 
in sys.argv:
-     os.system ("""cp setup.cfg.in setup.cfg""")
-   else:
-     try:
-       os.remove('setup.cfg')
-     except:
-       pass
  
  
  try:
!   from distutils.core import setup
!   from distutils.command.build_scripts import build_scripts
! #  from setupext import Data_Files, install_Data_Files
  except ImportError:
!   print """
! Setup requires that python's distutils be
! installed.  You can get a copy of it from
! http://www.python.org/sigs/distutils-sig/
!     """
!   sys.exit()
! 
! 
! if 'sdist' in sys.argv:
!   print """
! *** Notes for creating source disto ***
! 
! Make sure and create update the html and text docs
! prior to creating the source distribution.
! """
!   raw_input ("Press Control-D to abort or any other key to continue")
! 
! #if ('build' in sys.argv) or ('install' in sys.argv):
! #  # Verify that gnue-common is installed
! #  try:
! #    print "Checking for GNUe-Common....",
! #    from gnue import common
! #    if common.__dict__.has_key('VERSION'):
! #      print "OK (version %s)" % common.VERSION
! #    else:
! #      print "OK"
! #  except ImportError:
! #    print """
! #You will need to install gnue-common
! #before gnuef will function.  You can
! #obtain a copy from
! #
! #http://www.gnuenterprise.org/download.php
! #"""
! #    sys.exit()
! 
!   print "Now, we are going to create the man pages for our tools."
!   os.system( """
! if [ ! -e man ]
! then
! mkdir man
! fi
! cd man
! ../scripts/gncvs --generate-man-page
! """)
! 
! manfiles = []
! for file in ('man/gnue-navigator.1',):
!   if os.path.isfile(file):
!     manfiles.append(file)
!   else:
!     print "WARNING: File %s does not exist... not installing!" % file
! 
! 
! 
! # Site config stuff
! try:
!   index = sys.argv.index('--cfg-file')
!   site_config = os.path.join(os.path.abspath(sys.argv[index+1]))
!   sys.argv.pop(index)
!   sys.argv.pop(index)
!   config_line = "os.environ['GNUE_INSTALLED_SITE_CFG']='%s'\n" % site_config
! 
! except ValueError:
!   config_line = ""
! 
! 
! 
! 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" \
!          + "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] \
!          + "os.environ['INSTALL_PREFIX']='%s'\n" % dict['prefix'][1] \
!          + config_line \
!          + "#######\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" \
!              + "if os.path.isdir(os.path.join(_BASE,'extras')):\n" \
!              + "  sys.path.append(os.path.join(_BASE,'extras'))\n" \
!              + config_line \
!              + "#######\n\n"
! 
!     for script in self.scripts:
!       print "Building %s..."% (script),
! 
! 
!       fin = open(script+".in", "r")
!       fout = open(script, "w")
! 
!       print "Generating script %s from %s.in" % (script,script)
! 
!       lines = fin.readlines()
! 
!       for i in range(0, len(lines)):
!         if string.strip(lines[i]) == "__GNUEENV__":
!           lines[i] = gnue_env
! 
!       fout.writelines(lines)
!       fin.close()
!       fout.close()
!       print "OK"
! 
! #
! # You can run:
! #   $ GNUE_VERSION_SUFFIX=-pre1 ./setup.py sdist
! # and the packages will be created as GNUe-App-0.x.x-pre1.tar.gz
! #
! try:
!   suffix = os.environ['GNUE_VERSION_SUFFIX']
! except KeyError:
!   suffix = ""
! 
! setup (name = "GNUe-Navigator",
!        version = VERSION + suffix,
!        description = "GNU Enterprise Navigator",
!        long_description = "",
!        author = "GNUe Navigator Team",
!        author_email = "address@hidden",
!        url = "http://www.gnue.org";,
! 
!        # Override certain command classes with our own ones
!        cmdclass = {'build_scripts':my_build_scripts},
! 
! #       data_files = [ ('doc', ['doc/techref.pdf',
! #                       'doc/techref.txt',
! #                       'doc/user_guide.txt',
! #                       'doc/user_guide.pdf'])],
!        data_files = [('man', manfiles)],
! 
!        packages = ["gnue.navigator","gnue.navigator.Actions"],
!        package_dir = {"gnue.navigator" : "src"},
!        scripts = ["scripts/gnue-navigator"]
!        )
! 
! if 'install' in sys.argv:
!     print """
!     Note:
!     Warnings about the files not being installed in pythons search path can 
be ignored.
! 
!     Make sure you have a default gnue.conf file (typically in 
/usr/local/gnue/etc.
!     A sample is provided in that directory that you can typically just copy 
over.
!     """
! 
! if not 'sdist' in sys.argv:
!   if sys.platform != 'win32':
!     os.system (""" /bin/rm -rf setup.cfg""")
! 
! 
! 
! 
! 
! 
! 
  
  
  
  
  
--- 21,94 ----
  # write to the Free Software Foundation, Inc., 59 Temple Place
  # - Suite 330, Boston, MA 02111-1307, USA.
  #
! # $Id: setup.py,v 1.11 2003/10/05 17:45:44 reinhard Exp $
  
  import sys
  import os
  
+ from src import PACKAGE, VERSION
  
  try:
!   from gnue.common.setup import GSetup
  except ImportError:
!   print "You need GNUe-Common 0.5.2 or newer installed to install %s" % 
PACKAGE
!   sys.exit (1)
  
+ # 
=============================================================================
  
+ class setup (GSetup):
  
+   # 
---------------------------------------------------------------------------
+   # Definition of basic parameters for distribution and installation.
+   # Please add new files/directories that should be installed here.
+   # Note that you also have to add them to MANIFEST.in.
+   # 
---------------------------------------------------------------------------
+ 
+   def set_params (self, params):
+   
+     # The Work
+     params ["name"]             = PACKAGE
+     params ["version"]          = VERSION
+     params ["description"]      = "GNU Enterprise Navigator"
+     params ["long_description"] = ""
+     params ["license"]          = "GPL"
+ 
+     # The Author
+     params ["author"]       = "GNU Enterprise Team"
+     params ["author_email"] = "address@hidden"
+     params ["url"]          = "http://www.gnue.org";
+ 
+     # The Programs
+     params ["package_dir"] = {"gnue.navigator": "src"}
+     params ["scripts"]     = ["scripts/gnue-navigator"]
+ 
+     # The Data
+     docfiles = self.allfiles ("doc")
+ 
+     params ["data_files"] = \
+       [("share/doc/gnue-navigator", docfiles)]
+ 
+   # 
---------------------------------------------------------------------------
+   # Build files to be distributed and installed:
+   # Should generate the files that go in a distribution but aren't in CVS.
+   # Gets called on sdist (always) and on build/install (only when run from 
CVS).
+   # 
---------------------------------------------------------------------------
+ 
+   def build_files (self):
+     # nothing to do here
+     pass
+ 
+   # 
---------------------------------------------------------------------------
+   # Check dependencies for installation:
+   # Should sys.exit(1) in case any requirement isn't met.
+   # Gets called on install.
+   # 
---------------------------------------------------------------------------
+ 
+   def check_dependencies (self):
+     # TODO
+     pass
  
+ # 
=============================================================================
  
+ if __name__ == "__main__":
+   setup().run()
Index: gnue-navigator/src/__init__.py
diff -c gnue-navigator/src/__init__.py:1.15 gnue-navigator/src/__init__.py:1.16
*** gnue-navigator/src/__init__.py:1.15 Thu Aug 21 11:57:46 2003
--- gnue-navigator/src/__init__.py      Sun Oct  5 13:45:44 2003
***************
*** 56,59 ****
  __hexversion__ = HEXVERSION
  
  
! PACKAGE="GNUe Navigator"
--- 56,59 ----
  __hexversion__ = HEXVERSION
  
  
! PACKAGE="GNUe-Navigator"