copyleftie
/
gajim-plural
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix docutils installation under windows. css file was not included in library.zip. Fixes #4495

This commit is contained in:
Yann Leboulanger 2008-11-19 21:47:28 +00:00
parent b00b1ce0f4
commit a3f6b82ae5
2 changed files with 30 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
setup_win32.py
View File

@ -25,15 +25,34 @@ import glob
import sys import sys
import os import os
docutils_files = []
def fill_docutils_files(folder, base=u'docutils'):
docutils_files.append((base, glob.glob(os.path.join(folder, base, '*.pyc'))))
for path in os.listdir(os.path.join(folder, base)):
if os.path.isdir(os.path.join(folder, base, path)):
fill_docutils_files(folder, base=os.path.join(base, path))
try:
import docutils.readers
import docutils.writers.html4css1
import docutils.languages
except ImportError:
pass
else:
fill_docutils_files(os.path.join(sys.prefix, 'Lib', 'site-packages'))
docutils_files.append((os.path.join('docutils', 'writers', 'html4css1'),
glob.glob(os.path.join(sys.prefix, 'Lib', 'site-packages', 'docutils',
'writers', 'html4css1', '*.css'))))
sys.path.append('src') sys.path.append('src')
# Use local gtk folder instead of the one in PATH that is not latest gtk # Use local gtk folder instead of the one in PATH that is not latest gtk
if 'gtk' in os.listdir('.'): if 'gtk' in os.listdir('.'):
sys.path.append('gtk/bin') sys.path.append('gtk/bin')
includes = ['encodings', 'encodings.utf-8',]
opts = { opts = {
'py2exe': { 'py2exe': {
'includes': 'pango,atk,gobject,cairo,pangocairo,gtk.keysyms,encodings,encodings.*,docutils.readers.*,docutils.writers.html4css1', # ConfigParser,UserString,roman are needed for docutils
'includes': 'pango,atk,gobject,cairo,pangocairo,gtk.keysyms,encodings,encodings.*,ConfigParser,UserString,roman',
'dll_excludes': [ 'dll_excludes': [
'iconv.dll','intl.dll','libatk-1.0-0.dll', 'iconv.dll','intl.dll','libatk-1.0-0.dll',
'libgdk_pixbuf-2.0-0.dll','libgdk-win32-2.0-0.dll', 'libgdk_pixbuf-2.0-0.dll','libgdk-win32-2.0-0.dll',
@ -43,20 +62,12 @@ opts = {
'libpangowin32-1.0-0.dll','libcairo-2.dll', 'libpangowin32-1.0-0.dll','libcairo-2.dll',
'libpangocairo-1.0-0.dll','libpangoft2-1.0-0.dll', 'libpangocairo-1.0-0.dll','libpangoft2-1.0-0.dll',
], ],
'excludes': [
'docutils'
],
} }
} }
try:
import docutils.readers
except ImportError:
opts['py2exe']['includes'] = \
opts['py2exe']['includes'].replace(',docutils.readers.*', '')
try:
import docutils.writers.html4css1
except ImportError:
opts['py2exe']['includes'] = \
opts['py2exe']['includes'].replace(',docutils.writers.html4css1', '')
setup( setup(
name = 'Gajim', name = 'Gajim',
@ -73,9 +84,8 @@ setup(
'icon_resources': [(1, 'data/pixmaps/gajim.ico')]}], 'icon_resources': [(1, 'data/pixmaps/gajim.ico')]}],
options=opts, options=opts,
data_files=[('.', glob.glob('src/gtkgui.glade')), data_files=docutils_files,
('.', glob.glob('src/history_manager.glade')),
],
) )
# vim: se ts=3: # vim: se ts=3:

4
src/gajim.py
View File

@ -57,6 +57,10 @@ if os.name == 'nt':
import sys import sys
if os.name == 'nt':
# needed for docutils
sys.path.append('.')
import logging import logging
consoleloghandler = logging.StreamHandler() consoleloghandler = logging.StreamHandler()
consoleloghandler.setLevel(1) consoleloghandler.setLevel(1)