From 6ca8029d010c88be574d29cde8234d3dfb420d73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20=27Necoro=27=20Neumann?= Date: Fri, 2 May 2008 15:20:08 +0200 Subject: Removed _shm and now only use the one in portage; do not install catapult backend anymore --- setup.py | 116 ++------------------------------------------------------------- 1 file changed, 3 insertions(+), 113 deletions(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 112e79f..8c38d45 100644 --- a/setup.py +++ b/setup.py @@ -4,7 +4,7 @@ # File: setup.py # This file is part of the Portato-Project, a graphical portage-frontend. # -# Copyright (C) 2006-2007 René 'Necoro' Neumann +# Copyright (C) 2006-2008 René 'Necoro' Neumann # This is free software. You may redistribute copies of it under the terms of # the GNU General Public License version 2. # There is NO WARRANTY, to the extent permitted by law. @@ -15,124 +15,17 @@ import sys, os, os.path from distutils.core import setup, Extension from portato.constants import VERSION, DATA_DIR, ICON_DIR, PLUGIN_DIR, TEMPLATE_DIR -### copied from shm's setup.py ### - -import popen2 -import tempfile - -# shm makes use of the ipc_perm structure defined in include/sys/ipc.h (or include/bits/ipc.h -# on some systems). That structure includes an element called key, _key or __key depending -# on the OS. Here's the variations I've been able to find with OS version numbers where -# possible. -# key: FreeBSD 6, AIX, Solaris, OS X 10.3, OS X 10.4 (conditionally) -# _key: NetBSD, OS X 10.4 (conditionally) -# __key: Debian 4 (Etch), Ubuntu 7, RH 3.3 & 3.4 - -# OS X side note: OS X 10.4's ipc.h (see /Developer/SDKs/MacOSX10.4u.sdk/usr/include/sys/ipc.h) -# defines structs called __ipc_perm_old (which uses key) and __ipc_perm_new (which uses _key). -# Use of __ipc_perm_new is inside this: -# #if defined(__POSIX_C_SOURCE) || defined(kernel) || defined(__LP64__) -# Obviously __ipc_perm_new is the preferred version. This code doesn't use that yet but -# will probably do so in some future version when compiled on OS X >= 10.4. - -# Trying to enumerate all of the variations is a fool's errand so instead I figure it out -# on the fly using the function CountKeyUnderscores() below. - -# Lots of systems use the unadorned "key" so that's the default when I'm forced to guess. -COUNT_KEY_UNDERSCORES_DEFAULT = 0 - -def CountKeyUnderscores(): - """ Uses trial-and-error with the system's C compiler to figure out the number of - underscores preceding key in the ipc_perm structure. Returns 0, 1 or 2. In case of - error, it makes a guess and hopes for the best. - """ - UnderscoresCount = COUNT_KEY_UNDERSCORES_DEFAULT - - underscores = { } - - # mktemp isn't secure, but I don't care since I use it only for compiling this dummy code. - # Using mktemp() allows me to keep this code compatible with Python < 2.3. - path = tempfile.mktemp(dir='.') - os.mkdir(path) - if path[-1] != "/": path += '/' - - # Here I compile three mini-programs with key, _key and __key. Theoretically, - # two should fail and one should succeed, and that will tell me how this platform names - # ipc_perm.key. If the number of successes != 1, something's gone wrong. - # I use popen2.Popen4() in order to trap (and discard) stderr so that the user doesn't - # see the compiler errors I'm deliberately generating here. - src = """ -#include -int main(void) { struct ipc_perm foo; foo.%skey = 42; } - -""" - for i in range(0, 3): - # I'd prefer to feed the C source to the compiler via stdin so as to entirely avoid - # using files and directories, but I had trouble on Ubuntu getting echo to cooperate. - filename = "%d.c" % i - file(path + filename, "w").write(src % ('_' * i)) - - cmd = ["cc", "-c", "-o", "/dev/null", "%s" % path + filename] - - po = popen2.Popen4(cmd) - if not po.wait(): underscores[i] = True - - # Clean up - os.remove(path + filename) - - os.rmdir(path) - - KeyCount = len(underscores.keys()) - - if KeyCount == 1: - UnderscoresCount = underscores.keys()[0] - else: - print """ -********************************************************************* -* I was unable to detect the structure of ipc_perm on your system. * -* I'll make my best guess, but compiling might fail anyway. Please * -* email this message, the error code of %d, and the name of your OS * -* to the contact at http://NikitaTheSpider.com/python/shm/. * -********************************************************************* -""" % KeyCount - - return UnderscoresCount - - -MacrosAndDefines = [ ] - -# HAVE_UNION_SEMUN needs to be #defined on FreeBSD and OS X and must *not* be #defined -# on Linux. On other systems, I'm not sure. Please let me know if you find that you -# need to make changes for your platform. -if (sys.platform.find("bsd") != -1) or (sys.platform.find("darwin") != -1): - MacrosAndDefines.append( ('HAVE_UNION_SEMUN', None) ) - -KeyUnderscores = CountKeyUnderscores() - -if KeyUnderscores == 2: - MacrosAndDefines.append( ('TWO_UNDERSCORE_KEY', None) ) -elif KeyUnderscores == 1: - MacrosAndDefines.append( ('ONE_UNDERSCORE_KEY', None) ) -else: - MacrosAndDefines.append( ('ZERO_UNDERSCORE_KEY', None) ) - -### end copy ### - def plugin_list (*args): """Creates a list of correct plugin pathes out of the arguments.""" return [("plugins/%s.xml" % x) for x in args] -packages = ["portato", "portato.gui", "portato.gui.windows", "portato.plugins", "portato.backend", "portato.backend.portage", "portato.backend.catapult", "portato._shm"] -ext_modules = [Extension("portato._shm.shm", ["_shm/shmmodule.c"], define_macros = MacrosAndDefines, extra_compile_args=["-fPIC"])] +packages = ["portato", "portato.gui", "portato.gui.windows", "portato.plugins", "portato.backend", "portato.backend.portage"] data_files = [ (TEMPLATE_DIR, [os.path.join("portato/gui/templates",x) for x in os.listdir("portato/gui/templates") if x.endswith(".glade")]), (ICON_DIR, ["icons/portato-icon.png"]), (PLUGIN_DIR, plugin_list("dbus_init")), (DATA_DIR, ["plugin.xsd"])] -cmdclass = {} -package_dir = {"portato._shm" : "_shm"} - # do the distutils setup setup(name="Portato", version = VERSION, @@ -142,8 +35,5 @@ setup(name="Portato", author = "René 'Necoro' Neumann", author_email = "necoro@necoro.net", packages = packages, - data_files = data_files, - ext_modules = ext_modules, - cmdclass = cmdclass, - package_dir = package_dir + data_files = data_files ) -- cgit v1.2.3