gnue/appserver INSTALL setup.py src/__init__.py...

[Jason Cater]

CVSROOT:        /cvsroot/gnue
Module name:    gnue
Changes by:     Jason Cater <address@hidden>    02/05/31 15:24:47

Modified files:
        appserver      : INSTALL setup.py 
        appserver/src  : __init__.py 
Added files:
        appserver/src/objrepos: __init__.py 

Log message:
        changes for a prerelease

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/appserver/INSTALL.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/appserver/setup.py.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/appserver/src/__init__.py.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/appserver/src/objrepos/__init__.py?rev=1.1

Patches:
Index: gnue/appserver/INSTALL
diff -c gnue/appserver/INSTALL:1.10 gnue/appserver/INSTALL:1.11
*** gnue/appserver/INSTALL:1.10 Wed May 29 10:17:48 2002
--- gnue/appserver/INSTALL      Fri May 31 15:24:47 2002
***************
*** 52,58 ****
     If you don't use postgresql you have to set the username and
     password for the database you want to use by command line options.
  
! 2. for using GNUe forms with appserver you have to add an 
     section similar to the following:
  
  [appserver]
--- 52,58 ----
     If you don't use postgresql you have to set the username and
     password for the database you want to use by command line options.
  
! 2. for using GNUe Forms or Reports with appserver, you have to add a
     section similar to the following:
  
  [appserver]
Index: gnue/appserver/setup.py
diff -c gnue/appserver/setup.py:1.3 gnue/appserver/setup.py:1.4
*** gnue/appserver/setup.py:1.3 Wed May 29 06:23:49 2002
--- gnue/appserver/setup.py     Fri May 31 15:24:47 2002
***************
*** 67,111 ****
  cd doc/api
  make html
  make txt
  cd ../whitepaper
  make html
  make txt
  """)
  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
- GNUe Application Server will function.  You can
- obtain a copy from
  
! http://www.gnuenterprise.org/download.php
! """
!     sys.exit()
  
!   # Verify that gnue-common has newest dbdriver/appserver 
!   try:
!     print "Checking for dbdriver/appserver....",
!     from gnue.common.dbdrivers.appserver import DBdriver
!     print "OK (version %s)" % DBdriver.VERSION
! 
!   except ImportError:
!     print """
! You will need to install newer version of gnue-common before
! GNUe Application Server will function.  You can
! obtain a copy from
! 
! http://www.gnuenterprise.org/download.php
! (You need at least version 0.2.0)
! """
!     sys.exit()
  
  
    #
--- 67,118 ----
  cd doc/api
  make html
  make txt
+ make pdf
  cd ../whitepaper
  make html
  make txt
+ make pdf
  """)
  if ('build' in sys.argv) or ('install' in sys.argv):
  
!   ## TODO: These checks will not work as gnue.common
!   ## TODO: isn't in python's default search path.
  
! #  # 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
! #GNUe Application Server will function.  You can
! #obtain a copy from
! #
! #http://www.gnuenterprise.org/download.php
! #"""
! #    sys.exit()
! #
! #  # Verify that gnue-common has newest dbdriver/appserver
! #  try:
! #    print "Checking for dbdriver/appserver....",
! #    from gnue.common.dbdrivers.appserver import DBdriver
! #    print "OK (version %s)" % DBdriver.VERSION
! #
! #  except ImportError:
! #    print """
! #You will need to install newer version of gnue-common before
! #GNUe Application Server will function.  You can
! #obtain a copy from
! #
! #http://www.gnuenterprise.org/download.php
! #(You need at least version 0.2.0)
! #"""
! #    sys.exit()
! #
  
  
    #
***************
*** 114,120 ****
    RPCOK = 0
  
    print "Checking for available GNU-RPC drivers...."
!   # XMLRPC 
    try:
      print "   PY-XMLRPC....",
      import xmlrpc
--- 121,127 ----
    RPCOK = 0
  
    print "Checking for available GNU-RPC drivers...."
!   # XMLRPC
    try:
      print "   PY-XMLRPC....",
      import xmlrpc
