[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[gnue] r9621 - in trunk: . gnue-appserver gnue-appserver/doc gnue-appser
|
From: |
reinhard |
|
Subject: |
[gnue] r9621 - in trunk: . gnue-appserver gnue-appserver/doc gnue-appserver/samples gnue-common gnue-common/utils gnue-designer gnue-forms gnue-navigator gnue-reports www/utils/sbin |
|
Date: |
Thu, 24 May 2007 16:10:16 -0500 (CDT) |
Author: reinhard
Date: 2007-05-24 16:10:14 -0500 (Thu, 24 May 2007)
New Revision: 9621
Added:
trunk/gnue-appserver/README.svn
trunk/gnue-appserver/samples/README.svn
trunk/gnue-appserver/samples/setup-svn-db.bat
trunk/gnue-appserver/samples/setup-svn-db.sh
trunk/gnue-appserver/setup.svn
trunk/gnue-common/README.svn
trunk/gnue-common/setup-svn.py
trunk/gnue-common/setup.svn
trunk/gnue-designer/README.svn
trunk/gnue-designer/setup.svn
trunk/gnue-forms/README.svn
trunk/gnue-forms/setup.svn
trunk/gnue-navigator/README.svn
trunk/gnue-navigator/setup.svn
trunk/gnue-reports/README.svn
trunk/gnue-reports/setup.svn
Removed:
trunk/gnue-appserver/README.cvs
trunk/gnue-appserver/samples/README.cvs
trunk/gnue-appserver/samples/setup-cvs-db.bat
trunk/gnue-appserver/samples/setup-cvs-db.sh
trunk/gnue-appserver/setup.cvs
trunk/gnue-common/README.cvs
trunk/gnue-common/setup-cvs.py
trunk/gnue-common/setup.cvs
trunk/gnue-designer/README.cvs
trunk/gnue-designer/setup.cvs
trunk/gnue-forms/README.cvs
trunk/gnue-forms/setup.cvs
trunk/gnue-navigator/README.cvs
trunk/gnue-navigator/setup.cvs
trunk/gnue-reports/README.cvs
trunk/gnue-reports/setup.cvs
Modified:
trunk/README.txt
trunk/gnue-appserver/doc/configuration.txt
trunk/gnue-common/utils/setup-win4lin-stage.sh
trunk/gnue-common/utils/win-links.txt
trunk/gnue-forms/FAQ
trunk/www/utils/sbin/update-tasks
Log:
Switched from setup-cvs.py/setup.cvs/README.cvs to
setup-svn.py/setup.svn/README.svn.
Modified: trunk/README.txt
===================================================================
--- trunk/README.txt 2007-05-24 20:37:13 UTC (rev 9620)
+++ trunk/README.txt 2007-05-24 21:10:14 UTC (rev 9621)
@@ -118,7 +118,7 @@
[ This option is only available on POSIX (Linux/Unix)
systems as it extensively makes use of symbolic links. ]
- To install the python-based tools, type "python setup-cvs.py" from the
+ To install the python-based tools, type "python setup-svn.py" from the
gnue-common directory. This will set up GNUe Common, GNUe Forms, GNUe
Reports, GNUe Designer, GNUe Navigator, and GNUe AppServer.
Deleted: trunk/gnue-appserver/README.cvs
===================================================================
--- trunk/gnue-appserver/README.cvs 2007-05-24 20:37:13 UTC (rev 9620)
+++ trunk/gnue-appserver/README.cvs 2007-05-24 21:10:14 UTC (rev 9621)
@@ -1,30 +0,0 @@
-Developer Installation Instructions
-===================================
-
-If you have downloaded gnue-appserver from the subversion repository (which you
-most probably have, because you wouldn't see this file otherwise), you can
-install and configure everything like described in the files "INSTALL" and
-"doc/configuration.txt".
-
-However, GNU Enterprise supports parallel use of an "installed" version and one
-or several "development" versions by providing a "developer install" script
-that uses different names for the programs.
-
-After downloading all the tools you want to have from the subversion
-repository, you just to run ./setup-cvs.py in the gnue-common directory.
-
-With the developer installation, you have to substitute the commands of the
-gnue-appserver package as follows:
-
-gnue-appserver -> gacvs
-gnue-readgcd -> gcdcvs
-gnue-reagdld -> gldcvs
-gnue-setupdb -> gsetupdbcvs
-setup-db.sh -> setup-cvs-db.sh ("samples/" directory)
-
-Also, you will all relevant files and directories in ~/gnue instead of
-/usr/local/gnue.
-
-While the developer install script substitutes the steps given in the file
-"INSTALL", you still have to follow the steps given in doc/configuration.txt
-(with the above substitutions applied).
Copied: trunk/gnue-appserver/README.svn (from rev 9619,
trunk/gnue-appserver/README.cvs)
===================================================================
--- trunk/gnue-appserver/README.cvs 2007-05-24 18:04:57 UTC (rev 9619)
+++ trunk/gnue-appserver/README.svn 2007-05-24 21:10:14 UTC (rev 9621)
@@ -0,0 +1,30 @@
+Developer Installation Instructions
+===================================
+
+If you have downloaded gnue-appserver from the subversion repository (which you
+most probably have, because you wouldn't see this file otherwise), you can
+install and configure everything like described in the files "INSTALL" and
+"doc/configuration.txt".
+
+However, GNU Enterprise supports parallel use of an "installed" version and one
+or several "development" versions by providing a "developer install" script
+that uses different names for the programs.
+
+After downloading all the tools you want to have from the subversion
+repository, you just to run ./setup-svn.py in the gnue-common directory.
+
+With the developer installation, you have to substitute the commands of the
+gnue-appserver package as follows:
+
+gnue-appserver -> gacvs
+gnue-readgcd -> gcdcvs
+gnue-reagdld -> gldcvs
+gnue-setupdb -> gsetupdbcvs
+setup-db.sh -> setup-svn-db.sh ("samples/" directory)
+
+Also, you will find all relevant files and directories in ~/gnue instead of
+/usr/local/gnue.
+
+While the developer install script substitutes the steps given in the file
+"INSTALL", you still have to follow the steps given in doc/configuration.txt
+(with the above substitutions applied).
Modified: trunk/gnue-appserver/doc/configuration.txt
===================================================================
--- trunk/gnue-appserver/doc/configuration.txt 2007-05-24 20:37:13 UTC (rev
9620)
+++ trunk/gnue-appserver/doc/configuration.txt 2007-05-24 21:10:14 UTC (rev
9621)
@@ -22,7 +22,7 @@
C. If you *really* want to follow the bleeding edge of development, you can
access our SVN repository by following the instructions given at
http://www.gnuenterprise.org/developers/svn.php. Please make sure your read
- the file "README.cvs" in every package, if available.
+ the file "README.svn" in every package, if available.
Once you have installed the gnue-common and gnue-appserver packages, you have
to do several configuration steps:
Deleted: trunk/gnue-appserver/samples/README.cvs
===================================================================
--- trunk/gnue-appserver/samples/README.cvs 2007-05-24 20:37:13 UTC (rev
9620)
+++ trunk/gnue-appserver/samples/README.cvs 2007-05-24 21:10:14 UTC (rev
9621)
@@ -1,6 +0,0 @@
-To try GNUe-AppServer, please follow the procedure given in the README file,
-but note that the developer versions of the commands have different names:
-
-setup-db.sh --> setup-cvs-db.sh
-gnue-appserver --> gacvs
-gnue-forms --> gfcvs
Copied: trunk/gnue-appserver/samples/README.svn (from rev 9619,
trunk/gnue-appserver/samples/README.cvs)
Deleted: trunk/gnue-appserver/samples/setup-cvs-db.bat
===================================================================
--- trunk/gnue-appserver/samples/setup-cvs-db.bat 2007-05-24 20:37:13 UTC
(rev 9620)
+++ trunk/gnue-appserver/samples/setup-cvs-db.bat 2007-05-24 21:10:14 UTC
(rev 9621)
@@ -1,3 +0,0 @@
-python gnue-readgcd --connection=gnue sample.gcd
-for %%x in (sample-*.gld) do python gnue-readgld --connection=gnue %%x
-python gnue-schema --connection=gnue sample.gsd
Deleted: trunk/gnue-appserver/samples/setup-cvs-db.sh
===================================================================
--- trunk/gnue-appserver/samples/setup-cvs-db.sh 2007-05-24 20:37:13 UTC
(rev 9620)
+++ trunk/gnue-appserver/samples/setup-cvs-db.sh 2007-05-24 21:10:14 UTC
(rev 9621)
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-gcdcvs --connection=gnue sample.gcd
-gldcvs --connection=gnue sample-*.gld
-gsscvs --connection=gnue sample.gsd
Copied: trunk/gnue-appserver/samples/setup-svn-db.bat (from rev 9619,
trunk/gnue-appserver/samples/setup-cvs-db.bat)
Copied: trunk/gnue-appserver/samples/setup-svn-db.sh (from rev 9619,
trunk/gnue-appserver/samples/setup-cvs-db.sh)
Deleted: trunk/gnue-appserver/setup.cvs
===================================================================
--- trunk/gnue-appserver/setup.cvs 2007-05-24 20:37:13 UTC (rev 9620)
+++ trunk/gnue-appserver/setup.cvs 2007-05-24 21:10:14 UTC (rev 9621)
@@ -1,48 +0,0 @@
-#
-# This file is part of GNU Enterprise.
-#
-# GNU Enterprise is free software; you can redistribute it
-# and/or modify it under the terms of the GNU General Public
-# License as published by the Free Software Foundation; either
-# version 2, or (at your option) any later version.
-#
-# GNU Enterprise is distributed in the hope that it will be
-# useful, but WITHOUT ANY WARRANTY; without even the implied
-# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-# PURPOSE. See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public
-# License along with program; see the file COPYING. If not,
-# write to the Free Software Foundation, Inc., 59 Temple Place
-# - Suite 330, Boston, MA 02111-1307, USA.
-#
-# Copyright 2001-2003 Free Software Foundation
-#
-# ********************
-# NOTE:
-# This file is parsed/run by gnue-common's setup-cvs.py script.
-# If you are attempting to set up a CVS install environment, please
-# run that file. This file is not a standalone script.
-# ********************
-#
-# $Id$
-
-# Add our source tree to the gnue.* heirarchy...
-linkModule ('src/','appserver')
-
-# Create our shell script wrappers around the python programs
-createShell ('gacvs', 'gnue-appserver')
-createShell ('ggcvs', 'gnue-gsdgen')
-createShell ('gcdcvs', 'gnue-readgcd')
-createShell ('gldcvs', 'gnue-readgld')
-
-# Create a link for the other shell scripts
-createLink ('scripts/gsetupdbcvs', '%s/gsetupdbcvs%s' % (BINDIR, SUFFIX),
- overwrite = 1)
-
-# Link other files to their correct location
-createLink ('share/repository.ini',
- '%s/share/gnue/appserver/repository.ini' % CONFDIR, overwrite = 1)
-
-createLink ('share/gnue.gsd', '%s/share/gnue/appserver/gnue.gsd' % CONFDIR,
- overwrite = 1)
Copied: trunk/gnue-appserver/setup.svn (from rev 9619,
trunk/gnue-appserver/setup.cvs)
===================================================================
--- trunk/gnue-appserver/setup.cvs 2007-05-24 18:04:57 UTC (rev 9619)
+++ trunk/gnue-appserver/setup.svn 2007-05-24 21:10:14 UTC (rev 9621)
@@ -0,0 +1,48 @@
+#
+# This file is part of GNU Enterprise.
+#
+# GNU Enterprise is free software; you can redistribute it
+# and/or modify it under the terms of the GNU General Public
+# License as published by the Free Software Foundation; either
+# version 2, or (at your option) any later version.
+#
+# GNU Enterprise is distributed in the hope that it will be
+# useful, but WITHOUT ANY WARRANTY; without even the implied
+# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+# PURPOSE. See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public
+# License along with program; see the file COPYING. If not,
+# write to the Free Software Foundation, Inc., 59 Temple Place
+# - Suite 330, Boston, MA 02111-1307, USA.
+#
+# Copyright 2001-2003 Free Software Foundation
+#
+# ********************
+# NOTE:
+# This file is parsed/run by gnue-common's setup-svn.py script.
+# If you are attempting to set up a CVS install environment, please
+# run that file. This file is not a standalone script.
+# ********************
+#
+# $Id$
+
+# Add our source tree to the gnue.* heirarchy...
+linkModule ('src/','appserver')
+
+# Create our shell script wrappers around the python programs
+createShell ('gacvs', 'gnue-appserver')
+createShell ('ggcvs', 'gnue-gsdgen')
+createShell ('gcdcvs', 'gnue-readgcd')
+createShell ('gldcvs', 'gnue-readgld')
+
+# Create a link for the other shell scripts
+createLink ('scripts/gsetupdbcvs', '%s/gsetupdbcvs%s' % (BINDIR, SUFFIX),
+ overwrite = 1)
+
+# Link other files to their correct location
+createLink ('share/repository.ini',
+ '%s/share/gnue/appserver/repository.ini' % CONFDIR, overwrite = 1)
+
+createLink ('share/gnue.gsd', '%s/share/gnue/appserver/gnue.gsd' % CONFDIR,
+ overwrite = 1)
Deleted: trunk/gnue-common/README.cvs
===================================================================
--- trunk/gnue-common/README.cvs 2007-05-24 20:37:13 UTC (rev 9620)
+++ trunk/gnue-common/README.cvs 2007-05-24 21:10:14 UTC (rev 9621)
@@ -1,21 +0,0 @@
-Developer Installation Instructions
-===================================
-
-If you have downloaded gnue-common from the subversion repository (which you
-most probably have, because you wouldn't see this file otherwise), you can
-install and configure everything like described in the file "INSTALL".
-
-However, GNU Enterprise supports parallel use of an "installed" version and one
-or several "development" versions by providing a "developer install" script
-that uses different names for the programs.
-
-After downloading all the tools you want to have from the subversion
-repository, you just to run ./setup-cvs.py in the gnue-common directory.
-
-With the developer installation, you have to substitute the commands of the
-gnue-common package as follows:
-
-gnue-schema -> gsscvs
-
-Also, you will all relevant files and directories in ~/gnue instead of
-/usr/local/gnue.
Copied: trunk/gnue-common/README.svn (from rev 9619,
trunk/gnue-common/README.cvs)
===================================================================
--- trunk/gnue-common/README.cvs 2007-05-24 18:04:57 UTC (rev 9619)
+++ trunk/gnue-common/README.svn 2007-05-24 21:10:14 UTC (rev 9621)
@@ -0,0 +1,21 @@
+Developer Installation Instructions
+===================================
+
+If you have downloaded gnue-common from the subversion repository (which you
+most probably have, because you wouldn't see this file otherwise), you can
+install and configure everything like described in the file "INSTALL".
+
+However, GNU Enterprise supports parallel use of an "installed" version and one
+or several "development" versions by providing a "developer install" script
+that uses different names for the programs.
+
+After downloading all the tools you want to have from the subversion
+repository, you just to run ./setup-svn.py in the gnue-common directory.
+
+With the developer installation, you have to substitute the commands of the
+gnue-common package as follows:
+
+gnue-schema -> gsscvs
+
+Also, you will find all relevant files and directories in ~/gnue instead of
+/usr/local/gnue.
Deleted: trunk/gnue-common/setup-cvs.py
===================================================================
--- trunk/gnue-common/setup-cvs.py 2007-05-24 20:37:13 UTC (rev 9620)
+++ trunk/gnue-common/setup-cvs.py 2007-05-24 21:10:14 UTC (rev 9621)
@@ -1,670 +0,0 @@
-#!/usr/bin/env python
-#
-# This file is part of GNU Enterprise.
-#
-# GNU Enterprise is free software; you can redistribute it
-# and/or modify it under the terms of the GNU General Public
-# License as published by the Free Software Foundation; either
-# version 2, or (at your option) any later version.
-#
-# GNU Enterprise is distributed in the hope that it will be
-# useful, but WITHOUT ANY WARRANTY; without even the implied
-# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-# PURPOSE. See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public
-# License along with program; see the file COPYING. If not,
-# write to the Free Software Foundation, Inc., 59 Temple Place
-# - Suite 330, Boston, MA 02111-1307, USA.
-#
-# Copyright 2001-2006 Free Software Foundation
-#
-
-
-##########################################################
-#
-# NOTE: Nightly cron scripts on www.gnuenterprise.org
-# run this script with --auto, which uses the
-# defaults passed to getInput. So, each input
-# MUST have a sane default or various web functions
-# might just break.
-#
-
-
-import sys, string, os, glob
-
-# Hack for python 2.1 compatibility. With 2.3 we can use the global __file__
-m = __import__ ('setup-cvs', None, None, '*')
-if __name__ == '__main__':
- sys.exit (0)
-
-# Determine if Windows is used
-WIN=(sys.platform=="win32")
-
-CVSDIR = os.path.abspath(os.path.join(os.path.dirname(m.__file__),'..'))
-BASEDIR = WIN and os.path.join(sys.prefix,"gnue-devel") or
os.path.join(CVSDIR, '.cvsdevelbase')
-PYTHONBIN=sys.executable
-
-global CURRENT_DIR
-CURRENT_DIR = ""
-CURRENT_TOOL = ""
-rootCommands = []
-
-def createShell (script,py,scriptdir="scripts"):
- script = "%s%s" % (script, SUFFIX)
- if py:
- src = os.path.join(CURRENT_DIR, scriptdir, py)
- else:
- src = ''
- if WIN:
- dest = os.path.join(BINDIR, "%s.bat" % script)
- else:
- dest = os.path.join(CURRENT_DIR, scriptdir, script)
- if not auto:
- print "Creating %s....." % dest ,
- try:
- file = open(dest,'w')
- if WIN:
- # create batch file at final destination
- file.write("@set PYTHONPATH=%s;%%PYTHONPATH%%\n" % BASEDIR)
- file.write("@set SCRIPT=%s\n" % src)
- file.write("@%s \"%%SCRIPT%%\" %%1 %%2 %%3 %%4 %%5 %%6 %%7 %%8 %%9\n" %
PYTHONBIN)
- file.close()
- else:
- # create script in repository and
- file.write(cvsbase % src)
- file.close()
- os.system ('chmod 700 %s' % dest)
-
- rootCommands.append ('rm -f %s/%s' % (BINDIR, script))
- rootCommands.append ('ln -s %s %s/%s' % \
- (dest, BINDIR, script))
- rootCommands.append ('chmod o+x %s' % dest)
-
- except IOError:
- print "Unable to create. Do you have this package checked out?"
- else:
- if not auto:
- print "ok"
-
-def createDocs(sgmlfile, destdir):
- if not willInstallDocs:
- return
- sgmlfile = os.path.join(CURRENT_DIR, sgmlfile)
- destdir = os.path.join(DOCDIR, destdir)
- rootCommands.append("if [ ! -d %s ]; then mkdir %s; fi" % (destdir, destdir))
- rootCommands.append("%s --output %s %s" %
- (DB2HTML, destdir, sgmlfile))
-
-
-def getInput(message, default, responseSet=None):
-
- if auto:
- return default
-
- print ""
- while 1:
- if default:
- print "%s [%s] " % (message, default),
- else:
- print "%s " % (message),
-
-
- val = string.strip(sys.stdin.readline())
- print ""
-
- if not len(val) and default:
- return default
- elif responseSet and string.upper(val) in (responseSet):
- return string.upper(val)
- elif not responseSet:
- return val
-
-
-_getYesNoAllStat = {}
-
-def getYesNo(message, default, category=None):
-
- if auto:
- return default
-
- if category:
- try:
- response = _getYesNoAllStat[category]
- print "\n" + message + ' ' + (response and 'Always' or 'Never')
- return response
- except KeyError:
- pass
-
- response = getInput(message,default,('Y','N','A','V'))
- val = response in ('Y','A')
- if category and response in ('A','V'):
- _getYesNoAllStat[category] = val
- return val
-
-
-def getBinPaths():
- paths = string.split(os.environ['PATH'],os.pathsep)
- if not ('/usr/local/bin' in paths or '/usr/local/bin/' in paths) and \
- os.path.isdir('/usr/local/bin'):
- paths.append('/usr/local/bin')
- return(paths)
-
-
-# Returns a list containing all Python executables in the user's path.
-# List element 0 will always be the currently running executable
-def findAllPythonExes():
- results = [sys.executable]
-
- for path in getBinPaths():
- for file in glob.glob('%s/python?*' % os.path.abspath(string.strip(path))):
- base = os.path.basename(file)
- version = base[6:]
-
- # Do not include python 1.x files
- if version < '2':
- pass
-
- # Do not include python2.2-popy-config
- elif len(version)>8:
- pass
-
- # Do not include python??.dll
- elif base[-3:]=="dll":
- pass
-
- elif os.path.realpath(file)==os.path.realpath(sys.executable):
- # If this file is the one being executed, just replace w/full name
- if results[0] == sys.executable:
- results[0] = file
- else:
- results.append(file)
-
- return results
-
-def findAllGNUePackages():
- results = []
- for file in glob.glob('../*'):
- if os.path.isfile(os.path.join(file, 'setup.cvs')):
- base = os.path.basename(file)
- results.append(base)
- results.sort()
- return results
-
-def finddb2html():
- for path in getBinPaths():
- for file in glob.glob('%s/db2html' % os.path.abspath(string.strip(path))):
- return(file)
-
- # Nothing found
- return "";
-
-
-def restartWithExecutable(exe):
- os.system('%s %s --withNewExecutable "%s"' \
- % (exe, sys.argv[0], string.join(sys.argv[1:],'" "')))
- sys.exit()
-
-def createLink(file, dest, overwrite=0):
- if WIN:
- src=os.path.normpath(os.path.join(CURRENT_DIR, file))
- dest = os.path.normpath(dest)
-
- if os.path.isdir(src):
- ret = os.system("xcopy /S /E /Y \"%s\" \"%s\\\" > NUL" % (src, dest))
- else:
- ret = os.system("copy \"%s\" \"%s\" > NUL" % (src, dest))
- if ret!=0:
- print "Failed to copy %s to %s." % (src, dest)
-
- else:
- if overwrite:
- rootCommands.append ("if [ -e %s ]; then rm -f %s; fi" % (dest, dest))
-
- rootCommands.append("ln -f -s %s/%s %s" % (CURRENT_DIR, file, dest))
-
-
-def linkModule(subdir, module):
- if WIN:
- if not os.path.exists("%s/%s" % (GNUEDIR,module)):
- os.makedirs("%s/%s" % (GNUEDIR,module))
- # create link via virtual python module
- output = open ("%s/%s/__init__.py" % (GNUEDIR,module), "w")
- output.write ("# This file was generated by setup-cvs.py.\n")
- output.write ("\n")
- output.write ("__path__ = [\"%s\\%s\"]\n" % (CURRENT_DIR,subdir))
- output.write ("from __init__ import *")
- output.close ()
- else:
- rootCommands.append("ln -f -s %s/%s %s/%s" % (CURRENT_DIR, subdir,
GNUEDIR, module))
-
-def createDir(subdir):
- if WIN:
- if not os.path.exists(subdir):
- os.makedirs(subdir)
- else:
- rootCommands.append("if [ ! -d %s ]; then mkdir -p %s; fi" %
(subdir,subdir))
-
-
-restarting = ('--withNewExecutable' in sys.argv)
-auto = ('--auto' in sys.argv)
-
-if not restarting and not auto:
- print """
-GNU Enterprise Developer Setup
-
-This script will install the GNU Enterprise tools to run
-from a CVS copy. This allows GNUe to be run without a
-full installation. THIS IS PRIMARILY USEFUL TO DEVELOPERS.
- """
-
-# First of all, make sure this is a current enough Python release.
-try:
- if sys.hexversion < 0x02000000:
- raise AttributeError
-except AttributeError:
-
- print "-" * 70
- print """
- You are running Python %s.
-
- GNU Enterprise requires at least Python 2.0 (recommended: 2.1+).
- If you have a later version installed, you should run setup.py
- against that version. For example, if you have Python 2.1
- installed, you may need to run:
-
- python2.1 %s
-""" % (string.split(sys.version)[0], sys.argv[0])
- print "-" * 70
-
- exes = findAllPythonExes()
-
- if len(exes) == 1:
- sys.exit()
- else:
-
- # There are better versions of Python installed...
-
- exes.pop(0)
- print "\n"
- print "I have found the following Python executables. "
- print "Choose another version of Python to run."
- print ""
-
- validOptions = []
- i = 0
-
- for file in exes:
- i = i + 1 # Do not change this to i += 1 as that's >= py2.x
- validOptions.append(str(i))
- print " [%s] %s" % (i, file)
-
- validOptions.append ('Q')
- selection = getInput(
- "Please enter the number of the Python executable to\n"
- 'use [1-%s] or enter "q" to quit.' % i, '1', validOptions)
-
- if selection == 'Q':
- sys.exit()
-
- restartWithExecutable(exes[int(selection)-1])
-
-if WIN:
- print """
-Warning:
-Under Windows GNUe data files (like images, settings etc) will NOT be
-updated by an repository update! For a full update please re-execute
-this script.
-
-You are creating a GNU Enterprise developer installation based on a
-code repository. As Microsoft Windows doesn't support filesystem links
-data files has to be copied from the repository to the installation
-directory. Python source files are instead linked by a specific import
-method and will be updated by a repository update.
-"""
-
-if not restarting:
-
- if not auto:
- print """
-If you are trying to install GNU Enterprise for production
-use, then answer 'N' to the following question and install
-each tool separately using it's setup.py script.
- """
-
- if not getYesNo("Continue installing the CVS-runnable tools? ","Y"):
- sys.exit()
-
- exes = findAllPythonExes()
- PYTHONBIN=exes[0]
-
-
- # Make sure they are running against the version of python they intended
- if len(exes) > 1 and not auto:
-
- print "\n"
- print "I have found the following Python executables. Please"
- print "choose the Python installation you would like to use."
- print ""
-
- validOptions = []
- i = 0
-
- for file in exes:
- i = i + 1 # Do not change this to i += 1 as that's >= py2.x
- validOptions.append(str(i))
- if i == 1:
- print " [%s] %s (Current)" % (i, file)
- else:
- print " [%s] %s" % (i, file)
-
- validOptions.append ('Q')
- selection = getInput(
- "Please enter the number of the Python executable to\n"
- 'use [1-%s] or enter "q" to quit.' % i, '1', validOptions)
-
- if selection == 'Q':
- sys.exit()
-
- if selection != '1':
- restartWithExecutable(exes[int(selection)-1])
-
-if not auto:
- print
- print "Continuing with the developer installation...\n"
-
-if not auto and not WIN:
- print """
-This setup script can install GNUe as either a local (per user)
-copy or a system-wide copy. If you are unsure, choose the
-recommended 'Local' setting. Installing system-wide will require
-the root password and may force all users on this machine to use
-your copy."""
-
-ROOTINSTALL = WIN or getInput(
- "Perform a [L]ocal/per-user or a [S]ystem-wide install?",'L',('L','S')) ==
'S'
-
-# confirm base path
-while WIN:
- BASEDIR = os.path.abspath(
- getInput ("Where do you want to install GNU Enterprise?", BASEDIR))
-
- if os.path.isdir(BASEDIR) or \
- getYesNo("Directory %s does not exist. Create? (Yes,No,All,neVer)" %
BASEDIR, 'Y','directories'):
- break
-
-if WIN:
- BINDIR = os.path.join(BASEDIR,"bin")
- CONFDIR = os.path.join(BASEDIR,"conf")
- DOCDIR=os.path.join(BASEDIR,"docs")
-elif ROOTINSTALL:
- BINDIR = "/usr/local/bin"
- CONFDIR = "/usr/local/gnue"
- DOCDIR = "/usr/local/gnue/doc/"
-else:
- BINDIR = os.path.expanduser("~/bin")
- CONFDIR = os.path.expanduser("~/gnue")
- DOCDIR = os.path.expanduser("~/gnue/docs")
-
-
-while 1:
- BINDIR = os.path.abspath(
- getInput ("Where shall I put executable files?", BINDIR))
-
- if os.path.isdir(BINDIR) or \
- getYesNo("Directory %s does not exist. Create? (Yes,No,All,neVer)" %
BINDIR, 'Y','directories'):
- break
-
-if not auto:
- print """
-If you maintain multiple GNUe developer installations, you may
-wish to add a suffix to the script names. For example, if
-are installing the 0.1.x branch as a secondary branch, you
-may want all the executables to be named as <script>-0.1. To
-do this, enter '-0.1' at the next prompt. Normally, you will
-leave the following option blank."""
-
-SUFFIX = string.strip(getInput ("String to append to script names:",""))
-
-while 1:
- CONFDIR = os.path.abspath(
- getInput ("Where shall I put configuration files?", CONFDIR))
-
- if os.path.isdir(CONFDIR) or \
- getYesNo("Directory %s does not exist. Create? (Yes,No,All,neVer)" %
CONFDIR, 'Y','directories'):
- break
-
-newdirs = [BINDIR, CONFDIR, "%s/etc" % CONFDIR,
- "%s/share" % CONFDIR,
- "%s/share/gnue" % CONFDIR,
- "%s/share/gnue/filters" % CONFDIR,
- "%s/share/gnue/appserver" % CONFDIR,
- "%s/share/gnue/forms" % CONFDIR,
- "%s/share/gnue/images" % CONFDIR,
- "%s/share/locale" % CONFDIR ]
-
-willInstallDocs = 0
-
-DB2HTML = finddb2html();
-if DB2HTML:
- if getYesNo("Generate and install documentation? (This could be slow.)",
'N'):
- willInstallDocs = 1
- while 1:
- DOCDIR = os.path.abspath(
- getInput ("Where shall I put the documentation files?", DOCDIR))
-
- if os.path.isdir(DOCDIR) or \
- getYesNo("Directory %s does not exist. Create? (Yes,No,All,neVer)" %
DOCDIR, 'Y','directories'):
- newdirs.append(DOCDIR)
- break
-elif not auto:
- print "Cannot generate documentation, could not find db2html in path\n";
-
-
-for dir in newdirs:
- createDir(dir)
-
-GNUEDIR = os.path.join(BASEDIR,'gnue')
-
-
-cvsbase = """#!/bin/sh
- PYTHONPATH=%(BASEDIR)s:$PYTHONPATH; export PYTHONPATH
- SCRIPT="%%s"
- exec %(PYTHONBIN)s ${SCRIPT} "$@"
- """ % globals()
-
-# FIXME: Need to cleanup old files for Win32 install
-if os.path.isdir (GNUEDIR) and not WIN:
- os.system ('rm -rf %s' % GNUEDIR)
-
-try:
- os.makedirs(GNUEDIR)
-except:
- pass
-
-# create path.py
-output = open ("%s/paths.py" % GNUEDIR, "w")
-output.write ("# This file was generated by setup-cvs.py.\n")
-output.write ("\n")
-output.write ("lib = \"%s\"\n" % GNUEDIR)
-output.write ("scripts = \"%s\"\n" % BINDIR)
-output.write ("data = \"%s\"\n" % CONFDIR)
-output.write ("config = \"%s/etc\"\n" % CONFDIR)
-output.close ()
-
-if WIN:
- # create import for gnue-common
- CURRENT_DIR = os.path.join(CVSDIR,"gnue-common")
- linkModule("src","common")
- os.system("copy \"%s\\gnue-common\\module\\base\\__init__.py\" \"%s\"" %
(CVSDIR, GNUEDIR) )
- # FIXME: add locale support to Win32 developer install
-
-else:
- rootCommands.append("""
- cd %(GNUEDIR)s
- ln -f -s %(CVSDIR)s/gnue-common/module/base/__init__.py .
- ln -f -s %(CVSDIR)s/gnue-common/src common
- if [ -f %(CVSDIR)s/gnue-common/src/.GDTD.py ]; then rm -f
%(CVSDIR)s/gnue-common/src/.GDTD.py; fi
-
- rm -rf %(CONFDIR)s/share/locale/*
- cd %(CONFDIR)s/share/locale
- for i in %(CVSDIR)s/*; do
- package=`basename $i`
- if [ -d $i/po ]; then
- (cd $i/po; make -s gmo)
- for j in $i/po/*.gmo; do
- language=`basename $j .gmo`
- mkdir -p %(CONFDIR)s/share/locale/${language}/LC_MESSAGES
- ln -f -s $j
%(CONFDIR)s/share/locale/${language}/LC_MESSAGES/${package}.mo
- done
- fi
- done
-
- """ % globals() )
-
-for CURRENT_TOOL in ('gnue-common',
- 'gnue-designer',
- 'gnue-dbtools',
- 'gnue-forms',
- 'gnue-reports',
- 'gnue-navigator',
- 'gnue-pos',
- 'gnue-integrator',
- 'gnue-appserver'):
-
- CURRENT_DIR = os.path.join(CVSDIR, CURRENT_TOOL)
- setupfile = os.path.join(CURRENT_DIR, 'setup.cvs')
-
- if not auto:
- print setupfile
-
- if os.path.isfile(setupfile) and \
- getYesNo('Setup CVS environment for %s? (Yes,No,All,neVer)'% CURRENT_TOOL,
- 'Y','autotools'):
- execfile(setupfile,globals())
-
-
-if getYesNo('Do you have any external/custom packages to setup?','N'):
- while 1:
- path = getInput("Path to package's directory containing a setup.cvs file?
(blank line to end)",None)
- if not path:
- break
-
- CURRENT_TOOL = CURRENT_DIR = path
- execfile(os.path.join(CURRENT_DIR,'setup.cvs'), globals())
-
-
-
-willCreateConf = 0
-willCreateConn = 0
-willCreateFilt = 0
-
-if os.path.isfile('/usr/local/gnue/etc/gnue.conf') and \
- CONFDIR != '/usr/local/gnue' and not
os.path.isfile(CONFDIR+'/etc/gnue.conf'):
- if getYesNo('Do you wish to use the current system-wide gnue.conf file?
(Yes,No,All,neVer)','N','conf'):
- rootCommands.append("ln -s /usr/local/gnue/etc/gnue.conf
%(CONFDIR)s/etc/gnue.conf" % globals())
- willCreateConf = 1
-
-
-if os.path.isfile('/usr/local/gnue/etc/connections.conf') and \
- CONFDIR != '/usr/local/gnue' and not
os.path.isfile(CONFDIR+'/etc/connections.conf'):
- if getYesNo('Do you wish to use the current system-wide connections.conf
file? (Yes,No,All,neVer)','Y','conf'):
- rootCommands.append("ln -s /usr/local/gnue/etc/connections.conf
%(CONFDIR)s/etc/connections.conf" % globals())
- willCreateConn = 1
-
-
-if os.path.isfile('/usr/local/gnue/etc/report-filters.conf') and \
- CONFDIR != '/usr/local/gnue' and not
os.path.isfile(CONFDIR+'/etc/report-filters.conf'):
- if getYesNo('Do you wish to use the current system-wide report-filters.conf
file? (Yes,No,All,neVer)','N','conf'):
- rootCommands.append("ln -s /usr/local/gnue/etc/report-filters.conf
%(CONFDIR)s/etc/report-filters.conf" % globals())
- willCreateFilt = 1
-
-if not willCreateConf and not os.path.isfile("%s/etc/gnue.conf"%CONFDIR):
- if not auto:
- print ""
- print "You do not currently have a gnue.conf tools configuration file."
- if getYesNo("Do you want to create a gnue.conf based on the supplied
examples? (Yes,No,All,neVer)",'Y','autoconf'):
- if not auto and not WIN:
- print "Since the gnue.conf file format may change from time to time in
CVS,"
- print "we can create a symlinked gnue.conf file that always mirrors CVS.
This"
- print "will not allow you to customize gnue.conf, however."
-
- if WIN or getYesNo ("Do you want to use a symlinked gnue.conf file?",'N',):
- createLink("%s/gnue-common/etc/sample.gnue.conf" % CVSDIR,
"%s/etc/gnue.conf" % CONFDIR)
- else:
- command = "cp %(CVSDIR)s/gnue-common/etc/sample.gnue.conf
%(CONFDIR)s/etc/gnue.conf" % globals()
- rootCommands.append(command)
-
-
-if not willCreateConn and not
os.path.isfile("%s/etc/connections.conf"%CONFDIR):
- if not auto:
- print ""
- print "You do not currently have a connections.conf configuration file."
- if getYesNo("Do you want to create a connections.conf based on the supplied
examples? (Yes,No,All,neVer)",'Y','autoconf'):
- if WIN:
- createLink("%s/gnue-common/etc/sample.connections.conf" % CVSDIR,
"%s/etc/connections.conf" % CONFDIR)
- else:
- rootCommands.append("cp
%(CVSDIR)s/gnue-common/etc/sample.connections.conf
%(CONFDIR)s/etc/connections.conf" % globals())
-
-if not auto:
- print
- print "NOTE: Your connections.conf file will need to"
- print " be edited to reflect your local setup."
- print
-
-if not willCreateConf and not
os.path.isfile("%s/etc/report-filters.conf"%CONFDIR):
- if not auto:
- print ""
- print "You do not currently have a report-filters.conf configuration file."
- if getYesNo("Do you want to create a report-filters.conf based on the
supplied examples? (Yes,No,All,neVer)",'Y','autoconf'):
- if not auto and not WIN:
- print "Since the report-filters.conf file format may change from time to
time in CVS,"
- print "we can create a symlinked report-filters.conf file that always
mirrors CVS. This"
- print "will not allow you to customize report-filters.conf, however."
- if WIN or getYesNo ("Do you want to use a symlinked report-filters.conf
file? (Yes,No,All,neVer)",'N', 'symconf'):
- createLink("%s/gnue-reports/etc/sample.report-filters.conf" % CVSDIR,
"%s/etc/report-filters.conf" % CONFDIR)
- else:
- command = "cp %(CVSDIR)s/gnue-reports/etc/sample.report-filters.conf
%(CONFDIR)s/etc/report-filters.conf" % globals()
- rootCommands.append(command)
-
-if WIN:
- print "Setup completed!"
-
-elif ROOTINSTALL:
-
- out = open("setup-root.sh",'w')
- out.write("#!/bin/sh\n")
- out.write(string.join(rootCommands,"\n"))
- out.write("\n")
- out.close()
-
- print ""
- print "All the commands that need to be run as root have been written"
- print "to setup-root.sh . In order for your setup to be complete, this"
- print "file must be run. This setup script can run setup-root.sh for"
- print "you. If you choose to run the script now and are not currently"
- print "logged in as root, you will be prompted for the root password."
- if getYesNo('Run "/bin/sh setup-root.sh" as root?','Y'):
- os.system('su root -c "/bin/sh setup-root.sh"')
- else:
- print ""
- print 'Do not forget to run "/bin/sh setup-root.sh" as root'
- print ""
-
-else:
-
- out = open("setup.log",'w')
- out.write(string.join(rootCommands,"\n"))
- out.write("\n")
- out.close()
-
- os.system(string.join(rootCommands,'\n'))
-
-#
-# Save our config settings
-#
-from pprint import pformat
-c = open (os.path.join(CVSDIR,'.cvs-config'),'w')
-for key, val in globals().items():
- if key[0].isupper():
- c.write('%s=%s\n\n' % (key, pformat(val)))
Copied: trunk/gnue-common/setup-svn.py (from rev 9619,
trunk/gnue-common/setup-cvs.py)
===================================================================
--- trunk/gnue-common/setup-cvs.py 2007-05-24 18:04:57 UTC (rev 9619)
+++ trunk/gnue-common/setup-svn.py 2007-05-24 21:10:14 UTC (rev 9621)
@@ -0,0 +1,670 @@
+#!/usr/bin/env python
+#
+# This file is part of GNU Enterprise.
+#
+# GNU Enterprise is free software; you can redistribute it
+# and/or modify it under the terms of the GNU General Public
+# License as published by the Free Software Foundation; either
+# version 2, or (at your option) any later version.
+#
+# GNU Enterprise is distributed in the hope that it will be
+# useful, but WITHOUT ANY WARRANTY; without even the implied
+# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+# PURPOSE. See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public
+# License along with program; see the file COPYING. If not,
+# write to the Free Software Foundation, Inc., 59 Temple Place
+# - Suite 330, Boston, MA 02111-1307, USA.
+#
+# Copyright 2001-2006 Free Software Foundation
+#
+
+
+##########################################################
+#
+# NOTE: Nightly cron scripts on www.gnuenterprise.org
+# run this script with --auto, which uses the
+# defaults passed to getInput. So, each input
+# MUST have a sane default or various web functions
+# might just break.
+#
+
+
+import sys, string, os, glob
+
+# Hack for python 2.1 compatibility. With 2.3 we can use the global __file__
+m = __import__ ('setup-svn', None, None, '*')
+if __name__ == '__main__':
+ sys.exit (0)
+
+# Determine if Windows is used
+WIN=(sys.platform=="win32")
+
+SVNDIR = os.path.abspath(os.path.join(os.path.dirname(m.__file__),'..'))
+BASEDIR = WIN and os.path.join(sys.prefix,"gnue-devel") or
os.path.join(SVNDIR, '.svndevelbase')
+PYTHONBIN=sys.executable
+
+global CURRENT_DIR
+CURRENT_DIR = ""
+CURRENT_TOOL = ""
+rootCommands = []
+
+def createShell (script,py,scriptdir="scripts"):
+ script = "%s%s" % (script, SUFFIX)
+ if py:
+ src = os.path.join(CURRENT_DIR, scriptdir, py)
+ else:
+ src = ''
+ if WIN:
+ dest = os.path.join(BINDIR, "%s.bat" % script)
+ else:
+ dest = os.path.join(CURRENT_DIR, scriptdir, script)
+ if not auto:
+ print "Creating %s....." % dest ,
+ try:
+ file = open(dest,'w')
+ if WIN:
+ # create batch file at final destination
+ file.write("@set PYTHONPATH=%s;%%PYTHONPATH%%\n" % BASEDIR)
+ file.write("@set SCRIPT=%s\n" % src)
+ file.write("@%s \"%%SCRIPT%%\" %%1 %%2 %%3 %%4 %%5 %%6 %%7 %%8 %%9\n" %
PYTHONBIN)
+ file.close()
+ else:
+ # create script in repository and
+ file.write(svnbase % src)
+ file.close()
+ os.system ('chmod 700 %s' % dest)
+
+ rootCommands.append ('rm -f %s/%s' % (BINDIR, script))
+ rootCommands.append ('ln -s %s %s/%s' % \
+ (dest, BINDIR, script))
+ rootCommands.append ('chmod o+x %s' % dest)
+
+ except IOError:
+ print "Unable to create. Do you have this package checked out?"
+ else:
+ if not auto:
+ print "ok"
+
+def createDocs(sgmlfile, destdir):
+ if not willInstallDocs:
+ return
+ sgmlfile = os.path.join(CURRENT_DIR, sgmlfile)
+ destdir = os.path.join(DOCDIR, destdir)
+ rootCommands.append("if [ ! -d %s ]; then mkdir %s; fi" % (destdir, destdir))
+ rootCommands.append("%s --output %s %s" %
+ (DB2HTML, destdir, sgmlfile))
+
+
+def getInput(message, default, responseSet=None):
+
+ if auto:
+ return default
+
+ print ""
+ while 1:
+ if default:
+ print "%s [%s] " % (message, default),
+ else:
+ print "%s " % (message),
+
+
+ val = string.strip(sys.stdin.readline())
+ print ""
+
+ if not len(val) and default:
+ return default
+ elif responseSet and string.upper(val) in (responseSet):
+ return string.upper(val)
+ elif not responseSet:
+ return val
+
+
+_getYesNoAllStat = {}
+
+def getYesNo(message, default, category=None):
+
+ if auto:
+ return default
+
+ if category:
+ try:
+ response = _getYesNoAllStat[category]
+ print "\n" + message + ' ' + (response and 'Always' or 'Never')
+ return response
+ except KeyError:
+ pass
+
+ response = getInput(message,default,('Y','N','A','V'))
+ val = response in ('Y','A')
+ if category and response in ('A','V'):
+ _getYesNoAllStat[category] = val
+ return val
+
+
+def getBinPaths():
+ paths = string.split(os.environ['PATH'],os.pathsep)
+ if not ('/usr/local/bin' in paths or '/usr/local/bin/' in paths) and \
+ os.path.isdir('/usr/local/bin'):
+ paths.append('/usr/local/bin')
+ return(paths)
+
+
+# Returns a list containing all Python executables in the user's path.
+# List element 0 will always be the currently running executable
+def findAllPythonExes():
+ results = [sys.executable]
+
+ for path in getBinPaths():
+ for file in glob.glob('%s/python?*' % os.path.abspath(string.strip(path))):
+ base = os.path.basename(file)
+ version = base[6:]
+
+ # Do not include python 1.x files
+ if version < '2':
+ pass
+
+ # Do not include python2.2-popy-config
+ elif len(version)>8:
+ pass
+
+ # Do not include python??.dll
+ elif base[-3:]=="dll":
+ pass
+
+ elif os.path.realpath(file)==os.path.realpath(sys.executable):
+ # If this file is the one being executed, just replace w/full name
+ if results[0] == sys.executable:
+ results[0] = file
+ else:
+ results.append(file)
+
+ return results
+
+def findAllGNUePackages():
+ results = []
+ for file in glob.glob('../*'):
+ if os.path.isfile(os.path.join(file, 'setup.svn')):
+ base = os.path.basename(file)
+ results.append(base)
+ results.sort()
+ return results
+
+def finddb2html():
+ for path in getBinPaths():
+ for file in glob.glob('%s/db2html' % os.path.abspath(string.strip(path))):
+ return(file)
+
+ # Nothing found
+ return "";
+
+
+def restartWithExecutable(exe):
+ os.system('%s %s --withNewExecutable "%s"' \
+ % (exe, sys.argv[0], string.join(sys.argv[1:],'" "')))
+ sys.exit()
+
+def createLink(file, dest, overwrite=0):
+ if WIN:
+ src=os.path.normpath(os.path.join(CURRENT_DIR, file))
+ dest = os.path.normpath(dest)
+
+ if os.path.isdir(src):
+ ret = os.system("xcopy /S /E /Y \"%s\" \"%s\\\" > NUL" % (src, dest))
+ else:
+ ret = os.system("copy \"%s\" \"%s\" > NUL" % (src, dest))
+ if ret!=0:
+ print "Failed to copy %s to %s." % (src, dest)
+
+ else:
+ if overwrite:
+ rootCommands.append ("if [ -e %s ]; then rm -f %s; fi" % (dest, dest))
+
+ rootCommands.append("ln -f -s %s/%s %s" % (CURRENT_DIR, file, dest))
+
+
+def linkModule(subdir, module):
+ if WIN:
+ if not os.path.exists("%s/%s" % (GNUEDIR,module)):
+ os.makedirs("%s/%s" % (GNUEDIR,module))
+ # create link via virtual python module
+ output = open ("%s/%s/__init__.py" % (GNUEDIR,module), "w")
+ output.write ("# This file was generated by setup-svn.py.\n")
+ output.write ("\n")
+ output.write ("__path__ = [\"%s\\%s\"]\n" % (CURRENT_DIR,subdir))
+ output.write ("from __init__ import *")
+ output.close ()
+ else:
+ rootCommands.append("ln -f -s %s/%s %s/%s" % (CURRENT_DIR, subdir,
GNUEDIR, module))
+
+def createDir(subdir):
+ if WIN:
+ if not os.path.exists(subdir):
+ os.makedirs(subdir)
+ else:
+ rootCommands.append("if [ ! -d %s ]; then mkdir -p %s; fi" %
(subdir,subdir))
+
+
+restarting = ('--withNewExecutable' in sys.argv)
+auto = ('--auto' in sys.argv)
+
+if not restarting and not auto:
+ print """
+GNU Enterprise Developer Setup
+
+This script will install the GNU Enterprise tools to run
+from a SVN copy. This allows GNUe to be run without a
+full installation. THIS IS PRIMARILY USEFUL TO DEVELOPERS.
+ """
+
+# First of all, make sure this is a current enough Python release.
+try:
+ if sys.hexversion < 0x02000000:
+ raise AttributeError
+except AttributeError:
+
+ print "-" * 70
+ print """
+ You are running Python %s.
+
+ GNU Enterprise requires at least Python 2.0 (recommended: 2.1+).
+ If you have a later version installed, you should run setup.py
+ against that version. For example, if you have Python 2.1
+ installed, you may need to run:
+
+ python2.1 %s
+""" % (string.split(sys.version)[0], sys.argv[0])
+ print "-" * 70
+
+ exes = findAllPythonExes()
+
+ if len(exes) == 1:
+ sys.exit()
+ else:
+
+ # There are better versions of Python installed...
+
+ exes.pop(0)
+ print "\n"
+ print "I have found the following Python executables. "
+ print "Choose another version of Python to run."
+ print ""
+
+ validOptions = []
+ i = 0
+
+ for file in exes:
+ i = i + 1 # Do not change this to i += 1 as that's >= py2.x
+ validOptions.append(str(i))
+ print " [%s] %s" % (i, file)
+
+ validOptions.append ('Q')
+ selection = getInput(
+ "Please enter the number of the Python executable to\n"
+ 'use [1-%s] or enter "q" to quit.' % i, '1', validOptions)
+
+ if selection == 'Q':
+ sys.exit()
+
+ restartWithExecutable(exes[int(selection)-1])
+
+if WIN:
+ print """
+Warning:
+Under Windows GNUe data files (like images, settings etc) will NOT be
+updated by an repository update! For a full update please re-execute
+this script.
+
+You are creating a GNU Enterprise developer installation based on a
+code repository. As Microsoft Windows doesn't support filesystem links
+data files has to be copied from the repository to the installation
+directory. Python source files are instead linked by a specific import
+method and will be updated by a repository update.
+"""
+
+if not restarting:
+
+ if not auto:
+ print """
+If you are trying to install GNU Enterprise for production
+use, then answer 'N' to the following question and install
+each tool separately using it's setup.py script.
+ """
+
+ if not getYesNo("Continue installing the SVN-runnable tools? ","Y"):
+ sys.exit()
+
+ exes = findAllPythonExes()
+ PYTHONBIN=exes[0]
+
+
+ # Make sure they are running against the version of python they intended
+ if len(exes) > 1 and not auto:
+
+ print "\n"
+ print "I have found the following Python executables. Please"
+ print "choose the Python installation you would like to use."
+ print ""
+
+ validOptions = []
+ i = 0
+
+ for file in exes:
+ i = i + 1 # Do not change this to i += 1 as that's >= py2.x
+ validOptions.append(str(i))
+ if i == 1:
+ print " [%s] %s (Current)" % (i, file)
+ else:
+ print " [%s] %s" % (i, file)
+
+ validOptions.append ('Q')
+ selection = getInput(
+ "Please enter the number of the Python executable to\n"
+ 'use [1-%s] or enter "q" to quit.' % i, '1', validOptions)
+
+ if selection == 'Q':
+ sys.exit()
+
+ if selection != '1':
+ restartWithExecutable(exes[int(selection)-1])
+
+if not auto:
+ print
+ print "Continuing with the developer installation...\n"
+
+if not auto and not WIN:
+ print """
+This setup script can install GNUe as either a local (per user)
+copy or a system-wide copy. If you are unsure, choose the
+recommended 'Local' setting. Installing system-wide will require
+the root password and may force all users on this machine to use
+your copy."""
+
+ROOTINSTALL = WIN or getInput(
+ "Perform a [L]ocal/per-user or a [S]ystem-wide install?",'L',('L','S')) ==
'S'
+
+# confirm base path
+while WIN:
+ BASEDIR = os.path.abspath(
+ getInput ("Where do you want to install GNU Enterprise?", BASEDIR))
+
+ if os.path.isdir(BASEDIR) or \
+ getYesNo("Directory %s does not exist. Create? (Yes,No,All,neVer)" %
BASEDIR, 'Y','directories'):
+ break
+
+if WIN:
+ BINDIR = os.path.join(BASEDIR,"bin")
+ CONFDIR = os.path.join(BASEDIR,"conf")
+ DOCDIR=os.path.join(BASEDIR,"docs")
+elif ROOTINSTALL:
+ BINDIR = "/usr/local/bin"
+ CONFDIR = "/usr/local/gnue"
+ DOCDIR = "/usr/local/gnue/doc/"
+else:
+ BINDIR = os.path.expanduser("~/bin")
+ CONFDIR = os.path.expanduser("~/gnue")
+ DOCDIR = os.path.expanduser("~/gnue/docs")
+
+
+while 1:
+ BINDIR = os.path.abspath(
+ getInput ("Where shall I put executable files?", BINDIR))
+
+ if os.path.isdir(BINDIR) or \
+ getYesNo("Directory %s does not exist. Create? (Yes,No,All,neVer)" %
BINDIR, 'Y','directories'):
+ break
+
+if not auto:
+ print """
+If you maintain multiple GNUe developer installations, you may
+wish to add a suffix to the script names. For example, if
+are installing the 0.1.x branch as a secondary branch, you
+may want all the executables to be named as <script>-0.1. To
+do this, enter '-0.1' at the next prompt. Normally, you will
+leave the following option blank."""
+
+SUFFIX = string.strip(getInput ("String to append to script names:",""))
+
+while 1:
+ CONFDIR = os.path.abspath(
+ getInput ("Where shall I put configuration files?", CONFDIR))
+
+ if os.path.isdir(CONFDIR) or \
+ getYesNo("Directory %s does not exist. Create? (Yes,No,All,neVer)" %
CONFDIR, 'Y','directories'):
+ break
+
+newdirs = [BINDIR, CONFDIR, "%s/etc" % CONFDIR,
+ "%s/share" % CONFDIR,
+ "%s/share/gnue" % CONFDIR,
+ "%s/share/gnue/filters" % CONFDIR,
+ "%s/share/gnue/appserver" % CONFDIR,
+ "%s/share/gnue/forms" % CONFDIR,
+ "%s/share/gnue/images" % CONFDIR,
+ "%s/share/locale" % CONFDIR ]
+
+willInstallDocs = 0
+
+DB2HTML = finddb2html();
+if DB2HTML:
+ if getYesNo("Generate and install documentation? (This could be slow.)",
'N'):
+ willInstallDocs = 1
+ while 1:
+ DOCDIR = os.path.abspath(
+ getInput ("Where shall I put the documentation files?", DOCDIR))
+
+ if os.path.isdir(DOCDIR) or \
+ getYesNo("Directory %s does not exist. Create? (Yes,No,All,neVer)" %
DOCDIR, 'Y','directories'):
+ newdirs.append(DOCDIR)
+ break
+elif not auto:
+ print "Cannot generate documentation, could not find db2html in path\n";
+
+
+for dir in newdirs:
+ createDir(dir)
+
+GNUEDIR = os.path.join(BASEDIR,'gnue')
+
+
+svnbase = """#!/bin/sh
+ PYTHONPATH=%(BASEDIR)s:$PYTHONPATH; export PYTHONPATH
+ SCRIPT="%%s"
+ exec %(PYTHONBIN)s ${SCRIPT} "$@"
+ """ % globals()
+
+# FIXME: Need to cleanup old files for Win32 install
+if os.path.isdir (GNUEDIR) and not WIN:
+ os.system ('rm -rf %s' % GNUEDIR)
+
+try:
+ os.makedirs(GNUEDIR)
+except:
+ pass
+
+# create path.py
+output = open ("%s/paths.py" % GNUEDIR, "w")
+output.write ("# This file was generated by setup-svn.py.\n")
+output.write ("\n")
+output.write ("lib = \"%s\"\n" % GNUEDIR)
+output.write ("scripts = \"%s\"\n" % BINDIR)
+output.write ("data = \"%s\"\n" % CONFDIR)
+output.write ("config = \"%s/etc\"\n" % CONFDIR)
+output.close ()
+
+if WIN:
+ # create import for gnue-common
+ CURRENT_DIR = os.path.join(SVNDIR,"gnue-common")
+ linkModule("src","common")
+ os.system("copy \"%s\\gnue-common\\module\\base\\__init__.py\" \"%s\"" %
(SVNDIR, GNUEDIR) )
+ # FIXME: add locale support to Win32 developer install
+
+else:
+ rootCommands.append("""
+ cd %(GNUEDIR)s
+ ln -f -s %(SVNDIR)s/gnue-common/module/base/__init__.py .
+ ln -f -s %(SVNDIR)s/gnue-common/src common
+ if [ -f %(SVNDIR)s/gnue-common/src/.GDTD.py ]; then rm -f
%(SVNDIR)s/gnue-common/src/.GDTD.py; fi
+
+ rm -rf %(CONFDIR)s/share/locale/*
+ cd %(CONFDIR)s/share/locale
+ for i in %(SVNDIR)s/*; do
+ package=`basename $i`
+ if [ -d $i/po ]; then
+ (cd $i/po; make -s gmo)
+ for j in $i/po/*.gmo; do
+ language=`basename $j .gmo`
+ mkdir -p %(CONFDIR)s/share/locale/${language}/LC_MESSAGES
+ ln -f -s $j
%(CONFDIR)s/share/locale/${language}/LC_MESSAGES/${package}.mo
+ done
+ fi
+ done
+
+ """ % globals() )
+
+for CURRENT_TOOL in ('gnue-common',
+ 'gnue-designer',
+ 'gnue-dbtools',
+ 'gnue-forms',
+ 'gnue-reports',
+ 'gnue-navigator',
+ 'gnue-pos',
+ 'gnue-integrator',
+ 'gnue-appserver'):
+
+ CURRENT_DIR = os.path.join(SVNDIR, CURRENT_TOOL)
+ setupfile = os.path.join(CURRENT_DIR, 'setup.svn')
+
+ if not auto:
+ print setupfile
+
+ if os.path.isfile(setupfile) and \
+ getYesNo('Setup SVN environment for %s? (Yes,No,All,neVer)'% CURRENT_TOOL,
+ 'Y','autotools'):
+ execfile(setupfile,globals())
+
+
+if getYesNo('Do you have any external/custom packages to setup?','N'):
+ while 1:
+ path = getInput("Path to package's directory containing a setup.svn file?
(blank line to end)",None)
+ if not path:
+ break
+
+ CURRENT_TOOL = CURRENT_DIR = path
+ execfile(os.path.join(CURRENT_DIR,'setup.svn'), globals())
+
+
+
+willCreateConf = 0
+willCreateConn = 0
+willCreateFilt = 0
+
+if os.path.isfile('/usr/local/gnue/etc/gnue.conf') and \
+ CONFDIR != '/usr/local/gnue' and not
os.path.isfile(CONFDIR+'/etc/gnue.conf'):
+ if getYesNo('Do you wish to use the current system-wide gnue.conf file?
(Yes,No,All,neVer)','N','conf'):
+ rootCommands.append("ln -s /usr/local/gnue/etc/gnue.conf
%(CONFDIR)s/etc/gnue.conf" % globals())
+ willCreateConf = 1
+
+
+if os.path.isfile('/usr/local/gnue/etc/connections.conf') and \
+ CONFDIR != '/usr/local/gnue' and not
os.path.isfile(CONFDIR+'/etc/connections.conf'):
+ if getYesNo('Do you wish to use the current system-wide connections.conf
file? (Yes,No,All,neVer)','Y','conf'):
+ rootCommands.append("ln -s /usr/local/gnue/etc/connections.conf
%(CONFDIR)s/etc/connections.conf" % globals())
+ willCreateConn = 1
+
+
+if os.path.isfile('/usr/local/gnue/etc/report-filters.conf') and \
+ CONFDIR != '/usr/local/gnue' and not
os.path.isfile(CONFDIR+'/etc/report-filters.conf'):
+ if getYesNo('Do you wish to use the current system-wide report-filters.conf
file? (Yes,No,All,neVer)','N','conf'):
+ rootCommands.append("ln -s /usr/local/gnue/etc/report-filters.conf
%(CONFDIR)s/etc/report-filters.conf" % globals())
+ willCreateFilt = 1
+
+if not willCreateConf and not os.path.isfile("%s/etc/gnue.conf"%CONFDIR):
+ if not auto:
+ print ""
+ print "You do not currently have a gnue.conf tools configuration file."
+ if getYesNo("Do you want to create a gnue.conf based on the supplied
examples? (Yes,No,All,neVer)",'Y','autoconf'):
+ if not auto and not WIN:
+ print "Since the gnue.conf file format may change from time to time in
SVN,"
+ print "we can create a symlinked gnue.conf file that always mirrors SVN.
This"
+ print "will not allow you to customize gnue.conf, however."
+
+ if WIN or getYesNo ("Do you want to use a symlinked gnue.conf file?",'N',):
+ createLink("%s/gnue-common/etc/sample.gnue.conf" % SVNDIR,
"%s/etc/gnue.conf" % CONFDIR)
+ else:
+ command = "cp %(SVNDIR)s/gnue-common/etc/sample.gnue.conf
%(CONFDIR)s/etc/gnue.conf" % globals()
+ rootCommands.append(command)
+
+
+if not willCreateConn and not
os.path.isfile("%s/etc/connections.conf"%CONFDIR):
+ if not auto:
+ print ""
+ print "You do not currently have a connections.conf configuration file."
+ if getYesNo("Do you want to create a connections.conf based on the supplied
examples? (Yes,No,All,neVer)",'Y','autoconf'):
+ if WIN:
+ createLink("%s/gnue-common/etc/sample.connections.conf" % SVNDIR,
"%s/etc/connections.conf" % CONFDIR)
+ else:
+ rootCommands.append("cp
%(SVNDIR)s/gnue-common/etc/sample.connections.conf
%(CONFDIR)s/etc/connections.conf" % globals())
+
+if not auto:
+ print
+ print "NOTE: Your connections.conf file will need to"
+ print " be edited to reflect your local setup."
+ print
+
+if not willCreateConf and not
os.path.isfile("%s/etc/report-filters.conf"%CONFDIR):
+ if not auto:
+ print ""
+ print "You do not currently have a report-filters.conf configuration file."
+ if getYesNo("Do you want to create a report-filters.conf based on the
supplied examples? (Yes,No,All,neVer)",'Y','autoconf'):
+ if not auto and not WIN:
+ print "Since the report-filters.conf file format may change from time to
time in SVN,"
+ print "we can create a symlinked report-filters.conf file that always
mirrors SVN. This"
+ print "will not allow you to customize report-filters.conf, however."
+ if WIN or getYesNo ("Do you want to use a symlinked report-filters.conf
file? (Yes,No,All,neVer)",'N', 'symconf'):
+ createLink("%s/gnue-reports/etc/sample.report-filters.conf" % SVNDIR,
"%s/etc/report-filters.conf" % CONFDIR)
+ else:
+ command = "cp %(SVNDIR)s/gnue-reports/etc/sample.report-filters.conf
%(CONFDIR)s/etc/report-filters.conf" % globals()
+ rootCommands.append(command)
+
+if WIN:
+ print "Setup completed!"
+
+elif ROOTINSTALL:
+
+ out = open("setup-root.sh",'w')
+ out.write("#!/bin/sh\n")
+ out.write(string.join(rootCommands,"\n"))
+ out.write("\n")
+ out.close()
+
+ print ""
+ print "All the commands that need to be run as root have been written"
+ print "to setup-root.sh . In order for your setup to be complete, this"
+ print "file must be run. This setup script can run setup-root.sh for"
+ print "you. If you choose to run the script now and are not currently"
+ print "logged in as root, you will be prompted for the root password."
+ if getYesNo('Run "/bin/sh setup-root.sh" as root?','Y'):
+ os.system('su root -c "/bin/sh setup-root.sh"')
+ else:
+ print ""
+ print 'Do not forget to run "/bin/sh setup-root.sh" as root'
+ print ""
+
+else:
+
+ out = open("setup.log",'w')
+ out.write(string.join(rootCommands,"\n"))
+ out.write("\n")
+ out.close()
+
+ os.system(string.join(rootCommands,'\n'))
+
+#
+# Save our config settings
+#
+from pprint import pformat
+c = open (os.path.join(SVNDIR,'.svn-config'),'w')
+for key, val in globals().items():
+ if key[0].isupper():
+ c.write('%s=%s\n\n' % (key, pformat(val)))
Deleted: trunk/gnue-common/setup.cvs
===================================================================
--- trunk/gnue-common/setup.cvs 2007-05-24 20:37:13 UTC (rev 9620)
+++ trunk/gnue-common/setup.cvs 2007-05-24 21:10:14 UTC (rev 9621)
@@ -1,37 +0,0 @@
-#
-# This file is part of GNU Enterprise.
-#
-# GNU Enterprise is free software; you can redistribute it
-# and/or modify it under the terms of the GNU General Public
-# License as published by the Free Software Foundation; either
-# version 2, or (at your option) any later version.
-#
-# GNU Enterprise is distributed in the hope that it will be
-# useful, but WITHOUT ANY WARRANTY; without even the implied
-# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-# PURPOSE. See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public
-# License along with program; see the file COPYING. If not,
-# write to the Free Software Foundation, Inc., 59 Temple Place
-# - Suite 330, Boston, MA 02111-1307, USA.
-#
-# Copyright 2001-2004 Free Software Foundation
-#
-# ********************
-# NOTE:
-# This file is parsed/run by gnue-common's setup-cvs.py script.
-# If you are attempting to set up a CVS install environment, please
-# run that file. This file is not a standalone script.
-# ********************
-#
-
-#createShell ('grpcdoc','common/rpc/drivers/_helpers/RpcDoc.py')
-createShell ('gsscvs', 'gnue-schema')
-createShell ('gcvs','')
-#createShell ('gdtdcvs','common/.GDTD.py')
-#createShell ('gtestcvs','common/GTest.py')
-
-createLink ('images/*.*', '%s/share/gnue/images/' % CONFDIR)
-createLink ('etc/sample.gnue.conf', '%s/etc/sample.gnue.conf' % CONFDIR)
-createLink ('etc/sample.connections.conf', '%s/etc/sample.connections.conf' %
CONFDIR)
Copied: trunk/gnue-common/setup.svn (from rev 9619, trunk/gnue-common/setup.cvs)
===================================================================
--- trunk/gnue-common/setup.cvs 2007-05-24 18:04:57 UTC (rev 9619)
+++ trunk/gnue-common/setup.svn 2007-05-24 21:10:14 UTC (rev 9621)
@@ -0,0 +1,34 @@
+#
+# This file is part of GNU Enterprise.
+#
+# GNU Enterprise is free software; you can redistribute it
+# and/or modify it under the terms of the GNU General Public
+# License as published by the Free Software Foundation; either
+# version 2, or (at your option) any later version.
+#
+# GNU Enterprise is distributed in the hope that it will be
+# useful, but WITHOUT ANY WARRANTY; without even the implied
+# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+# PURPOSE. See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public
+# License along with program; see the file COPYING. If not,
+# write to the Free Software Foundation, Inc., 59 Temple Place
+# - Suite 330, Boston, MA 02111-1307, USA.
+#
+# Copyright 2001-2004 Free Software Foundation
+#
+# ********************
+# NOTE:
+# This file is parsed/run by gnue-common's setup-svn.py script.
+# If you are attempting to set up a CVS install environment, please
+# run that file. This file is not a standalone script.
+# ********************
+#
+
+createShell ('gsscvs', 'gnue-schema')
+createShell ('gcvs','')
+
+createLink ('images/*.*', '%s/share/gnue/images/' % CONFDIR)
+createLink ('etc/sample.gnue.conf', '%s/etc/sample.gnue.conf' % CONFDIR)
+createLink ('etc/sample.connections.conf', '%s/etc/sample.connections.conf' %
CONFDIR)
Modified: trunk/gnue-common/utils/setup-win4lin-stage.sh
===================================================================
--- trunk/gnue-common/utils/setup-win4lin-stage.sh 2007-05-24 20:37:13 UTC
(rev 9620)
+++ trunk/gnue-common/utils/setup-win4lin-stage.sh 2007-05-24 21:10:14 UTC
(rev 9621)
@@ -1,8 +1,8 @@
#!/bin/sh
# Unix filesystem settings
-CVSSOURCE=~/cvs/gnue
-PYSOURCE=~/cvs/gnue/.cvsdevelbase
+CVSSOURCE=~/svn/gnue
+PYSOURCE=~/svn/gnue/.svndevelbase
CONFSOURCE=~/gnue
DEST=~/h
STAGEDIR=stage
@@ -15,15 +15,15 @@
# Convenience functions... do not change
STAGE=${DEST}/${STAGEDIR}
-date > setup-cvs.log
+date > setup-svn.log
WINSTAGE=${WINBASE}\\${STAGEDIR}
-mkdir $DEST/bin >> setup-cvs.log 2>&1
-mkdir $DEST/cvs >> setup-cvs.log 2>&1
+mkdir $DEST/bin >> setup-svn.log 2>&1
+mkdir $DEST/svn >> setup-svn.log 2>&1
-rm -rf $DEST/cvs/gnue
-ln -s $CVSSOURCE $DEST/cvs/gnue
+rm -rf $DEST/svn/gnue
+ln -s $CVSSOURCE $DEST/svn/gnue
echo
@@ -31,15 +31,15 @@
rm -rf $STAGE
mkdir $STAGE
cd $STAGE
-mkdir `(cd $PYSOURCE; find . -xtype d)` >> setup-cvs.log 2>&1
-mkdir `(cd $PYSOURCE; find . -xtype d -follow)` >> setup-cvs.log 2>&1
+mkdir `(cd $PYSOURCE; find . -xtype d)` >> setup-svn.log 2>&1
+mkdir `(cd $PYSOURCE; find . -xtype d -follow)` >> setup-svn.log 2>&1
for f in `(cd $PYSOURCE; find . -name '*.py' -follow)`
do
ln -s $PYSOURCE/$f $f
done
-mkdir $DEST/gnue >> setup-cvs.log 2>&1
-mkdir $DEST/gnue/etc >> setup-cvs.log 2>&1
+mkdir $DEST/gnue >> setup-svn.log 2>&1
+mkdir $DEST/gnue/etc >> setup-svn.log 2>&1
rm -f $DEST/gnue/etc/*.conf
rm -rf $DEST/gnue/shared
ln -s $CONFSOURCE/etc/*.conf $DEST/gnue/etc/
Modified: trunk/gnue-common/utils/win-links.txt
===================================================================
--- trunk/gnue-common/utils/win-links.txt 2007-05-24 20:37:13 UTC (rev
9620)
+++ trunk/gnue-common/utils/win-links.txt 2007-05-24 21:10:14 UTC (rev
9621)
@@ -1,7 +1,7 @@
fsutil.exe - file link creation tool.
linkd.exe - folder link creation tool.
-These files are required to run setup-cvs2.py under Windows.
+These files are required to run setup-svn.py under Windows.
They should be placed in this folder.
Both files are available from Microsoft web site.
Deleted: trunk/gnue-designer/README.cvs
===================================================================
--- trunk/gnue-designer/README.cvs 2007-05-24 20:37:13 UTC (rev 9620)
+++ trunk/gnue-designer/README.cvs 2007-05-24 21:10:14 UTC (rev 9621)
@@ -1,21 +0,0 @@
-Developer Installation Instructions
-===================================
-
-If you have downloaded gnue-designer from the subversion repository (which you
-most probably have, because you wouldn't see this file otherwise), you can
-install and configure everything like described in the file "INSTALL".
-
-However, GNU Enterprise supports parallel use of an "installed" version and one
-or several "development" versions by providing a "developer install" script
-that uses different names for the programs.
-
-After downloading all the tools you want to have from the subversion
-repository, you just to run ./setup-cvs.py in the gnue-common directory.
-
-With the developer installation, you have to substitute the commands of the
-gnue-designer package as follows:
-
-gnue-designer -> gdes
-
-Also, you will all relevant files and directories in ~/gnue instead of
-/usr/local/gnue.
Copied: trunk/gnue-designer/README.svn (from rev 9619,
trunk/gnue-designer/README.cvs)
===================================================================
--- trunk/gnue-designer/README.cvs 2007-05-24 18:04:57 UTC (rev 9619)
+++ trunk/gnue-designer/README.svn 2007-05-24 21:10:14 UTC (rev 9621)
@@ -0,0 +1,21 @@
+Developer Installation Instructions
+===================================
+
+If you have downloaded gnue-designer from the subversion repository (which you
+most probably have, because you wouldn't see this file otherwise), you can
+install and configure everything like described in the file "INSTALL".
+
+However, GNU Enterprise supports parallel use of an "installed" version and one
+or several "development" versions by providing a "developer install" script
+that uses different names for the programs.
+
+After downloading all the tools you want to have from the subversion
+repository, you just to run ./setup-svn.py in the gnue-common directory.
+
+With the developer installation, you have to substitute the commands of the
+gnue-designer package as follows:
+
+gnue-designer -> gdes
+
+Also, you will find all relevant files and directories in ~/gnue instead of
+/usr/local/gnue.
Deleted: trunk/gnue-designer/setup.cvs
===================================================================
--- trunk/gnue-designer/setup.cvs 2007-05-24 20:37:13 UTC (rev 9620)
+++ trunk/gnue-designer/setup.cvs 2007-05-24 21:10:14 UTC (rev 9621)
@@ -1,34 +0,0 @@
-#
-# This file is part of GNU Enterprise.
-#
-# GNU Enterprise is free software; you can redistribute it
-# and/or modify it under the terms of the GNU General Public
-# License as published by the Free Software Foundation; either
-# version 2, or (at your option) any later version.
-#
-# GNU Enterprise is distributed in the hope that it will be
-# useful, but WITHOUT ANY WARRANTY; without even the implied
-# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-# PURPOSE. See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public
-# License along with program; see the file COPYING. If not,
-# write to the Free Software Foundation, Inc., 59 Temple Place
-# - Suite 330, Boston, MA 02111-1307, USA.
-#
-# Copyright 2001-2006 Free Software Foundation
-#
-# ********************
-# NOTE:
-# This file is parsed/run by gnue-common's setup-cvs.py script.
-# If you are attempting to set up a CVS install environment, please
-# run that file. This file is not a standalone script.
-# ********************
-#
-
-linkModule ('src/', 'designer')
-
-createShell ('gfdes', 'gnue-designer')
-createShell ('gdes', 'gnue-designer')
-
-createLink ('images', '%s/share/gnue/images/designer' % CONFDIR, overwrite=1)
Copied: trunk/gnue-designer/setup.svn (from rev 9619,
trunk/gnue-designer/setup.cvs)
===================================================================
--- trunk/gnue-designer/setup.cvs 2007-05-24 18:04:57 UTC (rev 9619)
+++ trunk/gnue-designer/setup.svn 2007-05-24 21:10:14 UTC (rev 9621)
@@ -0,0 +1,34 @@
+#
+# This file is part of GNU Enterprise.
+#
+# GNU Enterprise is free software; you can redistribute it
+# and/or modify it under the terms of the GNU General Public
+# License as published by the Free Software Foundation; either
+# version 2, or (at your option) any later version.
+#
+# GNU Enterprise is distributed in the hope that it will be
+# useful, but WITHOUT ANY WARRANTY; without even the implied
+# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+# PURPOSE. See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public
+# License along with program; see the file COPYING. If not,
+# write to the Free Software Foundation, Inc., 59 Temple Place
+# - Suite 330, Boston, MA 02111-1307, USA.
+#
+# Copyright 2001-2006 Free Software Foundation
+#
+# ********************
+# NOTE:
+# This file is parsed/run by gnue-common's setup-svn.py script.
+# If you are attempting to set up a CVS install environment, please
+# run that file. This file is not a standalone script.
+# ********************
+#
+
+linkModule ('src/', 'designer')
+
+createShell ('gfdes', 'gnue-designer')
+createShell ('gdes', 'gnue-designer')
+
+createLink ('images', '%s/share/gnue/images/designer' % CONFDIR, overwrite=1)
Modified: trunk/gnue-forms/FAQ
===================================================================
--- trunk/gnue-forms/FAQ 2007-05-24 20:37:13 UTC (rev 9620)
+++ trunk/gnue-forms/FAQ 2007-05-24 21:10:14 UTC (rev 9621)
@@ -1,12 +1,12 @@
Installation
------------
- Q: I want to run the cvs copy of gnue-forms, but have a copy already
+ Q: I want to run the svn copy of gnue-forms, but have a copy already
installed on the machine. gnue-forms always seems run the installed
- code base. How do I run the cvs copy without affecting the installed
+ code base. How do I run the svn copy without affecting the installed
copy?
- A: Run setup-cvs.py from the gnue-common/ directory. This creates
+ A: Run setup-svn.py from the gnue-common/ directory. This creates
symlinks in the client directory to trick gnue-forms into using the CVS
version of GNUE Forms. You must then run gnue-forms from the client
directory for this to work. Executing gnue-forms any where else still
Deleted: trunk/gnue-forms/README.cvs
===================================================================
--- trunk/gnue-forms/README.cvs 2007-05-24 20:37:13 UTC (rev 9620)
+++ trunk/gnue-forms/README.cvs 2007-05-24 21:10:14 UTC (rev 9621)
@@ -1,21 +0,0 @@
-Developer Installation Instructions
-===================================
-
-If you have downloaded gnue-forms from the subversion repository (which you
-most probably have, because you wouldn't see this file otherwise), you can
-install and configure everything like described in the file "INSTALL".
-
-However, GNU Enterprise supports parallel use of an "installed" version and one
-or several "development" versions by providing a "developer install" script
-that uses different names for the programs.
-
-After downloading all the tools you want to have from the subversion
-repository, you just to run ./setup-cvs.py in the gnue-common directory.
-
-With the developer installation, you have to substitute the commands of the
-gnue-forms package as follows:
-
-gnue-forms -> gfcvs
-
-Also, you will all relevant files and directories in ~/gnue instead of
-/usr/local/gnue.
Copied: trunk/gnue-forms/README.svn (from rev 9619, trunk/gnue-forms/README.cvs)
===================================================================
--- trunk/gnue-forms/README.cvs 2007-05-24 18:04:57 UTC (rev 9619)
+++ trunk/gnue-forms/README.svn 2007-05-24 21:10:14 UTC (rev 9621)
@@ -0,0 +1,21 @@
+Developer Installation Instructions
+===================================
+
+If you have downloaded gnue-forms from the subversion repository (which you
+most probably have, because you wouldn't see this file otherwise), you can
+install and configure everything like described in the file "INSTALL".
+
+However, GNU Enterprise supports parallel use of an "installed" version and one
+or several "development" versions by providing a "developer install" script
+that uses different names for the programs.
+
+After downloading all the tools you want to have from the subversion
+repository, you just to run ./setup-svn.py in the gnue-common directory.
+
+With the developer installation, you have to substitute the commands of the
+gnue-forms package as follows:
+
+gnue-forms -> gfcvs
+
+Also, you will find all relevant files and directories in ~/gnue instead of
+/usr/local/gnue.
Deleted: trunk/gnue-forms/setup.cvs
===================================================================
--- trunk/gnue-forms/setup.cvs 2007-05-24 20:37:13 UTC (rev 9620)
+++ trunk/gnue-forms/setup.cvs 2007-05-24 21:10:14 UTC (rev 9621)
@@ -1,37 +0,0 @@
-#
-# This file is part of GNU Enterprise.
-#
-# GNU Enterprise is free software; you can redistribute it
-# and/or modify it under the terms of the GNU General Public
-# License as published by the Free Software Foundation; either
-# version 2, or (at your option) any later version.
-#
-# GNU Enterprise is distributed in the hope that it will be
-# useful, but WITHOUT ANY WARRANTY; without even the implied
-# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-# PURPOSE. See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public
-# License along with program; see the file COPYING. If not,
-# write to the Free Software Foundation, Inc., 59 Temple Place
-# - Suite 330, Boston, MA 02111-1307, USA.
-#
-# Copyright 2001-2003 Free Software Foundation
-#
-# ********************
-# NOTE:
-# This file is parsed/run by gnue-common's setup-cvs.py script.
-# If you are attempting to set up a CVS install environment, please
-# run that file. This file is not a standalone script.
-# ********************
-#
-
-linkModule ('src/', 'forms')
-
-createShell ('gfcvs', 'gnue-forms')
-
-createLink ('images', '%s/share/gnue/images/forms' % CONFDIR, overwrite=1)
-
-createDir('%s/share/gnue/forms' % CONFDIR)
-
-createLink ('defaults', '%s/share/gnue/forms/defaults' % CONFDIR, overwrite=1)
Copied: trunk/gnue-forms/setup.svn (from rev 9619, trunk/gnue-forms/setup.cvs)
===================================================================
--- trunk/gnue-forms/setup.cvs 2007-05-24 18:04:57 UTC (rev 9619)
+++ trunk/gnue-forms/setup.svn 2007-05-24 21:10:14 UTC (rev 9621)
@@ -0,0 +1,37 @@
+#
+# This file is part of GNU Enterprise.
+#
+# GNU Enterprise is free software; you can redistribute it
+# and/or modify it under the terms of the GNU General Public
+# License as published by the Free Software Foundation; either
+# version 2, or (at your option) any later version.
+#
+# GNU Enterprise is distributed in the hope that it will be
+# useful, but WITHOUT ANY WARRANTY; without even the implied
+# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+# PURPOSE. See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public
+# License along with program; see the file COPYING. If not,
+# write to the Free Software Foundation, Inc., 59 Temple Place
+# - Suite 330, Boston, MA 02111-1307, USA.
+#
+# Copyright 2001-2003 Free Software Foundation
+#
+# ********************
+# NOTE:
+# This file is parsed/run by gnue-common's setup-svn.py script.
+# If you are attempting to set up a CVS install environment, please
+# run that file. This file is not a standalone script.
+# ********************
+#
+
+linkModule ('src/', 'forms')
+
+createShell ('gfcvs', 'gnue-forms')
+
+createLink ('images', '%s/share/gnue/images/forms' % CONFDIR, overwrite=1)
+
+createDir('%s/share/gnue/forms' % CONFDIR)
+
+createLink ('defaults', '%s/share/gnue/forms/defaults' % CONFDIR, overwrite=1)
Deleted: trunk/gnue-navigator/README.cvs
===================================================================
--- trunk/gnue-navigator/README.cvs 2007-05-24 20:37:13 UTC (rev 9620)
+++ trunk/gnue-navigator/README.cvs 2007-05-24 21:10:14 UTC (rev 9621)
@@ -1,21 +0,0 @@
-Developer Installation Instructions
-===================================
-
-If you have downloaded gnue-navigator from the subversion repository (which you
-most probably have, because you wouldn't see this file otherwise), you can
-install and configure everything like described in the file "INSTALL".
-
-However, GNU Enterprise supports parallel use of an "installed" version and one
-or several "development" versions by providing a "developer install" script
-that uses different names for the programs.
-
-After downloading all the tools you want to have from the subversion
-repository, you just to run ./setup-cvs.py in the gnue-common directory.
-
-With the developer installation, you have to substitute the commands of the
-gnue-navigator package as follows:
-
-gnue-navigator -> gncvs
-
-Also, you will all relevant files and directories in ~/gnue instead of
-/usr/local/gnue.
Copied: trunk/gnue-navigator/README.svn (from rev 9619,
trunk/gnue-navigator/README.cvs)
===================================================================
--- trunk/gnue-navigator/README.cvs 2007-05-24 18:04:57 UTC (rev 9619)
+++ trunk/gnue-navigator/README.svn 2007-05-24 21:10:14 UTC (rev 9621)
@@ -0,0 +1,21 @@
+Developer Installation Instructions
+===================================
+
+If you have downloaded gnue-navigator from the subversion repository (which you
+most probably have, because you wouldn't see this file otherwise), you can
+install and configure everything like described in the file "INSTALL".
+
+However, GNU Enterprise supports parallel use of an "installed" version and one
+or several "development" versions by providing a "developer install" script
+that uses different names for the programs.
+
+After downloading all the tools you want to have from the subversion
+repository, you just to run ./setup-svn.py in the gnue-common directory.
+
+With the developer installation, you have to substitute the commands of the
+gnue-navigator package as follows:
+
+gnue-navigator -> gncvs
+
+Also, you will find all relevant files and directories in ~/gnue instead of
+/usr/local/gnue.
Deleted: trunk/gnue-navigator/setup.cvs
===================================================================
--- trunk/gnue-navigator/setup.cvs 2007-05-24 20:37:13 UTC (rev 9620)
+++ trunk/gnue-navigator/setup.cvs 2007-05-24 21:10:14 UTC (rev 9621)
@@ -1,30 +0,0 @@
-#
-# This file is part of GNU Enterprise.
-#
-# GNU Enterprise is free software; you can redistribute it
-# and/or modify it under the terms of the GNU General Public
-# License as published by the Free Software Foundation; either
-# version 2, or (at your option) any later version.
-#
-# GNU Enterprise is distributed in the hope that it will be
-# useful, but WITHOUT ANY WARRANTY; without even the implied
-# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-# PURPOSE. See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public
-# License along with program; see the file COPYING. If not,
-# write to the Free Software Foundation, Inc., 59 Temple Place
-# - Suite 330, Boston, MA 02111-1307, USA.
-#
-# Copyright 2001-2003 Free Software Foundation
-#
-# ********************
-# NOTE:
-# This file is parsed/run by gnue-common's setup-cvs.py script.
-# If you are attempting to set up a CVS install environment, please
-# run that file. This file is not a standalone script.
-# ********************
-#
-
-linkModule ('src/', 'navigator')
-createShell ('gncvs', 'gnue-navigator')
Copied: trunk/gnue-navigator/setup.svn (from rev 9619,
trunk/gnue-navigator/setup.cvs)
===================================================================
--- trunk/gnue-navigator/setup.cvs 2007-05-24 18:04:57 UTC (rev 9619)
+++ trunk/gnue-navigator/setup.svn 2007-05-24 21:10:14 UTC (rev 9621)
@@ -0,0 +1,30 @@
+#
+# This file is part of GNU Enterprise.
+#
+# GNU Enterprise is free software; you can redistribute it
+# and/or modify it under the terms of the GNU General Public
+# License as published by the Free Software Foundation; either
+# version 2, or (at your option) any later version.
+#
+# GNU Enterprise is distributed in the hope that it will be
+# useful, but WITHOUT ANY WARRANTY; without even the implied
+# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+# PURPOSE. See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public
+# License along with program; see the file COPYING. If not,
+# write to the Free Software Foundation, Inc., 59 Temple Place
+# - Suite 330, Boston, MA 02111-1307, USA.
+#
+# Copyright 2001-2003 Free Software Foundation
+#
+# ********************
+# NOTE:
+# This file is parsed/run by gnue-common's setup-svn.py script.
+# If you are attempting to set up a CVS install environment, please
+# run that file. This file is not a standalone script.
+# ********************
+#
+
+linkModule ('src/', 'navigator')
+createShell ('gncvs', 'gnue-navigator')
Deleted: trunk/gnue-reports/README.cvs
===================================================================
--- trunk/gnue-reports/README.cvs 2007-05-24 20:37:13 UTC (rev 9620)
+++ trunk/gnue-reports/README.cvs 2007-05-24 21:10:14 UTC (rev 9621)
@@ -1,23 +0,0 @@
-Developer Installation Instructions
-===================================
-
-If you have downloaded gnue-reports from the subversion repository (which you
-most probably have, because you wouldn't see this file otherwise), you can
-install and configure everything like described in the files INSTALL.
-
-However, GNU Enterprise supports parallel use of an "installed" version and one
-or several "development" versions by providing a "developer install" script
-that uses different names for the programs.
-
-After downloading all the tools you want to have from the subversion
-repository, you just to run ./setup-cvs.py in the gnue-common directory.
-
-With the developer installation, you have to substitute the commands of the
-gnue-reports package as follows:
-
-gnue-reports -> grcvs
-gnue-reports-server -> grdcvs
-gnue-reports-filter -> grfcvs
-
-Also, you will all relevant files and directories in ~/gnue instead of
-/usr/local/gnue.
Copied: trunk/gnue-reports/README.svn (from rev 9620,
trunk/gnue-reports/README.cvs)
===================================================================
--- trunk/gnue-reports/README.cvs 2007-05-24 20:37:13 UTC (rev 9620)
+++ trunk/gnue-reports/README.svn 2007-05-24 21:10:14 UTC (rev 9621)
@@ -0,0 +1,23 @@
+Developer Installation Instructions
+===================================
+
+If you have downloaded gnue-reports from the subversion repository (which you
+most probably have, because you wouldn't see this file otherwise), you can
+install and configure everything like described in the files INSTALL.
+
+However, GNU Enterprise supports parallel use of an "installed" version and one
+or several "development" versions by providing a "developer install" script
+that uses different names for the programs.
+
+After downloading all the tools you want to have from the subversion
+repository, you just to run ./setup-svn.py in the gnue-common directory.
+
+With the developer installation, you have to substitute the commands of the
+gnue-reports package as follows:
+
+gnue-reports -> grcvs
+gnue-reports-server -> grdcvs
+gnue-reports-filter -> grfcvs
+
+Also, you will find all relevant files and directories in ~/gnue instead of
+/usr/local/gnue.
Deleted: trunk/gnue-reports/setup.cvs
===================================================================
--- trunk/gnue-reports/setup.cvs 2007-05-24 20:37:13 UTC (rev 9620)
+++ trunk/gnue-reports/setup.cvs 2007-05-24 21:10:14 UTC (rev 9621)
@@ -1,38 +0,0 @@
-#
-# This file is part of GNU Enterprise.
-#
-# GNU Enterprise is free software; you can redistribute it
-# and/or modify it under the terms of the GNU General Public
-# License as published by the Free Software Foundation; either
-# version 2, or (at your option) any later version.
-#
-# GNU Enterprise is distributed in the hope that it will be
-# useful, but WITHOUT ANY WARRANTY; without even the implied
-# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-# PURPOSE. See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public
-# License along with program; see the file COPYING. If not,
-# write to the Free Software Foundation, Inc., 59 Temple Place
-# - Suite 330, Boston, MA 02111-1307, USA.
-#
-# Copyright 2001-2004 Free Software Foundation
-#
-# ********************
-# NOTE:
-# This file is parsed/run by gnue-common's setup-cvs.py script.
-# If you are attempting to set up a CVS install environment, please
-# run that file. This file is not a standalone script.
-# ********************
-#
-
-linkModule ('src/', 'reports')
-
-createShell ('grcvs', 'gnue-reports')
-createShell ('grdcvs', 'gnue-reports-server')
-createShell ('grfcvs', 'gnue-reports-filter')
-
-createLink ('src/adapters/filters/Labels/etc', '%s/share/gnue/filters/Labels'
% CONFDIR, overwrite=1)
-createLink ('src/adapters/filters/SimpleTabulation/etc',
'%s/share/gnue/filters/SimpleTabulation' % CONFDIR, overwrite=1)
-createLink ('src/adapters/filters/Char/etc/printdef',
'%s/share/gnue/filters/Char' % CONFDIR, overwrite=1)
-createLink ('etc/sample.report-filters.conf',
'%s/etc/sample.report-filters.conf' % CONFDIR, overwrite=1)
Copied: trunk/gnue-reports/setup.svn (from rev 9619,
trunk/gnue-reports/setup.cvs)
===================================================================
--- trunk/gnue-reports/setup.cvs 2007-05-24 18:04:57 UTC (rev 9619)
+++ trunk/gnue-reports/setup.svn 2007-05-24 21:10:14 UTC (rev 9621)
@@ -0,0 +1,38 @@
+#
+# This file is part of GNU Enterprise.
+#
+# GNU Enterprise is free software; you can redistribute it
+# and/or modify it under the terms of the GNU General Public
+# License as published by the Free Software Foundation; either
+# version 2, or (at your option) any later version.
+#
+# GNU Enterprise is distributed in the hope that it will be
+# useful, but WITHOUT ANY WARRANTY; without even the implied
+# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+# PURPOSE. See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public
+# License along with program; see the file COPYING. If not,
+# write to the Free Software Foundation, Inc., 59 Temple Place
+# - Suite 330, Boston, MA 02111-1307, USA.
+#
+# Copyright 2001-2004 Free Software Foundation
+#
+# ********************
+# NOTE:
+# This file is parsed/run by gnue-common's setup-svn.py script.
+# If you are attempting to set up a CVS install environment, please
+# run that file. This file is not a standalone script.
+# ********************
+#
+
+linkModule ('src/', 'reports')
+
+createShell ('grcvs', 'gnue-reports')
+createShell ('grdcvs', 'gnue-reports-server')
+createShell ('grfcvs', 'gnue-reports-filter')
+
+createLink ('src/adapters/filters/Labels/etc', '%s/share/gnue/filters/Labels'
% CONFDIR, overwrite=1)
+createLink ('src/adapters/filters/SimpleTabulation/etc',
'%s/share/gnue/filters/SimpleTabulation' % CONFDIR, overwrite=1)
+createLink ('src/adapters/filters/Char/etc/printdef',
'%s/share/gnue/filters/Char' % CONFDIR, overwrite=1)
+createLink ('etc/sample.report-filters.conf',
'%s/etc/sample.report-filters.conf' % CONFDIR, overwrite=1)
Modified: trunk/www/utils/sbin/update-tasks
===================================================================
--- trunk/www/utils/sbin/update-tasks 2007-05-24 20:37:13 UTC (rev 9620)
+++ trunk/www/utils/sbin/update-tasks 2007-05-24 21:10:14 UTC (rev 9621)
@@ -81,12 +81,12 @@
($SVNUPDATE || (echo " (*) Running SVN Cleanup"; $SVNCLEANUP && $SVNUPDATE)
) || (echo " (*) Unable to svn update.")
fi
#
-# Run setup-cvs.py to get a working install in /usr/local/gnue-sandbox/
+# Run setup-svn.py to get a working install in /usr/local/gnue-sandbox/
#
rm -rf ${BASE}/gnue ${BASE}/bin/*
echo "Running setup.py..."
cd ${CHECKOUT}/gnue-common
-HOME=${BASE} ./setup-cvs.py --auto 2>&1 | sed 's/^/ (*) /g'
+HOME=${BASE} ./setup-svn.py --auto 2>&1 | sed 's/^/ (*) /g'
# Update the website based on gnue/www/
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [gnue] r9621 - in trunk: . gnue-appserver gnue-appserver/doc gnue-appserver/samples gnue-common gnue-common/utils gnue-designer gnue-forms gnue-navigator gnue-reports www/utils/sbin,
reinhard <=