From c6c31a17c30ecf4ac99334abee1f5781a185a3d3 Mon Sep 17 00:00:00 2001 From: James Newton Date: Fri, 16 Nov 2007 14:04:18 +0000 Subject: [PATCH] Removed path adjustment from gajim.py and moved it outside of gajim proper. --- setup_osx.py | 202 ++++------------------------------------- src/gajim.py | 6 -- src/osx/prep_py2app.py | 23 +++++ 3 files changed, 43 insertions(+), 188 deletions(-) create mode 100644 src/osx/prep_py2app.py diff --git a/setup_osx.py b/setup_osx.py index 960686597..748c07ffb 100644 --- a/setup_osx.py +++ b/setup_osx.py @@ -27,189 +27,9 @@ GAJIM_SCRIPT = \ '#!/bin/bash \n\ export DYLD_LIBRARY_PATH=%s/lib \n\ export PATH=%s/bin:$PATH \n\ +export PYTHONPATH=%s/lib/python2.5/site-packages:%s/lib/python2.5/site-packages/gtk-2.0 \n\ exec ${0}.bin \n\ -' % (GTK_DIR, GTK_DIR) - -GAJIM_REMOTE_SCRIPT = \ -'#!/bin/bash \n\ -export DYLD_LIBRARY_PATH=%s/lib \n\ -TOPDIR=${0%%/MacOS/gajim-remote} \n\ -echo "${TOPDIR}" | grep -e "^/" \n\ -[ $? -ne 0 ] && TOPDIR=`pwd`/${TOPDIR} \n\ -export RESOURCEPATH=${TOPDIR}/Resources \n\ -export PYTHONHOME=${RESOURCEPATH}/lib/python2.5 \n\ -export PYTHONPATH=${RESOURCEPATH}/lib/python2.5/lib-dynload:${RESOURCEPATH}/lib/python2.5/site-packages.zip:${PYTHONPATH} \n\ -cd ${RESOURCEPATH} \n\ -exec ${TOPDIR}/MacOS/Python ${RESOURCEPATH}/gajim-remote.py $* \n\ -' % GTK_DIR - -### -### Functions -### - -def check(ret): - if type(ret) == types.ListType: - if ret[0] != 0: - raise Exception("Command failed: " + ret[1]) - elif type(ret) == types.IntType: - if ret != 0: - raise Exception("Command failed") - return - - -def force(func): - try: - func() - except: - pass - return - - -def writeScript(filename, contents): - script = file(filename, "w+") - script.write(contents) - script.close() - system("chmod +x %s" % filename) - return - - -def cleanup(): - force(lambda:rmtree("build")) - force(lambda:rmtree("dist")) - -def stageInstall(): - check(system("make DATADIR=%s/build/inst LIBDIR=%s/build/inst prefix=%s/build/inst DOCDIR=%s/build/inst/share/doc install" % (PWD, PWD, PWD, PWD))) - force(lambda:unlink("src/osx/growl/_growl.so")) - force(lambda:unlink("src/osx/growl/_growlImage.so")) - force(lambda:unlink("src/osx/idle.so")) - force(lambda:unlink("src/osx/nsapp.so")) - force(lambda:unlink("src/osx/syncmenu.so")) - force(lambda:unlink("src/gtkspell.so")) - symlink("%s/build/inst/lib/gajim/_growl.so" % PWD, "src/osx/growl/_growl.so") - symlink("%s/build/inst/lib/gajim/_growlImage.so" % PWD, - "src/osx/growl/_growlImage.so") - symlink("%s/build/inst/lib/gajim/idle.so" % PWD, "src/osx/idle.so") - symlink("%s/build/inst/lib/gajim/nsapp.so" % PWD, "src/osx/nsapp.so") - symlink("%s/build/inst/lib/gajim/syncmenu.so" % PWD, "src/osx/syncmenu.so") - if os.path.isfile("build/inst/lib/gajim/gtkspell.so"): - symlink("%s/build/inst/lib/gajim/gtkspell.so" % PWD, "src/gtkspell.so") - return - - -def buildApp(): - sys.path.append('src') - sys.path.append(GTK_DIR + "/lib/python2.5/site-packages") - sys.path.append(GTK_DIR + "/lib/python2.5/site-packages/gtk-2.0") - OPTIONS = {'argv_emulation':True, - 'excludes':'docutils,Crypto,dbus,OpenSSL,cairo,gtk,gobject,atk,pangocairo', - 'iconfile':'data/pixmaps/gajim.icns', - 'includes':'osx,ConfigParser,compiler,UserString,history_manager', - 'plist':{'LSMinimumSystemVersion':'10.4.0', - 'NSHumanReadableCopyright':'GNU General Public License', - 'CFBundleIdentifier':'org.gajim', - 'NSMainNibFile':'Gajim', - }, - } - setup( - name = NAME, version = VERSION, description = DESCRIPTION, - author = AUTHOR, url = URL, download_url = DOWNLOAD_URL, - license = LICENSE, - app=['src/gajim.py'], - data_files=['data/nibs/Gajim.nib'], - options={'py2app': OPTIONS}, - setup_requires=['py2app'], - ) - return - - -def finishApp(): - # setup gajim dirs - copytree("build/inst/share/gajim/data", APP_RS + "/data") - copy("data/pixmaps/gajim.icns", APP_RS + "/data/pixmaps") - copytree("build/inst/locale", APP_RS + "/locale") - copytree("build/inst/share/man", APP_RS + "/man") - force(lambda:unlink("dist/Gajim.app/Contents/data")) - symlink("Resources/data", "dist/Gajim.app/Contents/data") - copy("src/gajim-remote.py", "dist/Gajim.app/Contents/Resources") - # Nuke libs that are in the framework - move("dist/Gajim.app/Contents/Frameworks/Python.framework", - "dist/Gajim.app/Contents/Python.framework") - rmtree("dist/Gajim.app/Contents/Frameworks") - mkdir("dist/Gajim.app/Contents/Frameworks") - move("dist/Gajim.app/Contents/Python.framework", - "dist/Gajim.app/Contents/Frameworks/Python.framework") - # Adjust the running of the app - move("dist/Gajim.app/Contents/MacOS/Gajim", - "dist/Gajim.app/Contents/MacOS/Gajim.bin") - writeScript("dist/Gajim.app/Contents/MacOS/Gajim", GAJIM_SCRIPT) - # Setup the gajim-remote script - writeScript("dist/Gajim.app/Contents/MacOS/gajim-remote", - GAJIM_REMOTE_SCRIPT) - # Touch the top dir so Finder knows to update its idea of this bundle - utime("dist/Gajim.app", None) - return - - -def distApp(): - force(lambda:rmtree("dist/Gajim")) - force(lambda:rmtree("dist/Gajim.tar.bz2")) - mkdir("dist/Gajim") - check(system("tar -cf - -C dist Gajim.app | tar -xf - -C dist/Gajim")) - copy("README.osx", "dist/Gajim/README") - copy("TODO.osx", "dist/Gajim/TODO") - check(system("tar -C dist -jcf dist/Gajim-OSX-`date | awk '{printf(\"%s-%s-%s\", $6, $2, $3);}'`.tar.bz2 Gajim")) - rmtree("dist/Gajim") - return - - - -### -### Start -### -if ((len(sys.argv) != 2) or ((sys.argv[1] != "build") and - (sys.argv[1] != "dist"))): - print "usage: python setup_osx.py [build]" - print " or: python setup_osx.py [dist]" - sys.exit(1) -elif sys.argv[1] == "build": - sys.argv[1] = "py2app" - cleanup() - stageInstall() - buildApp() - finishApp() -elif sys.argv[1] == "dist": - distApp() -""" -Usage: - python setup_osx.py [build | dist] -""" - -from setuptools import setup -import sys, glob, os, commands, types -from os import system, unlink, symlink, getcwd, mkdir, utime -from shutil import move, copy, copytree, rmtree - -### -### Globals -### - -GTK_DIR="/Library/Frameworks/GTK+.framework/Versions/Current" -NAME = 'Gajim' -VERSION = '0.11' -DESCRIPTION = 'A full featured Jabber client' -AUTHOR = 'Gajim Development Team' -URL = 'http://www.gajim.org/' -DOWNLOAD_URL = 'http://www.gajim.org/downloads.php' -LICENSE = 'GPL' -PWD = getcwd() -APP_RS = "dist/Gajim.app/Contents/Resources" - -GAJIM_SCRIPT = \ -'#!/bin/bash \n\ -export DYLD_LIBRARY_PATH=%s/lib \n\ -export PATH=%s/bin:$PATH \n\ -exec ${0}.bin \n\ -' % (GTK_DIR, GTK_DIR) +' % (GTK_DIR, GTK_DIR, GTK_DIR, GTK_DIR) GAJIM_REMOTE_SCRIPT = \ '#!/bin/bash \n\ @@ -303,6 +123,22 @@ def buildApp(): return +def setupPrep(): + copy("src/osx/prep_py2app.py", APP_RS) + move("dist/Gajim.app/Contents/Resources/__boot__.py", + "dist/Gajim.app/Contents/Resources/__boot__.py.org") + new = file("dist/Gajim.app/Contents/Resources/__boot__.py", "w+") + org = file("dist/Gajim.app/Contents/Resources/__boot__.py.org") + for line in org: + new.write(line) + if (('site.addsitedir' in line) and ('Python' in line)): + new.write(" import prep_py2app\n") + new.close() + org.close() + unlink("dist/Gajim.app/Contents/Resources/__boot__.py.org") + return + + def finishApp(): # setup gajim dirs copytree("build/inst/share/gajim/data", APP_RS + "/data") @@ -323,6 +159,7 @@ def finishApp(): move("dist/Gajim.app/Contents/MacOS/Gajim", "dist/Gajim.app/Contents/MacOS/Gajim.bin") writeScript("dist/Gajim.app/Contents/MacOS/Gajim", GAJIM_SCRIPT) + setupPrep() # Setup the gajim-remote script writeScript("dist/Gajim.app/Contents/MacOS/gajim-remote", GAJIM_REMOTE_SCRIPT) @@ -354,6 +191,7 @@ if ((len(sys.argv) != 2) or ((sys.argv[1] != "build") and sys.exit(1) elif sys.argv[1] == "build": sys.argv[1] = "py2app" + sys.argv.append('--use-pythonpath') cleanup() stageInstall() buildApp() diff --git a/src/gajim.py b/src/gajim.py index 51d616106..6954e764f 100755 --- a/src/gajim.py +++ b/src/gajim.py @@ -30,12 +30,6 @@ import sys import os import urllib -if sys.platform == 'darwin': - OSX_FRAMEWORK='/Library/Frameworks/GTK+.framework/Versions/Current' - sys.path.append('%s/lib/python2.5/site-packages' % OSX_FRAMEWORK) - sys.path.append('%s/lib/python2.5/site-packages/gtk-2.0' % OSX_FRAMEWORK) - os.environ['PATH'] = '%s/bin:' % OSX_FRAMEWORK + os.environ['PATH'] - import logging consoleloghandler = logging.StreamHandler() consoleloghandler.setLevel(1) diff --git a/src/osx/prep_py2app.py b/src/osx/prep_py2app.py new file mode 100644 index 000000000..dfe087d40 --- /dev/null +++ b/src/osx/prep_py2app.py @@ -0,0 +1,23 @@ +### Adjust the sys.path so that the site-packages.zip is before the lib-dynload +### so that the osx/__init__.py in the .zip is read before looking for it in the +### lib-dynload/osx dir where the .so's are. + +import sys + +py = -1 +lib_dyn = -1 +site_zip = -1 +for index in xrange(len(sys.path)): + if 'Contents/Resources' in sys.path[index]: + if sys.path[index].endswith('lib/python2.5'): + py = index + if sys.path[index].endswith('lib-dynload'): + lib_dyn = index + elif sys.path[index].endswith('site-packages.zip'): + site_zip = index +if ((lib_dyn > -1) and (site_zip > -1)): + tmp = sys.path[lib_dyn] + sys.path[lib_dyn] = sys.path[site_zip] + sys.path[site_zip] = tmp +if py > -1: + del sys.path[py]