***************
*** 155,161 ****
  """
      sys.exit()
  
!     
  # Site config stuff
  try:
    index = sys.argv.index('--cfg-file')
--- 162,168 ----
  """
      sys.exit()
  
! 
  # Site config stuff
  try:
    index = sys.argv.index('--cfg-file')
***************
*** 236,252 ****
        print "OK"
  
  docfiles = []
! for file in ('doc/api/api.html','doc/whitepaper/whitepaper.html',
!      'doc/api/api.txt','doc/whitepaper/whitepaper.txt'):
    if os.path.isfile(file):
      docfiles.append(file)
    else:
      print "WARNING: File %s does not exist... not installing!" % file
  
  
! setup (name = "GNUe-Application-Server",
         version = VERSION,
!        description = "GNU Enterprise Forms",
         long_description = "",
         author = "GNUe Application Server Team",
         author_email = "address@hidden",
--- 243,263 ----
        print "OK"
  
  docfiles = []
! for file in ('doc/api/api.html',
!              'doc/api/api.txt',
!              'doc/api/api.pdf',
!              'doc/whitepaper/whitepaper.html',
!              'doc/whitepaper/whitepaper.txt',
!              'doc/whitepaper/whitepaper.pdf'):
    if os.path.isfile(file):
      docfiles.append(file)
    else:
      print "WARNING: File %s does not exist... not installing!" % file
  
  
! setup (name = "GNUe-AppServer",
         version = VERSION,
!        description = "GNU Enterprise Application Server",
         long_description = "",
         author = "GNUe Application Server Team",
         author_email = "address@hidden",
***************
*** 255,271 ****
         # Override certain command classes with our own ones
         cmdclass = {'build_scripts':my_build_scripts},
  
!        data_files = [ ('doc', docfiles),
!                       ('samples',['samples/appservertest.gfd',
                                    'samples/setup-pgsql.sh',
!                                   'samples/setup-mysql.sh']),
                        ('shared/grpc',['grpc/GEAS.grpc'])
                         ],
  
!        packages = ["gnue.appserver"                   
!                    ],
         package_dir = {"gnue.appserver" : "src"},
!        scripts = ["scripts/appserver"]
         )
  
  if 'install' in sys.argv:
--- 266,283 ----
         # Override certain command classes with our own ones
         cmdclass = {'build_scripts':my_build_scripts},
  
!        data_files = [ ('doc/appserver', docfiles),
!                       ('samples/appserver',['samples/appservertest.gfd',
                                    'samples/setup-pgsql.sh',
! #                                  'samples/setup-mysql.sh'
!                               ]),
                        ('shared/grpc',['grpc/GEAS.grpc'])
                         ],
  
!        packages = ["gnue.appserver",
!                    "gnue.appserver.objrepos",],
         package_dir = {"gnue.appserver" : "src"},
!        scripts = ["scripts/geas"]
         )
  
  if 'install' in sys.argv:
Index: gnue/appserver/src/__init__.py
diff -c gnue/appserver/src/__init__.py:1.1 gnue/appserver/src/__init__.py:1.2
*** gnue/appserver/src/__init__.py:1.1  Mon May  6 12:02:36 2002
--- gnue/appserver/src/__init__.py      Fri May 31 15:24:47 2002
***************
*** 1,5 ****
  #
! # Copyright 2001 Free Software Foundation
  #
  # This file is part of GNU Enterprise.
  #
--- 1,5 ----
  #
! # Copyright 2001-2002 Free Software Foundation
  #
  # This file is part of GNU Enterprise.
  #
***************
*** 32,38 ****
  #   5. Commit to CVS
  
  _version = (0,0,1)
! _release = 0
  
  # Version will be of the form "1.1.2" if a release or "1.1.2a" if in CVS
  VERSION= ("%s.%s.%s" % _version) + (not _release and 'a' or '')
--- 32,38 ----
  #   5. Commit to CVS
  
  _version = (0,0,1)
! _release = 1
  
  # Version will be of the form "1.1.2" if a release or "1.1.2a" if in CVS
  VERSION= ("%s.%s.%s" % _version) + (not _release and 'a' or '')