Author: dmeyer
Date: Mon Oct 17 20:22:12 2005
New Revision: 7732
Modified:
trunk/freevo/freevo
trunk/freevo/src/helpers/main.py
trunk/freevo/src/util/__init__.py
Log:
Remove the feature that freevo can be started from its dir. Because
of the dependecy to freevo-core, it has to be installed somewhere.
Modified: trunk/freevo/freevo
==============================================================================
--- trunk/freevo/freevo (original)
+++ trunk/freevo/freevo Mon Oct 17 20:22:12 2005
@@ -331,77 +331,33 @@
if os.path.islink(freevo_script):
freevo_script = os.readlink(freevo_script)
-if os.path.isdir(os.path.join(os.path.dirname(freevo_script), 'src/plugins')):
- #
- # we start freevo from a directory
- #
- dname = os.path.dirname(freevo_script)
- freevo_python = os.path.join(dname, 'site-packages/freevo')
- freevo_helpers = os.path.join(dname, 'site-packages/freevo/helpers')
- freevo_locale = os.path.join(dname, 'i18n')
- freevo_share = os.path.join(dname, 'share')
- freevo_doc = os.path.join(dname, 'Docs')
- freevo_config = os.path.join(dname, 'freevo_config.py')
-
- # extend PYTHONPATH to internal site-packages
- if os.environ.has_key('PYTHONPATH'):
- os.environ['PYTHONPATH'] = '%s/site-packages:%s' % (dname,
os.environ['PYTHONPATH'])
- else:
- os.environ['PYTHONPATH'] = '%s/site-packages' % dname
-
- if os.path.isfile(os.path.join(dname, 'runtime/runapp')):
- #
- # there is a runtime, use it
- #
- runapp = os.path.join(dname, './runtime/runapp')
- python = [ runapp, os.path.join(dname, './runtime/apps/freevo_python')
]
- preload = ''
- f = open(os.path.join(dname, './runtime/preloads'))
- for lib in f.readline()[:-1].split(' '):
- preload += os.path.join(dname, lib) + ':'
- if preload:
- preload = preload[:-1]
- os.environ['FREEVO_PRELOADS'] = preload
- # FIXME: use FREEVO_PRELOADS in runapp to avoid chdirs
-
- else:
- #
- # no runtime, get best python version
- #
- python = get_python(0)
- if not python:
- print 'can\'t find python >= 2.2'
- sys.exit(0)
- python = [ python ]
- runapp = ''
-else:
- #
- # installed version of freevo, get best python + freevo path
- #
- if not os.path.isfile(freevo_script):
- for path in os.environ['PATH'].split(':'):
- if os.path.isfile(os.path.join(path, freevo_script)):
- freevo_script = os.path.join(path, freevo_script)
- import freevo.version
- python, freevo_python = get_python(1)
- if not python:
- print 'can\'t find python version with installed freevo'
- sys.exit(0)
- freevo_helpers = os.path.join(freevo_python, 'helpers')
- dname = os.path.abspath(os.path.join(os.path.dirname(freevo_script),
'../'))
- freevo_locale = os.path.join(dname, 'share/locale')
- freevo_share = os.path.join(dname, 'share/freevo')
- freevo_doc = os.path.join(dname, 'share/doc/freevo-%s' %
freevo.version.__version__)
- freevo_config = os.path.join(freevo_share, 'freevo_config.py')
- runapp = ''
- python = [ python ]
-
+if not os.path.isfile(freevo_script):
+ for path in os.environ['PATH'].split(':'):
+ if os.path.isfile(os.path.join(path, freevo_script)):
+ freevo_script = os.path.join(path, freevo_script)
+import freevo.version
+python, freevo_python = get_python(1)
+if not python:
+ print 'can\'t find python version with installed freevo'
+ sys.exit(0)
+freevo_helpers = os.path.join(freevo_python, 'helpers')
+dname = os.path.abspath(os.path.join(os.path.dirname(freevo_script), '../'))
+freevo_locale = os.path.join(dname, 'share/locale')
+freevo_share = os.path.join(dname, 'share/freevo')
+freevo_doc = os.path.join(dname, 'share/doc/freevo-%s' %
freevo.version.__version__)
+freevo_config = os.path.join(freevo_share, 'freevo_config.py')
+runapp = ''
+python = [ python ]
+
+__site__ = '../lib/python%s.%s/site-packages' % sys.version_info[:2]
+__site__ = os.path.normpath(os.path.join(os.path.dirname(__file__), __site__))
+__site__ = '%s:%s' % (freevo_python, __site__)
# extend PYTHONPATH to freevo
if os.environ.has_key('PYTHONPATH'):
- os.environ['PYTHONPATH'] = '%s:%s' % (freevo_python,
os.environ['PYTHONPATH'])
+ os.environ['PYTHONPATH'] = '%s:%s' % (__site__, os.environ['PYTHONPATH'])
else:
- os.environ['PYTHONPATH'] = freevo_python
+ os.environ['PYTHONPATH'] = __site__
# add the variables from above into environ so Freevo can use them, too
Modified: trunk/freevo/src/helpers/main.py
==============================================================================
--- trunk/freevo/src/helpers/main.py (original)
+++ trunk/freevo/src/helpers/main.py Mon Oct 17 20:22:12 2005
@@ -58,12 +58,8 @@
print 'cvs -d:pserver:[EMAIL PROTECTED]:/cvsroot/freevo login'
print 'cvs -z3 -d:pserver:[EMAIL PROTECTED]:/cvsroot/freevo co -P kaa'
print
- print 'Please install it as root into your system or into the Freevo'
- print 'site-packages directory by running setup in the kaa root directory:'
- print 'python setup.py install --install-lib=%s \\' % d
- print ' --install-scripts=%s/bin' % d
- print 'When using the command above, you need to reinstall kaa every time'
- print 'you run \'make clean\' in the freevo directory.'
+ print 'Please install it as root into your system or into the same'
+ print 'directory you installed Freevo in'
print
print 'Kaa is under development right now. Make sure you update the kaa'
print 'directory every time you update freevo cvs.'
Modified: trunk/freevo/src/util/__init__.py
==============================================================================
--- trunk/freevo/src/util/__init__.py (original)
+++ trunk/freevo/src/util/__init__.py Mon Oct 17 20:22:12 2005
@@ -28,13 +28,15 @@
#
# -----------------------------------------------------------------------------
+import sys
-import __builtin__
-import vfs
-__builtin__.__dict__['vfs'] = vfs
-
-from misc import *
-from fileops import *
-import objectcache
-import fxdparser
-import cache
+if sys.argv[0] != 'setup.py':
+ import __builtin__
+ import vfs
+ __builtin__.__dict__['vfs'] = vfs
+
+ from misc import *
+ from fileops import *
+ import objectcache
+ import fxdparser
+ import cache
-------------------------------------------------------
This SF.Net email is sponsored by:
Power Architecture Resource Center: Free content, downloads, discussions,
and more. http://solutions.newsforge.com/ibmarch.tmpl
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
