Author: duncan
Date: Tue Oct 31 15:18:45 2006
New Revision: 8526
Modified:
branches/rel-1-6/freevo/src/helpers/cache.py
branches/rel-1-6/freevo/src/util/distribution.py
branches/rel-1-6/freevo/src/util/distutils.py
branches/rel-1-6/freevo/src/util/mediainfo.py
branches/rel-1-6/freevo/src/util/vfs.py
branches/rel-1-6/freevo/src/www/htdocs/help/doc.rpy
branches/rel-1-6/freevo/src/www/htdocs/help/howto.rpy
Log:
Replaced CVS with SVN or .svn
Modified: branches/rel-1-6/freevo/src/helpers/cache.py
==============================================================================
--- branches/rel-1-6/freevo/src/helpers/cache.py (original)
+++ branches/rel-1-6/freevo/src/helpers/cache.py Tue Oct 31 15:18:45 2006
@@ -10,26 +10,6 @@
# Todo:
#
# -----------------------------------------------------------------------
-# $Log$
-# Revision 1.38 2004/07/21 11:33:34 dischi
-# support one file thumbnailing
-#
-# Revision 1.37 2004/07/10 12:33:39 dischi
-# header cleanup
-#
-# Revision 1.36 2004/06/06 08:31:37 dischi
-# fix crash
-#
-# Revision 1.35 2004/06/06 06:41:47 dischi
-# delete cache on mmpython update
-#
-# Revision 1.34 2004/05/12 20:07:01 dischi
-# do not delete raw files for discs
-#
-# Revision 1.33 2004/05/02 11:46:13 dischi
-# make it possible to turn off image caching
-#
-# -----------------------------------------------------------------------
# Freevo - A Home Theater PC framework
# Copyright (C) 2002 Krister Lagerstrom, et al.
# Please see the file freevo/Docs/CREDITS for a complete list of authors.
@@ -48,7 +28,7 @@
# with this program; if not, write to the Free Software Foundation, Inc.,
# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
-# ----------------------------------------------------------------------- */
+# -----------------------------------------------------------------------
import sys
@@ -431,7 +411,7 @@
print
print 'Error: unable to read mmpython version information'
print 'Please update mmpython to the latest release or if you use'
- print 'Freevo CVS versions, please also use mmpython CVS.'
+ print 'Freevo SVN versions, please also use mmpython SVN.'
print
print 'Some functions in Freevo may not work or even crash!'
print
Modified: branches/rel-1-6/freevo/src/util/distribution.py
==============================================================================
--- branches/rel-1-6/freevo/src/util/distribution.py (original)
+++ branches/rel-1-6/freevo/src/util/distribution.py Tue Oct 31 15:18:45 2006
@@ -60,14 +60,6 @@
# Todo:
#
# -----------------------------------------------------------------------
-# $Log$
-# Revision 1.10 2004/07/10 12:33:42 dischi
-# header cleanup
-#
-# Revision 1.9 2004/06/10 11:06:40 dischi
-# make it possible to give a cmdclass to setup
-#
-# -----------------------------------------------------------------------
# Freevo - A Home Theater PC framework
# Copyright (C) 2002 Krister Lagerstrom, et al.
# Please see the file freevo/Docs/CREDITS for a complete list of authors.
@@ -86,7 +78,7 @@
# with this program; if not, write to the Free Software Foundation, Inc.,
# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
-# ----------------------------------------------------------------------- */
+# -----------------------------------------------------------------------
import os
@@ -141,7 +133,7 @@
name.find('update.py') == -1):
files.append(os.path.join(dirname, name))
- if files and dirname.find('/CVS') == -1:
+ if files and dirname.find('/.svn') == -1:
result.append((dirname.replace('./share', 'share/freevo').
replace('./src/www', 'share/freevo').\
replace('./i18n', 'share/locale').\
@@ -160,7 +152,7 @@
if os.path.splitext(name)[1] == '.html':
files.append(os.path.join(dirname, name))
- if files and dirname.find('/CVS') == -1:
+ if files and dirname.find('/.svn') == -1:
result.append((dirname.replace('/html', ''). \
replace('./Docs', 'share/doc/freevo-%s' %
version.__version__), files))
return result
@@ -190,7 +182,7 @@
def i18n_mo():
print 'updating mo files'
for file in ([ os.path.join('i18n', fname) for fname in os.listdir('i18n')
]):
- if os.path.isdir(file) and file.find('CVS') == -1:
+ if os.path.isdir(file) and file.find('.svn') == -1:
file = os.path.join(file, 'LC_MESSAGES/%s.po' % i18n_application)
mo = os.path.splitext(file)[0] + '.mo'
os.system('msgfmt -o %s %s' % (mo, file))
@@ -302,7 +294,7 @@
print 'updating po files'
print '',
for file in ([ os.path.join('i18n', fname) for fname in
os.listdir('i18n') ]):
- if os.path.isdir(file) and file.find('CVS') == -1:
+ if os.path.isdir(file) and file.find('.svn') == -1:
txt = file
for i in range(len(file), 10):
txt += '.'
Modified: branches/rel-1-6/freevo/src/util/distutils.py
==============================================================================
--- branches/rel-1-6/freevo/src/util/distutils.py (original)
+++ branches/rel-1-6/freevo/src/util/distutils.py Tue Oct 31 15:18:45 2006
@@ -65,14 +65,6 @@
# Todo:
#
# -----------------------------------------------------------------------
-# $Log$
-# Revision 1.12 2004/07/10 12:33:42 dischi
-# header cleanup
-#
-# Revision 1.11 2003/11/10 18:46:09 dischi
-# bugfix for freevo.pot
-#
-# -----------------------------------------------------------------------
# Freevo - A Home Theater PC framework
# Copyright (C) 2002 Krister Lagerstrom, et al.
# Please see the file freevo/Docs/CREDITS for a complete list of authors.
@@ -91,7 +83,7 @@
# with this program; if not, write to the Free Software Foundation, Inc.,
# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
-# ----------------------------------------------------------------------- */
+# -----------------------------------------------------------------------
import os
@@ -125,7 +117,7 @@
name.find('update.py') == -1):
files.append(os.path.join(dirname, name))
- if files and dirname.find('/CVS') == -1:
+ if files and dirname.find('/.svn') == -1:
result.append((dirname.replace('./share', 'share/freevo').
replace('./src/www', 'share/freevo').\
replace('./i18n', 'share/locale').\
@@ -144,7 +136,7 @@
if os.path.splitext(name)[1] == '.html':
files.append(os.path.join(dirname, name))
- if files and dirname.find('/CVS') == -1:
+ if files and dirname.find('/.svn') == -1:
result.append((dirname.replace('/html', ''). \
replace('./Docs', 'share/doc/freevo-%s' %
version.__version__), files))
return result
@@ -214,7 +206,7 @@
# if arg 2 is not --no-merge to the merge
if not (len(sys.argv) > 2 and sys.argv[2] == '--no-merge'):
for file in ([ os.path.join('i18n', fname) for fname in
os.listdir('i18n') ]):
- if os.path.isdir(file) and file.find('CVS') == -1:
+ if os.path.isdir(file) and file.find('.svn') == -1:
print 'updating %s...' % file,
sys.stdout.flush()
file = os.path.join(file, 'LC_MESSAGES/%s.po' %
application)
@@ -232,7 +224,7 @@
# update the mo files
print 'updating mo files'
for file in ([ os.path.join('i18n', fname) for fname in
os.listdir('i18n') ]):
- if os.path.isdir(file) and file.find('CVS') == -1:
+ if os.path.isdir(file) and file.find('.svn') == -1:
file = os.path.join(file, 'LC_MESSAGES/%s.po' % application)
mo = os.path.splitext(file)[0] + '.mo'
os.system('msgfmt -o %s %s' % (mo, file))
Modified: branches/rel-1-6/freevo/src/util/mediainfo.py
==============================================================================
--- branches/rel-1-6/freevo/src/util/mediainfo.py (original)
+++ branches/rel-1-6/freevo/src/util/mediainfo.py Tue Oct 31 15:18:45 2006
@@ -8,29 +8,6 @@
# Todo:
#
# -----------------------------------------------------------------------
-# $Log$
-# Revision 1.55.2.1 2004/08/28 17:09:41 dischi
-# force rechecking if it seems a dvd but is not detected as one
-#
-# Revision 1.55 2004/07/11 10:05:14 dischi
-# fix crash for bad discs
-#
-# Revision 1.54 2004/07/10 12:33:42 dischi
-# header cleanup
-#
-# Revision 1.53 2004/07/09 14:34:52 dischi
-# inverse the rc.app() call. One line, two bugs :-(
-#
-# Revision 1.52 2004/07/09 14:33:05 dischi
-# bugfix: rc.app is always true, it is rc.app() we want
-#
-# Revision 1.51 2004/07/08 14:37:47 dischi
-# prevent crash for bad pickle results
-#
-# Revision 1.50 2004/06/29 18:07:03 dischi
-# reload cache if cache helper runs while running freevo
-#
-# -----------------------------------------------------------------------
# Freevo - A Home Theater PC framework
# Copyright (C) 2002 Krister Lagerstrom, et al.
# Please see the file freevo/Docs/CREDITS for a complete list of authors.
@@ -49,7 +26,7 @@
# with this program; if not, write to the Free Software Foundation, Inc.,
# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
-# ----------------------------------------------------------------------- */
+# -----------------------------------------------------------------------
import os, stat
@@ -567,7 +544,7 @@
for dir in dirlist:
for dirname in util.get_subdirs_recursively(dir):
if not dirname in all_dirs and not \
- os.path.basename(dirname) in ('.xvpics', '.thumbnails',
'CVS'):
+ os.path.basename(dirname) in ('.xvpics', '.thumbnails',
'.svn'):
all_dirs.append(dirname)
if not dir in all_dirs:
all_dirs.append(dir)
@@ -813,7 +790,7 @@
print
print 'Error: unable to read mmpython version information'
print 'Please update mmpython to the latest release or if you use'
- print 'Freevo CVS versions, please also use mmpython CVS.'
+ print 'Freevo SVN versions, please also use mmpython SVN.'
print
print 'Some functions in Freevo may not work or even crash!'
print
Modified: branches/rel-1-6/freevo/src/util/vfs.py
==============================================================================
--- branches/rel-1-6/freevo/src/util/vfs.py (original)
+++ branches/rel-1-6/freevo/src/util/vfs.py Tue Oct 31 15:18:45 2006
@@ -11,32 +11,11 @@
# directory, but the user has no write access to it. It's meant to
# store fxd and image files (covers).
#
-# Todo:
-#
-# -----------------------------------------------------------------------
-# $Log$
-# Revision 1.19.2.1 2004/09/11 16:41:25 dischi
-# ignore thumbnails from cvs freevo
-#
-# Revision 1.19 2004/07/10 12:33:42 dischi
-# header cleanup
-#
-# Revision 1.18 2004/06/09 20:09:10 dischi
-# cleanup
-#
-# Revision 1.17 2004/02/14 15:45:26 dischi
-# do not include folder.fxd
-#
-# Revision 1.16 2004/02/05 19:26:42 dischi
-# fix unicode handling
-#
-# Revision 1.15 2004/02/05 05:44:26 gsbarbieri
-# Fixes some bugs related to handling unicode internally.
-# NOTE: Many of the bugs are related to using str() everywhere, so please stop
doing that.
+# Todo:
#
# -----------------------------------------------------------------------
# Freevo - A Home Theater PC framework
-# Copyright (C) 2002 Krister Lagerstrom, et al.
+# Copyright (C) 2002 Krister Lagerstrom, et al.
# Please see the file freevo/Docs/CREDITS for a complete list of authors.
#
# This program is free software; you can redistribute it and/or modify
@@ -53,8 +32,8 @@
# with this program; if not, write to the Free Software Foundation, Inc.,
# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
-# ----------------------------------------------------------------------- */
-
+# -----------------------------------------------------------------------
+
import os
import copy
@@ -127,7 +106,7 @@
except (OSError, IOError):
return t
-
+
def open(name, mode='r'):
"""
open the file
@@ -172,7 +151,7 @@
except IOError, e:
print 'error opening file %s' % overlay
raise IOError, e
-
+
def listdir(directory, handle_exception=True, include_dot_files=False,
include_overlay=False):
@@ -182,16 +161,16 @@
try:
if not directory.endswith('/'):
directory = directory + '/'
-
+
files = []
if include_dot_files:
for f in os.listdir(directory):
- if not f in ('CVS', '.xvpics', '.thumbnails', '.pics',
'folder.fxd'):
+ if not f in ('.svn', '.xvpics', '.thumbnails', '.pics',
'folder.fxd'):
files.append(directory + f)
else:
for f in os.listdir(directory):
- if not f.startswith('.') and not f in ('CVS', 'folder.fxd'):
+ if not f.startswith('.') and not f in ('.svn', 'folder.fxd'):
files.append(directory + f)
if not include_overlay:
@@ -207,7 +186,7 @@
if not os.path.isdir(f):
files.append(f)
return files
-
+
except OSError:
_debug_('Error in dir %s' % directory)
traceback.print_exc()
@@ -253,4 +232,4 @@
isdir = os.path.isdir
islink = os.path.islink
-
+
Modified: branches/rel-1-6/freevo/src/www/htdocs/help/doc.rpy
==============================================================================
--- branches/rel-1-6/freevo/src/www/htdocs/help/doc.rpy (original)
+++ branches/rel-1-6/freevo/src/www/htdocs/help/doc.rpy Tue Oct 31 15:18:45 2006
@@ -1,8 +1,6 @@
#!/usr/bin/python
-
-#if 0 /*
# -----------------------------------------------------------------------
-# howto.rpy - Show the freevo_howto
+# doc.rpy - Show the freevo_howto
# -----------------------------------------------------------------------
# $Id$
#
@@ -10,53 +8,6 @@
# Todo:
#
# -----------------------------------------------------------------------
-# $Log$
-# Revision 1.6.2.1 2005/01/09 11:07:12 dischi
-# move needed part of old wiki in the cvs
-#
-# Revision 1.6 2004/02/19 04:57:59 gsbarbieri
-# Support Web Interface i18n.
-# To use this, I need to get the gettext() translations in unicode, so some
changes are required to files that use "print _('string')", need to make them
"print String(_('string'))".
-#
-# Revision 1.5 2004/02/12 14:04:37 outlyer
-# fixes for some issues Dischi pointed out:
-#
-# o Fix invisible link underlines
-# o Change background of "pre" to light gray and add padding
-# o Fix CSS so it validates with jigsaw.w3.org
-# o Replace #content with content as it should be
-#
-# Revision 1.4 2004/02/09 21:23:42 outlyer
-# New web interface...
-#
-# * Removed as much of the embedded design as possible, 99% is in CSS now
-# * Converted most tags to XHTML 1.0 standard
-# * Changed layout tables into CSS; content tables are still there
-# * Respect the user configuration on time display
-# * Added lots of "placeholder" tags so the design can be altered pretty
-# substantially without touching the code. (This means using
-# span/div/etc. where possible and using 'display: none' if it's not in
-# _my_ design, but might be used by someone else.
-# * Converted graphical arrows into HTML arrows
-# * Many minor cosmetic changes
-#
-# Revision 1.3 2004/02/06 20:30:32 dischi
-# some layout updates
-#
-# Revision 1.2 2003/11/06 19:56:14 mikeruelle
-# remove hard links so we can run when proxied
-#
-# Revision 1.1 2003/09/23 18:24:07 dischi
-# moved help to a new directory and add more docs
-#
-# Revision 1.2 2003/09/20 14:11:11 dischi
-# find docs for an installed version
-#
-# Revision 1.1 2003/09/12 22:00:00 dischi
-# add more documentation
-#
-#
-# -----------------------------------------------------------------------
# Freevo - A Home Theater PC framework
# Copyright (C) 2002 Krister Lagerstrom, et al.
# Please see the file freevo/Docs/CREDITS for a complete list of authors.
@@ -75,8 +26,7 @@
# with this program; if not, write to the Free Software Foundation, Inc.,
# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
-# ----------------------------------------------------------------------- */
-#endif
+# -----------------------------------------------------------------------
import sys, os
@@ -109,7 +59,7 @@
fv.printHeader(_('Freevo Documentation'), '/styles/main.css',
prefix=request.path.count('/')-1)
fv.res += '<div id="content">'
fv.res += '<p class="alert">' + _('ERROR')+': '+(_('unable to load
%s.html') % file)+'</p>\n'
- fv.res += '<p class="normal">'+ _('If you use a CVS version of
Freevo, run <b>autogen.sh</b>.')+'</p>\n'
+ fv.res += '<p class="normal">'+ _('If you use a SVN version of
Freevo, run <b>autogen.sh</b>.')+'</p>\n'
fv.res += '</div>\n'
else:
pos = 0
Modified: branches/rel-1-6/freevo/src/www/htdocs/help/howto.rpy
==============================================================================
--- branches/rel-1-6/freevo/src/www/htdocs/help/howto.rpy (original)
+++ branches/rel-1-6/freevo/src/www/htdocs/help/howto.rpy Tue Oct 31
15:18:45 2006
@@ -1,6 +1,4 @@
#!/usr/bin/python
-
-#if 0 /*
# -----------------------------------------------------------------------
# howto.rpy - Show the freevo_howto
# -----------------------------------------------------------------------
@@ -10,51 +8,6 @@
# Todo:
#
# -----------------------------------------------------------------------
-# $Log$
-# Revision 1.8 2004/02/19 04:57:59 gsbarbieri
-# Support Web Interface i18n.
-# To use this, I need to get the gettext() translations in unicode, so some
changes are required to files that use "print _('string')", need to make them
"print String(_('string'))".
-#
-# Revision 1.7 2004/02/09 21:23:42 outlyer
-# New web interface...
-#
-# * Removed as much of the embedded design as possible, 99% is in CSS now
-# * Converted most tags to XHTML 1.0 standard
-# * Changed layout tables into CSS; content tables are still there
-# * Respect the user configuration on time display
-# * Added lots of "placeholder" tags so the design can be altered pretty
-# substantially without touching the code. (This means using
-# span/div/etc. where possible and using 'display: none' if it's not in
-# _my_ design, but might be used by someone else.
-# * Converted graphical arrows into HTML arrows
-# * Many minor cosmetic changes
-#
-# Revision 1.6 2004/02/06 20:30:33 dischi
-# some layout updates
-#
-# Revision 1.5 2003/11/06 19:56:45 mikeruelle
-# remove hard links so we can run when proxied
-#
-# Revision 1.4 2003/11/01 15:20:38 dischi
-# better howto support
-#
-# Revision 1.3 2003/10/31 18:56:14 dischi
-# Add framework for plugin writing howto
-#
-# Revision 1.2 2003/10/07 17:13:22 dischi
-# fix howto path lookup
-#
-# Revision 1.1 2003/09/23 18:24:07 dischi
-# moved help to a new directory and add more docs
-#
-# Revision 1.2 2003/09/20 14:11:11 dischi
-# find docs for an installed version
-#
-# Revision 1.1 2003/09/12 22:00:00 dischi
-# add more documentation
-#
-#
-# -----------------------------------------------------------------------
# Freevo - A Home Theater PC framework
# Copyright (C) 2002 Krister Lagerstrom, et al.
# Please see the file freevo/Docs/CREDITS for a complete list of authors.
@@ -73,8 +26,7 @@
# with this program; if not, write to the Free Software Foundation, Inc.,
# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
-# ----------------------------------------------------------------------- */
-#endif
+# -----------------------------------------------------------------------
import sys, os
@@ -130,7 +82,7 @@
fv.printHeader(name, '/styles/main.css',
prefix=request.path.count('/')-1)
fv.res += '<div id="content">\n'
fv.res += '<p class="alert">'+_('ERROR')+': '+_('unable to load
html files')+'<br>'
- fv.res += _('If you use a CVS version of Freevo, run
<b>autogen.sh</b>.')+'</p>\n' + \
+ fv.res += _('If you use a SVN version of Freevo, run
<b>autogen.sh</b>.')+'</p>\n' + \
_('The files are searched in the following
locations:')+'<ol>'
for d in SEARCH_PATH:
fv.res += '<li>%s/%s</li>\n' % (d, TYPES[type][0])
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
