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

* If found, automatically use included gtk on win32.

Browse source 
* Don't include docutils stuff in win32 builds.
This commit is contained in:
js 2008-05-19 10:58:03 +00:00
parent fad6d2ef7e
commit 12014b40b6
3 changed files with 29 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
setup_win32.py
View file

@ -20,18 +20,18 @@
from distutils.core import setup from distutils.core import setup
import py2exe import py2exe
import glob import glob
import sys import sys
import os import os
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',] includes = ['encodings', 'encodings.utf-8',]
opts = { opts = {
'py2exe': { 'py2exe': {
'includes': 'pango,atk,gobject,cairo,pangocairo,gtk.keysyms,encodings,encodings.*,docutils.readers.*,docutils.writers.html4css1', 'includes': 'pango,atk,gobject,cairo,pangocairo,gtk.keysyms,encodings,encodings.*', #',docutils.readers.*,docutils.writers.html4css1',
'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',
@ -46,7 +46,7 @@ opts = {
setup( setup(
name = 'Gajim', name = 'Gajim',
version = '0.11.4', version = '0.11.4.4-svn',
description = 'A full featured Jabber client', description = 'A full featured Jabber client',
author = 'Gajim Development Team', author = 'Gajim Development Team',
url = 'http://www.gajim.org/', url = 'http://www.gajim.org/',

23
src/gajim.py
View file

@ -31,17 +31,18 @@ if os.name == 'nt':
import warnings import warnings
warnings.filterwarnings(action='ignore') warnings.filterwarnings(action='ignore')
# Used to create windows installer with GTK included if os.path.isdir('gtk'):
# paths = os.environ['PATH'] # Used to create windows installer with GTK included
# list_ = paths.split(';') paths = os.environ['PATH']
# new_list = [] list_ = paths.split(';')
# for p in list_: new_list = []
# if p.find('gtk') < 0 and p.find('GTK') < 0: for p in list_:
# new_list.append(p) if p.find('gtk') < 0 and p.find('GTK') < 0:
# new_list.insert(0, 'gtk/lib') new_list.append(p)
# new_list.insert(0, 'gtk/bin') new_list.insert(0, 'gtk/lib')
# os.environ['PATH'] = ';'.join(new_list) new_list.insert(0, 'gtk/bin')
# os.environ['GTK_BASEPATH'] = 'gtk' os.environ['PATH'] = ';'.join(new_list)
os.environ['GTK_BASEPATH'] = 'gtk'
import sys import sys

23
src/history_manager.py
View file

@ -28,17 +28,18 @@ if os.name == 'nt':
import warnings import warnings
warnings.filterwarnings(action='ignore') warnings.filterwarnings(action='ignore')
# Used to create windows installer with GTK included if os.path.isdir('gtk'):
# paths = os.environ['PATH'] # Used to create windows installer with GTK included
# list_ = paths.split(';') paths = os.environ['PATH']
# new_list = [] list_ = paths.split(';')
# for p in list_: new_list = []
# if p.find('gtk') < 0 and p.find('GTK') < 0: for p in list_:
# new_list.append(p) if p.find('gtk') < 0 and p.find('GTK') < 0:
# new_list.insert(0, 'gtk/lib') new_list.append(p)
# new_list.insert(0, 'gtk/bin') new_list.insert(0, 'gtk/lib')
# os.environ['PATH'] = ';'.join(new_list) new_list.insert(0, 'gtk/bin')
# os.environ['GTK_BASEPATH'] = 'gtk' os.environ['PATH'] = ';'.join(new_list)
os.environ['GTK_BASEPATH'] = 'gtk'
import sys import sys
import signal import signal