Author: dmeyer
Date: Sun Apr 22 17:39:14 2007
New Revision: 2653
Modified:
trunk/DEPRECATED/player/setup.py
trunk/DEPRECATED/thumb/setup.py
trunk/WIP/candy/setup.py
trunk/WIP/netsearch/setup.py
trunk/WIP/record/setup.py
trunk/WIP/webinfo/setup.py
trunk/base/setup.py
trunk/base/src/distribution/__init__.py
trunk/beacon/setup.py
trunk/canvas/setup.py
trunk/cherrypy/setup.py
trunk/display/setup.py
trunk/epg/setup.py
trunk/evas/setup.py
trunk/imlib2/setup.py
trunk/metadata/setup.py
trunk/mevas/setup.py
trunk/popcorn/setup.py
trunk/record/setup.py
trunk/setup.py
trunk/xine/setup.py
Log:
Import distribution code from distribution.core and do not
nor import core.py at distribution/__init__.py. This works
around a bug making python distutils a requirenment to run
Freevo 1.7.
Modified: trunk/DEPRECATED/player/setup.py
==============================================================================
--- trunk/DEPRECATED/player/setup.py (original)
+++ trunk/DEPRECATED/player/setup.py Sun Apr 22 17:39:14 2007
@@ -32,7 +32,7 @@
try:
# kaa base imports
- from kaa.distribution import setup, Extension
+ from kaa.distribution.core import setup, Extension
except ImportError:
print 'kaa.base not installed'
sys.exit(1)
Modified: trunk/DEPRECATED/thumb/setup.py
==============================================================================
--- trunk/DEPRECATED/thumb/setup.py (original)
+++ trunk/DEPRECATED/thumb/setup.py Sun Apr 22 17:39:14 2007
@@ -32,7 +32,7 @@
try:
# kaa base imports
- from kaa.distribution import Extension, setup
+ from kaa.distribution.core import Extension, setup
except ImportError:
print 'kaa.base not installed'
sys.exit(1)
Modified: trunk/WIP/candy/setup.py
==============================================================================
--- trunk/WIP/candy/setup.py (original)
+++ trunk/WIP/candy/setup.py Sun Apr 22 17:39:14 2007
@@ -32,7 +32,7 @@
try:
# kaa base imports
- from kaa.distribution import Extension, setup
+ from kaa.distribution.core import Extension, setup
except ImportError:
print 'kaa.base not installed'
sys.exit(1)
Modified: trunk/WIP/netsearch/setup.py
==============================================================================
--- trunk/WIP/netsearch/setup.py (original)
+++ trunk/WIP/netsearch/setup.py Sun Apr 22 17:39:14 2007
@@ -3,7 +3,7 @@
try:
# kaa base imports
- from kaa.distribution import Extension, setup
+ from kaa.distribution.core import Extension, setup
except ImportError:
print 'kaa.base not installed'
sys.exit(1)
Modified: trunk/WIP/record/setup.py
==============================================================================
--- trunk/WIP/record/setup.py (original)
+++ trunk/WIP/record/setup.py Sun Apr 22 17:39:14 2007
@@ -3,7 +3,7 @@
try:
# kaa base imports
- from kaa.distribution import Extension, setup
+ from kaa.distribution.core import Extension, setup
except ImportError:
print 'kaa.base not installed'
sys.exit(1)
Modified: trunk/WIP/webinfo/setup.py
==============================================================================
--- trunk/WIP/webinfo/setup.py (original)
+++ trunk/WIP/webinfo/setup.py Sun Apr 22 17:39:14 2007
@@ -38,7 +38,7 @@
try:
# kaa base imports
- from kaa.distribution import Extension, setup
+ from kaa.distribution.core import Extension, setup
except ImportError:
print 'kaa.base not installed'
sys.exit(1)
Modified: trunk/base/setup.py
==============================================================================
--- trunk/base/setup.py (original)
+++ trunk/base/setup.py Sun Apr 22 17:39:14 2007
@@ -29,11 +29,16 @@
# python imports
import sys
+# We require python 2.4 or later, so complain if that isn't satisfied.
+if sys.version.split()[0] < '2.4':
+ print "Python 2.4 or later required."
+ sys.exit(1)
+
# We have some extensions but kaa.distribution isn't installed yet. So import
# it directly from the source tree. First add src/ to the modules patch ...
sys.path.append("src")
# ... and now import it.
-from distribution import Extension, setup
+from distribution.core import Extension, setup
ext = Extension('kaa.shmmodule', ['src/extensions/shmmodule.c'])
extensions = [ ext ]
Modified: trunk/base/src/distribution/__init__.py
==============================================================================
--- trunk/base/src/distribution/__init__.py (original)
+++ trunk/base/src/distribution/__init__.py Sun Apr 22 17:39:14 2007
@@ -1,36 +0,0 @@
-# -*- coding: iso-8859-1 -*-
-# -----------------------------------------------------------------------------
-# core.py - distutils functions for kaa packages
-# -----------------------------------------------------------------------------
-# $Id$
-#
-# -----------------------------------------------------------------------------
-# Copyright (C) 2006 Dirk Meyer, Jason Tackaberry
-#
-# First Edition: Dirk Meyer <[EMAIL PROTECTED]>
-# Maintainer: Dirk Meyer <[EMAIL PROTECTED]>
-#
-# Please see the file AUTHORS for a complete list of authors.
-#
-# This library is free software; you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version
-# 2.1 as published by the Free Software Foundation.
-#
-# This library 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
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301 USA
-#
-# -----------------------------------------------------------------------------
-
-import sys
-# We require python 2.4 or later, so complain if that isn't satisfied.
-if sys.version.split()[0] < '2.4':
- raise SystemError, "Python 2.4 or later required."
-
-from core import *
Modified: trunk/beacon/setup.py
==============================================================================
--- trunk/beacon/setup.py (original)
+++ trunk/beacon/setup.py Sun Apr 22 17:39:14 2007
@@ -35,7 +35,7 @@
try:
# kaa base imports
- from kaa.distribution import Extension, setup
+ from kaa.distribution.core import Extension, setup
except ImportError, e:
print e
print 'kaa.base not installed'
Modified: trunk/canvas/setup.py
==============================================================================
--- trunk/canvas/setup.py (original)
+++ trunk/canvas/setup.py Sun Apr 22 17:39:14 2007
@@ -32,7 +32,7 @@
try:
# kaa base imports
- from kaa.distribution import Extension, setup
+ from kaa.distribution.core import Extension, setup
except ImportError:
print 'kaa.base not installed'
sys.exit(1)
Modified: trunk/cherrypy/setup.py
==============================================================================
--- trunk/cherrypy/setup.py (original)
+++ trunk/cherrypy/setup.py Sun Apr 22 17:39:14 2007
@@ -32,7 +32,7 @@
try:
# kaa base imports
- from kaa.distribution import setup
+ from kaa.distribution.core import setup
except ImportError:
print 'kaa.base not installed'
sys.exit(1)
Modified: trunk/display/setup.py
==============================================================================
--- trunk/display/setup.py (original)
+++ trunk/display/setup.py Sun Apr 22 17:39:14 2007
@@ -37,7 +37,7 @@
try:
# kaa base imports
- from kaa.distribution import *
+ from kaa.distribution.core import *
except ImportError:
print 'kaa.base not installed'
sys.exit(1)
Modified: trunk/epg/setup.py
==============================================================================
--- trunk/epg/setup.py (original)
+++ trunk/epg/setup.py Sun Apr 22 17:39:14 2007
@@ -31,7 +31,7 @@
try:
# kaa base imports
- from kaa.distribution import Extension, setup
+ from kaa.distribution.core import Extension, setup
except ImportError:
print 'kaa.base not installed'
sys.exit(1)
Modified: trunk/evas/setup.py
==============================================================================
--- trunk/evas/setup.py (original)
+++ trunk/evas/setup.py Sun Apr 22 17:39:14 2007
@@ -32,7 +32,7 @@
try:
# kaa base imports
- from kaa.distribution import *
+ from kaa.distribution.core import *
except ImportError:
print 'kaa.base not installed'
sys.exit(1)
Modified: trunk/imlib2/setup.py
==============================================================================
--- trunk/imlib2/setup.py (original)
+++ trunk/imlib2/setup.py Sun Apr 22 17:39:14 2007
@@ -33,7 +33,7 @@
try:
# kaa base imports
- from kaa.distribution import Extension, setup
+ from kaa.distribution.core import Extension, setup
except ImportError:
print 'kaa.base not installed'
sys.exit(1)
Modified: trunk/metadata/setup.py
==============================================================================
--- trunk/metadata/setup.py (original)
+++ trunk/metadata/setup.py Sun Apr 22 17:39:14 2007
@@ -34,7 +34,7 @@
try:
# kaa base imports
- from kaa.distribution import Extension, setup
+ from kaa.distribution.core import Extension, setup
except ImportError:
print 'kaa.base not installed'
sys.exit(1)
Modified: trunk/mevas/setup.py
==============================================================================
--- trunk/mevas/setup.py (original)
+++ trunk/mevas/setup.py Sun Apr 22 17:39:14 2007
@@ -32,7 +32,7 @@
try:
# kaa base imports
- from kaa.distribution import setup
+ from kaa.distribution.core import setup
except ImportError:
print 'kaa.base not installed'
sys.exit(1)
Modified: trunk/popcorn/setup.py
==============================================================================
--- trunk/popcorn/setup.py (original)
+++ trunk/popcorn/setup.py Sun Apr 22 17:39:14 2007
@@ -31,7 +31,7 @@
try:
# kaa base imports
- from kaa.distribution import setup, Extension
+ from kaa.distribution.core import setup, Extension
except ImportError:
print 'kaa.base not installed'
sys.exit(1)
Modified: trunk/record/setup.py
==============================================================================
--- trunk/record/setup.py (original)
+++ trunk/record/setup.py Sun Apr 22 17:39:14 2007
@@ -34,7 +34,7 @@
try:
# kaa base imports
- from kaa.distribution import Extension, setup
+ from kaa.distribution.core import Extension, setup
except ImportError:
print 'kaa.base not installed'
sys.exit(1)
Modified: trunk/setup.py
==============================================================================
--- trunk/setup.py (original)
+++ trunk/setup.py Sun Apr 22 17:39:14 2007
@@ -35,6 +35,11 @@
'metadata', 'evas', 'canvas', 'xine', 'cherrypy',
'beacon', 'popcorn' ]
+# We require python 2.4 or later, so complain if that isn't satisfied.
+if sys.version.split()[0] < '2.4':
+ print "Python 2.4 or later required."
+ sys.exit(1)
+
for a in sys.argv:
if a.startswith('--help'):
distutils.core.setup(name="kaa", version="0.1")
Modified: trunk/xine/setup.py
==============================================================================
--- trunk/xine/setup.py (original)
+++ trunk/xine/setup.py Sun Apr 22 17:39:14 2007
@@ -30,7 +30,7 @@
try:
# kaa base imports
- from kaa.distribution import *
+ from kaa.distribution.core import *
except ImportError:
print 'kaa.base not installed'
sys.exit(1)
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
