INSTALL | 38 +++++++ MANIFEST.in | 2 Makefile | 11 ++ Makefile.am | 8 - NEWS | 15 +++ VERSION | 2 acinclude.m4 | 141 ---------------------------- autogen.sh | 16 --- configure.ac | 46 --------- debian/changelog | 17 +++ debian/compat | 2 debian/control | 18 ++- debian/install | 1 debian/patches/01-fix-extension-dir.patch | 18 +++ debian/patches/series | 1 debian/pyversions | 1 debian/rules | 110 +--------------------- debian/source/format | 1 debian/source/local-options | 2 debian/watch | 4 setup.py | 149 ++++++++++++++++++++++++++++++ src/Makefile.am | 17 --- src/compizconfig.pyx | 120 ++++++------------------ 23 files changed, 306 insertions(+), 434 deletions(-)
New commits: commit 4e63c660658060df65f41710755e2c3ce8b3b7ca Author: Sean Finney <[email protected]> Date: Sat Mar 5 23:24:04 2011 +0000 Prepare changelog for upload diff --git a/debian/changelog b/debian/changelog index ef264a8..c138ec2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -compizconfig-python (0.9.2.1-1.1) unstable; urgency=low +compizconfig-python (0.9.2.1+git20110224.5ccb653e-1) experimental; urgency=low [ Janos Guljas ] * New upstream release. @@ -10,7 +10,10 @@ compizconfig-python (0.9.2.1-1.1) unstable; urgency=low * 01-fix-extension-dir.patch - Remove Makefile so dh_python2 can install extension in a right place - -- Janos Guljas <[email protected]> Mon, 15 Nov 2010 17:41:49 +0100 + [ Sean Finney ] + * Add common 3.0 local options + + -- Sean Finney <[email protected]> Sat, 05 Mar 2011 23:22:44 +0000 compizconfig-python (0.8.4-2) unstable; urgency=low commit f8d8b7725d1ff88d6fe489e318b7d846a511c27e Author: Sean Finney <[email protected]> Date: Sun Mar 6 00:16:12 2011 +0100 Add common 3.0 local options diff --git a/debian/source/local-options b/debian/source/local-options new file mode 100644 index 0000000..9cdfca9 --- /dev/null +++ b/debian/source/local-options @@ -0,0 +1,2 @@ +unapply-patches +abort-on-upstream-changes commit 70610c30c68babf680c9468b8fc113d5f8a4a86e Author: Sean Finney <[email protected]> Date: Sun Mar 6 00:15:38 2011 +0100 Add Janos' packaging work diff --git a/debian/changelog b/debian/changelog index 979063d..ef264a8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,17 @@ +compizconfig-python (0.9.2.1-1.1) unstable; urgency=low + + [ Janos Guljas ] + * New upstream release. + * Bump standards to 3.9.1. + * Switch to dpkg format 3.0 (quilt) + * Rewrite debian/rules to use debhelper 7. + * Add debian/watch file. + * Add patch + * 01-fix-extension-dir.patch + - Remove Makefile so dh_python2 can install extension in a right place + + -- Janos Guljas <[email protected]> Mon, 15 Nov 2010 17:41:49 +0100 + compizconfig-python (0.8.4-2) unstable; urgency=low * Update Build-Depends against compiz-dev to >= 0.8.4 for ABI bump. diff --git a/debian/compat b/debian/compat index 7ed6ff8..7f8f011 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -5 +7 diff --git a/debian/control b/debian/control index 61ec250..f0cf281 100644 --- a/debian/control +++ b/debian/control @@ -2,21 +2,25 @@ Source: compizconfig-python Priority: extra Maintainer: Debian X Strike Force <[email protected]> Uploaders: Sean Finney <[email protected]> -Build-Depends: autoconf, automake1.9, autotools-dev, compiz-dev (>= 0.8.4), debhelper (>= 5), libcompizconfig-dev (>= 0.8.4), libglib2.0-dev, libtool, libxml2-dev, libxslt1-dev, python-all-dev, python-pyrex, python-support -Standards-Version: 3.7.2 -Section: x11 +Build-Depends: debhelper (>= 7.0.50~), libtool, compiz-dev (>= 0.9.0), + libglib2.0-dev, libxml2-dev, libxslt1-dev, libcompizconfig-dev (>= 0.9.0), + python-all-dev, python-pyrex, cython +Standards-Version: 3.9.1 +XS-Python-Version: >= 2.6 +Section: python +Homepage: http://www.compiz.org/ Vcs-Git: git://git.debian.org/git/pkg-xorg/bling/compizconfig-python.git Vcs-Browser: http://git.debian.org/?p=pkg-xorg/bling/compizconfig-python.git -Homepage: http://www.compiz-fusion.org Package: python-compizconfig Architecture: any Depends: ${misc:Depends}, ${python:Depends}, ${shlibs:Depends} -Description: Compizconfig bindings for python +XB-Python-Version: ${python:Versions} +Description: Compizconfig bindings for Python Compiz Fusion is the result of the re-unification of the Beryl-project and the community around the Compiz Window Manager. It seeks to provide an easy and fun-to-use windowing environment, allowing use of the graphics hardware to provide impressive effects, amazing speed and - unrivalled usefulness + unrivalled usefulness. . - This package provides python bindings for the compizconfig system. + This package provides Python bindings for the compizconfig system. diff --git a/debian/install b/debian/install deleted file mode 100644 index 12982d5..0000000 --- a/debian/install +++ /dev/null @@ -1 +0,0 @@ -usr/lib/python*/*-packages/compizconfig.so diff --git a/debian/patches/01-fix-extension-dir.patch b/debian/patches/01-fix-extension-dir.patch new file mode 100644 index 0000000..2f10023 --- /dev/null +++ b/debian/patches/01-fix-extension-dir.patch @@ -0,0 +1,18 @@ +Description: Remove Makefile so dh_python2 can install extension in a right place +Author: Janos Guljas <[email protected]> +Last-Update: 2010-11-15 + +--- a/Makefile ++++ /dev/null +@@ -1,11 +0,0 @@ +-all: +- @python setup.py build --prefix=${PREFIX} +- +-install: all +- @python setup.py install --prefix=${PREFIX} +- +-uninstall: +- @python setup.py uninstall --prefix=${PREFIX} +- +-clean: +- rm -rf build/ diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..3c5dfdd --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +01-fix-extension-dir.patch diff --git a/debian/pyversions b/debian/pyversions deleted file mode 100644 index 8b253bc..0000000 --- a/debian/pyversions +++ /dev/null @@ -1 +0,0 @@ -2.4- diff --git a/debian/rules b/debian/rules index 70788cd..5e92260 100755 --- a/debian/rules +++ b/debian/rules @@ -1,108 +1,8 @@ #!/usr/bin/make -f -# -*- makefile -*- -# Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 +%: + dh $@ --with python2 -CFLAGS = -Wall -g -ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) - CFLAGS += -O0 -else - CFLAGS += -O2 -endif - -# the following files are modified in the build process, but shouldn't be. -#UPSTREAM_PRESERVE:=po/Makefile.in.in - -# the following are generated by autoconf and have no way of being deleted -# gracefully. -AUTOFOO_DELETE:=aclocal.m4 config.guess config.h.in config.sub configure \ - depcomp install-sh intltool-extract.in intltool-merge.in \ - intltool-update.in ltmain.sh missing mkinstalldirs INSTALL - -PYVERS=$(shell pyversions -r) - -configure: configure-stamp -configure-stamp: - dh_testdir - for f in $(UPSTREAM_PRESERVE); do \ - cp -a $$f $$f.preserve; \ - done - autoreconf -v --install - for p in $(PYVERS); do \ - mkdir build-$$p; \ - ( cd build-$$p && \ - ../configure --prefix=/usr --disable-static PYTHON=$$p ); \ - ln -s ../../src/compizconfig.pyx build-$$p/src; \ - done - touch configure-stamp - -build: build-stamp -build-stamp: configure-stamp - dh_testdir - for p in $(PYVERS); do \ - $(MAKE) -C build-$$p; \ - done - touch $@ - -clean: - dh_testdir - dh_testroot - rm -f build-stamp configure-stamp - for p in $(PYVERS); do \ - rm -f build-$$p/src/compizconfig.pyx; \ - [ ! -f build-$$p/Makefile ] || $(MAKE) -C build-$$p distclean; \ - done - # clean up extra automake cruft - find . -type f -name Makefile.in -print0 | xargs -0 rm -f - rm -f $(AUTOFOO_DELETE) - for f in $(UPSTREAM_PRESERVE); do \ - if [ -f $$f.preserve ]; then \ - cp -a $$f.preserve $$f; rm -f $$f.preserve; \ - fi; \ - done - dh_clean - -install: build - dh_testdir - dh_testroot - dh_clean -k - dh_installdirs - for p in $(PYVERS); do \ - $(MAKE) -C build-$$p DESTDIR=$(CURDIR)/debian/tmp install; \ - done - # clean up some upstream cruft - find $(CURDIR)/debian/tmp -type f -name '*.la' -print0 | xargs -0 rm -f - rm -rf $(CURDIR)/debian/tmp/usr/lib/pkgconfig - -# Build architecture-independent files here. -binary-indep: build install -# We have nothing to do by default. - -# Build architecture-dependent files here. -binary-arch: build install - dh_testdir - dh_testroot -# uncomment when upstream stops shipping an entry changelog... -# dh_installchangelogs ChangeLog - dh_installchangelogs - dh_installdocs - dh_installexamples - find debian/tmp -type f -name '*.la' | xargs rm -f - rm -rf debian/tmp/usr/lib/pkgconfig - dh_install --sourcedir=debian/tmp --fail-missing - dh_pysupport - dh_installman - dh_link - dh_strip - dh_compress - dh_fixperms - dh_makeshlibs - dh_installdeb - dh_shlibdeps - dh_gencontrol - dh_md5sums - dh_builddeb - -binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install configure +override_dh_clean: + dh_clean + rm -f installed_files src/compizconfig.c diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/debian/watch b/debian/watch new file mode 100644 index 0000000..c6acd22 --- /dev/null +++ b/debian/watch @@ -0,0 +1,4 @@ +version=3 +http://releases.compiz.org/([\d\.]+)[\d]/ compizconfig-python-([\d\.]+)\.tar\.gz + + commit 5ccb653eb22428318c25b355b5143e695d33f0c7 Author: Guillaume Seguin <[email protected]> Date: Fri Feb 18 15:29:33 2011 +0800 Don't drop the stderr since it might give a message to the user that could actually be quite useful (eg, adjust PKG_CONFIG_PATH) diff --git a/setup.py b/setup.py index 1002067..a364eed 100644 --- a/setup.py +++ b/setup.py @@ -25,7 +25,7 @@ def pkgconfig(*packages, **kw): flag_map = {'-I': 'include_dirs', '-L': 'library_dirs', '-l': 'libraries', '-R': 'runtime_library_dirs'} cmd = ['pkg-config', '--libs', '--cflags'] - tokens = subprocess.Popen (cmd + list(packages), stdout=subprocess.PIPE, stderr=open(os.devnull, 'w')).communicate()[0].split () + tokens = subprocess.Popen (cmd + list(packages), stdout=subprocess.PIPE).communicate()[0].split () for t in tokens: if '-L' in t[:2]: commit c6019ee880d3e9e1ea9f0d4d01d7e9172e2ed520 Author: Sam Spilsbury <[email protected]> Date: Fri Feb 18 15:26:38 2011 +0800 Add packges and list directly diff --git a/setup.py b/setup.py index 26af394..1002067 100644 --- a/setup.py +++ b/setup.py @@ -25,10 +25,7 @@ def pkgconfig(*packages, **kw): flag_map = {'-I': 'include_dirs', '-L': 'library_dirs', '-l': 'libraries', '-R': 'runtime_library_dirs'} cmd = ['pkg-config', '--libs', '--cflags'] - for i in packages: - cmd.append (i) - - tokens = subprocess.Popen (cmd, stdout=subprocess.PIPE, stderr=open(os.devnull, 'w')).communicate()[0].split () + tokens = subprocess.Popen (cmd + list(packages), stdout=subprocess.PIPE, stderr=open(os.devnull, 'w')).communicate()[0].split () for t in tokens: if '-L' in t[:2]: commit 65a2c0115b1e784b2639dc7b12de4396f1be5d3d Author: Sam Spilsbury <[email protected]> Date: Fri Feb 18 15:10:10 2011 +0800 Adjust for subprocess syntax diff --git a/setup.py b/setup.py index 85f64eb..26af394 100644 --- a/setup.py +++ b/setup.py @@ -23,9 +23,13 @@ if "=" in version: def pkgconfig(*packages, **kw): flag_map = {'-I': 'include_dirs', '-L': 'library_dirs', '-l': 'libraries', '-R': 'runtime_library_dirs'} + cmd = ['pkg-config', '--libs', '--cflags'] + + for i in packages: + cmd.append (i) + + tokens = subprocess.Popen (cmd, stdout=subprocess.PIPE, stderr=open(os.devnull, 'w')).communicate()[0].split () - tokens = subprocess.Popen (['pkg-config', '--libs', '--cflags %s' % ' '.join (packages)], stdout=subprocess.PIPE, stderr=open(os.devnull, 'w')).communicate()[0].split () - for t in tokens: if '-L' in t[:2]: kw.setdefault (flag_map.get ("-L"), []).append (t[2:]) commit 28c6874942fb19da27d7a8aa2148956a13380902 Author: Sam Spilsbury <[email protected]> Date: Sat Feb 12 23:13:55 2011 +0800 Use subprocess instead of commands and print () instead of print because they are deprecated in Python 3.0 diff --git a/setup.py b/setup.py index 9cfb05f..85f64eb 100644 --- a/setup.py +++ b/setup.py @@ -7,7 +7,6 @@ from distutils.command.sdist import sdist as _sdist from distutils.extension import Extension import os import subprocess -import commands # If src/compizconfig.pyx exists, build using Cython if os.path.exists ("src/compizconfig.pyx"): @@ -25,7 +24,7 @@ if "=" in version: def pkgconfig(*packages, **kw): flag_map = {'-I': 'include_dirs', '-L': 'library_dirs', '-l': 'libraries', '-R': 'runtime_library_dirs'} - tokens = commands.getoutput("pkg-config --libs --cflags %s" % ' '.join(packages)).split() + tokens = subprocess.Popen (['pkg-config', '--libs', '--cflags %s' % ' '.join (packages)], stdout=subprocess.PIPE, stderr=open(os.devnull, 'w')).communicate()[0].split () for t in tokens: if '-L' in t[:2]: @@ -44,8 +43,8 @@ VERSION_FILE = os.path.join (os.path.dirname (__file__), "VERSION") pkgconfig_libs = subprocess.Popen (["pkg-config", "--libs", "libcompizconfig"], stdout=subprocess.PIPE, stderr=open(os.devnull, 'w')).communicate ()[0] if len (pkgconfig_libs) is 0: - print "CompizConfig Python [ERROR]: No libcompizconfig.pc found in the pkg-config search path" - print "Ensure that libcompizonfig is installed or libcompizconfig.pc is in your $PKG_CONFIG_PATH" + print ("CompizConfig Python [ERROR]: No libcompizconfig.pc found in the pkg-config search path") + print ("Ensure that libcompizonfig is installed or libcompizconfig.pc is in your $PKG_CONFIG_PATH") exit (1); libs = pkgconfig_libs[2:].split (" ")[0] @@ -105,7 +104,7 @@ class uninstall (_install): for counter in xrange (len (files)): files[counter] = prepend + files[counter].rstrip () for file in files: - print "Uninstalling %s" % file + print ("Uninstalling %s" % file) try: os.unlink (file) except: commit 53d5da274e4d6327b75ed233d3e6f74c8b123296 Author: Sam Spilsbury <[email protected]> Date: Sat Feb 12 23:13:08 2011 +0800 Use __cinit__ instead of __new__ since its removed in Cython 0.14 diff --git a/src/compizconfig.pyx b/src/compizconfig.pyx index d31f372..146f02b 100644 --- a/src/compizconfig.pyx +++ b/src/compizconfig.pyx @@ -570,7 +570,7 @@ cdef class Setting: cdef object extendedStrRestrictions cdef object baseStrRestrictions - def __new__ (self, Plugin plugin, name): + def __cinit__ (self, Plugin plugin, name): cdef CCSSettingType t cdef CCSSettingInfo * i @@ -674,7 +674,7 @@ cdef class Setting: cdef class SSGroup: cdef object screen - def __new__ (self, screen): + def __cinit__ (self, screen): self.screen = screen property Screen: @@ -692,7 +692,7 @@ cdef class Plugin: cdef object ranking cdef object hasExtendedString - def __new__ (self, Context context, name): + def __cinit__ (self, Context context, name): self.ccsPlugin = ccsFindPlugin (context.ccsContext, name) self.context = context self.screen = {} @@ -1007,7 +1007,7 @@ cdef class Profile: cdef Context context cdef char * name - def __new__ (self, Context context, name): + def __cinit__ (self, Context context, name): self.context = context self.name = strdup (name) @@ -1029,7 +1029,7 @@ cdef class Backend: cdef Bool profileSupport cdef Bool integrationSupport - def __new__ (self, Context context, info): + def __cinit__ (self, Context context, info): self.context = context self.name = strdup (info[0]) self.shortDesc = strdup (info[1]) @@ -1072,7 +1072,7 @@ cdef class Context: cdef object currentBackend cdef Bool integration - def __new__ (self, screenNum = 0, plugins = [], basic_metadata = False): + def __cinit__ (self, screenNum = 0, plugins = [], basic_metadata = False): cdef CCSPlugin * pl cdef CCSList * pll if basic_metadata: commit 41fb7785fdaada4611061e1c398c72183e62ffa7 Author: Sam Spilsbury <[email protected]> Date: Thu Dec 2 23:09:25 2010 +0800 Don't use tabs/spaces in the pkgconfig block diff --git a/setup.py b/setup.py index bccd0d1..9cfb05f 100644 --- a/setup.py +++ b/setup.py @@ -28,14 +28,14 @@ def pkgconfig(*packages, **kw): tokens = commands.getoutput("pkg-config --libs --cflags %s" % ' '.join(packages)).split() for t in tokens: - if '-L' in t[:2]: - kw.setdefault (flag_map.get ("-L"), []).append (t[2:]) - if not os.getenv ("COMPIZ_DISABLE_RPATH") is "1": - kw.setdefault (flag_map.get ("-R"), []).append (t[2:]) - elif '-I' in t[:2]: - kw.setdefault (flag_map.get ("-I"), []).append (t[2:]) - elif '-l' in t[:2]: - kw.setdefault (flag_map.get ("-l"), []).append (t[2:]) + if '-L' in t[:2]: + kw.setdefault (flag_map.get ("-L"), []).append (t[2:]) + if not os.getenv ("COMPIZ_DISABLE_RPATH") is "1": + kw.setdefault (flag_map.get ("-R"), []).append (t[2:]) + elif '-I' in t[:2]: + kw.setdefault (flag_map.get ("-I"), []).append (t[2:]) + elif '-l' in t[:2]: + kw.setdefault (flag_map.get ("-l"), []).append (t[2:]) return kw commit 3713fc7fd269ebcc9540dc145b70be0d9b916429 Author: Sam Spilsbury <[email protected]> Date: Sat Nov 6 20:49:06 2010 +0800 Update NEWS for 0.9.2.1 Release diff --git a/NEWS b/NEWS index 97c70ef..9b503d5 100644 --- a/NEWS +++ b/NEWS @@ -9,3 +9,7 @@ Update for libcompizconfig API changes Release 0.9.2 (2010-10-24 Sam Spilsbury <[email protected]>) ============================================================== Development release. + +Release 0.9.2.1 (2010-11-06 Sam Spilsbury <[email protected]>) +======================================================================== +Bugfix release. commit ea21e66299a881f1962fbd5e97939f7e31d09972 Author: Sam Spilsbury <[email protected]> Date: Sat Nov 6 20:40:42 2010 +0800 Update to 0.9.2.1 diff --git a/VERSION b/VERSION index f626ec2..5d08606 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -VERSION=0.9.0 +VERSION=0.9.2.1 commit d70e7b9f873484991dcf92641e12f091ce3e598d Author: Sam Spilsbury <[email protected]> Date: Sun Oct 24 22:53:22 2010 +0800 Update NEWS for 0.9.2 release diff --git a/NEWS b/NEWS index b9c231c..97c70ef 100644 --- a/NEWS +++ b/NEWS @@ -4,4 +4,8 @@ Development release. Added simple setuptools/cython based buildsystem. -Update for libcompizconfig API changes \ No newline at end of file +Update for libcompizconfig API changes + +Release 0.9.2 (2010-10-24 Sam Spilsbury <[email protected]>) +============================================================== +Development release. commit 2351cfd3c1ba1d1cc1c9b18093df8b47603a5fcc Author: Guillaume Seguin <[email protected]> Date: Sun Jul 4 03:49:21 2010 -0400 Whitespace fix diff --git a/setup.py b/setup.py index 717c93f..bccd0d1 100644 --- a/setup.py +++ b/setup.py @@ -136,11 +136,11 @@ setup ( license = "GPL", maintainer = "Guillaume Seguin", maintainer_email = "[email protected]", - cmdclass = {"uninstall" : uninstall, - "install" : install, - "install_data" : install_data, - "build_ext" : build_ext, - "sdist" : sdist}, + cmdclass = {"uninstall" : uninstall, + "install" : install, + "install_data" : install_data, + "build_ext" : build_ext, + "sdist" : sdist}, ext_modules=[ Extension ("compizconfig", [ext_module_src], **pkgconfig("libcompizconfig")) commit 3356da1785ff27286d1e476c85e7e894396623c1 Author: Guillaume Seguin <[email protected]> Date: Sun Jul 4 03:48:45 2010 -0400 Distribute C file diff --git a/setup.py b/setup.py index 1b01b65..717c93f 100644 --- a/setup.py +++ b/setup.py @@ -3,12 +3,20 @@ from distutils.core import setup from distutils.command.build import build as _build from distutils.command.install import install as _install from distutils.command.install_data import install_data as _install_data +from distutils.command.sdist import sdist as _sdist from distutils.extension import Extension -from Cython.Distutils import build_ext import os import subprocess import commands +# If src/compizconfig.pyx exists, build using Cython +if os.path.exists ("src/compizconfig.pyx"): + from Cython.Distutils import build_ext + ext_module_src = "src/compizconfig.pyx" +else: # Otherwise build directly from C source + from distutils.command.build_ext import build_ext + ext_module_src = "src/compizconfig.c" + version_file = open ("VERSION", "r") version = version_file.read ().strip () if "=" in version: @@ -103,6 +111,23 @@ class uninstall (_install): except: self.warn ("Could not remove file %s" % file) +class sdist (_sdist): + + def run (self): + # Build C file + if os.path.exists ("src/compizconfig.pyx"): + from Cython.Compiler.Main import compile as cython_compile + cython_compile ("src/compizconfig.pyx") + # Run regular sdist + _sdist.run (self) + + def add_defaults (self): + _sdist.add_defaults (self) + # Remove pyx source and add c source + if os.path.exists ("src/compizconfig.pyx"): + self.filelist.exclude_pattern ("src/compizconfig.pyx") + self.filelist.append ("src/compizconfig.c") + setup ( name = "compizconfig-python", version = version, @@ -114,9 +139,10 @@ setup ( cmdclass = {"uninstall" : uninstall, "install" : install, "install_data" : install_data, - "build_ext" : build_ext}, + "build_ext" : build_ext, + "sdist" : sdist}, ext_modules=[ - Extension ("compizconfig", ["src/compizconfig.pyx"], + Extension ("compizconfig", [ext_module_src], **pkgconfig("libcompizconfig")) ] ) commit 22b38c0469aba0e2825a75815bc29b63027d7945 Author: Sam Spilsbury <[email protected]> Date: Sun Jul 4 09:12:26 2010 +0800 Update NEWS for 0.9.0 release diff --git a/NEWS b/NEWS index e69de29..b9c231c 100644 --- a/NEWS +++ b/NEWS @@ -0,0 +1,7 @@ +Release 0.9.0 (2010-07-03 Sam Spilsbury <[email protected]>) +============================================================== +Development release. + +Added simple setuptools/cython based buildsystem. + +Update for libcompizconfig API changes \ No newline at end of file commit 02598cc4da040ad73dbd21f20ad46756a6a20b27 Author: Sam Spilsbury <[email protected]> Date: Sun Jul 4 08:13:37 2010 +0800 Add maintainer and maintainer email fields diff --git a/setup.py b/setup.py index b90dc78..1b01b65 100644 --- a/setup.py +++ b/setup.py @@ -109,6 +109,8 @@ setup ( description = "CompizConfig Python", url = "http://www.compiz.org/";, license = "GPL", + maintainer = "Guillaume Seguin", + maintainer_email = "[email protected]", cmdclass = {"uninstall" : uninstall, "install" : install, "install_data" : install_data, commit 0725bc314d268d16e2bcff6e7c16201dde9fa511 Author: Guillaume Seguin <[email protected]> Date: Sun Jul 4 02:57:16 2010 -0400 Add MANIFEST.in diff --git a/MANIFEST.in b/MANIFEST.in new file mode 100644 index 0000000..0c7af39 --- /dev/null +++ b/MANIFEST.in @@ -0,0 +1 @@ +include TODO README INSTALL AUTHORS COPYING NEWS VERSION ChangeLog commit b94163bee79e74daa2c514256b3022590bffe334 Author: Sam Spilsbury <[email protected]> Date: Sun Jul 4 08:00:22 2010 +0800 Add MANIFEST.in to get correct files for sdist and simple Makefile as a wrapper around setuptools diff --git a/MANIFEST.in b/MANIFEST.in new file mode 100644 index 0000000..25fd94f --- /dev/null +++ b/MANIFEST.in @@ -0,0 +1,2 @@ +include TODO README INSTALL AUTHORS COPYING LICENSE NEWS VERSION ChangeLog +include Makefile MANIFEST.in \ No newline at end of file diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..a86f93a --- /dev/null +++ b/Makefile @@ -0,0 +1,11 @@ +all: + @python setup.py build --prefix=${PREFIX} + +install: all + @python setup.py install --prefix=${PREFIX} + +uninstall: + @python setup.py uninstall --prefix=${PREFIX} + +clean: + rm -rf build/ commit b3a78843449903404c4729056185eb54229e40df Author: Sam Spilsbury <[email protected]> Date: Sun Jul 4 07:45:05 2010 +0800 Better version reading and update package info diff --git a/setup.py b/setup.py index ea0939f..b90dc78 100644 --- a/setup.py +++ b/setup.py @@ -9,6 +9,11 @@ import os import subprocess import commands +version_file = open ("VERSION", "r") +version = version_file.read ().strip () +if "=" in version: + version = version.split ("=")[1] + def pkgconfig(*packages, **kw): flag_map = {'-I': 'include_dirs', '-L': 'library_dirs', '-l': 'libraries', '-R': 'runtime_library_dirs'} @@ -100,7 +105,10 @@ class uninstall (_install): setup ( name = "compizconfig-python", - version = open (VERSION_FILE).read ().split ("=")[1], + version = version, + description = "CompizConfig Python", + url = "http://www.compiz.org/";, + license = "GPL", cmdclass = {"uninstall" : uninstall, "install" : install, "install_data" : install_data, commit 82de00eff013f71abb6691018c1637d4171f22df Author: Sam Spilsbury <[email protected]> Date: Sun Jul 4 07:25:16 2010 +0800 Bump version diff --git a/VERSION b/VERSION index 9b265c0..f626ec2 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -VERSION=0.8.3 +VERSION=0.9.0 commit e1f98d2e12510d6a560427f38330678ceeea45aa Author: Sam Spilsbury <[email protected]> Date: Sat Jun 19 01:17:16 2010 +0800 Add a better rpath on/off switch diff --git a/setup.py b/setup.py index bb12194..ea0939f 100644 --- a/setup.py +++ b/setup.py @@ -10,13 +10,19 @@ import subprocess import commands def pkgconfig(*packages, **kw): - if os.getenv ("COMPIZ_DISABLE_RPATH") is "1": - flag_map = {'-I': 'include_dirs', '-L': 'library_dirs', '-l': 'libraries'} - else: - flag_map = {'-I': 'include_dirs', '-L': 'library_dirs', '-l': 'libraries', '-L': 'runtime_library_dirs'} + flag_map = {'-I': 'include_dirs', '-L': 'library_dirs', '-l': 'libraries', '-R': 'runtime_library_dirs'} - for token in commands.getoutput("pkg-config --libs --cflags %s" % ' '.join(packages)).split(): - kw.setdefault(flag_map.get(token[:2]), []).append(token[2:]) + tokens = commands.getoutput("pkg-config --libs --cflags %s" % ' '.join(packages)).split() + + for t in tokens: + if '-L' in t[:2]: + kw.setdefault (flag_map.get ("-L"), []).append (t[2:]) + if not os.getenv ("COMPIZ_DISABLE_RPATH") is "1": + kw.setdefault (flag_map.get ("-R"), []).append (t[2:]) + elif '-I' in t[:2]: + kw.setdefault (flag_map.get ("-I"), []).append (t[2:]) + elif '-l' in t[:2]: + kw.setdefault (flag_map.get ("-l"), []).append (t[2:]) return kw commit c1ba6b3be1335f35a74f6d1183163d35122946b4 Author: Sam Spilsbury <[email protected]> Date: Sun Jun 6 22:45:40 2010 +0800 Added new method to get pkgconfig bits and also added COMPIZ_DISABLE_RPATH env variable diff --git a/setup.py b/setup.py index b77f1a7..bb12194 100644 --- a/setup.py +++ b/setup.py @@ -1,11 +1,24 @@ # -*- coding: utf-8 -*- from distutils.core import setup +from distutils.command.build import build as _build from distutils.command.install import install as _install from distutils.command.install_data import install_data as _install_data from distutils.extension import Extension from Cython.Distutils import build_ext import os import subprocess +import commands + +def pkgconfig(*packages, **kw): + if os.getenv ("COMPIZ_DISABLE_RPATH") is "1": + flag_map = {'-I': 'include_dirs', '-L': 'library_dirs', '-l': 'libraries'} + else: + flag_map = {'-I': 'include_dirs', '-L': 'library_dirs', '-l': 'libraries', '-L': 'runtime_library_dirs'} + + for token in commands.getoutput("pkg-config --libs --cflags %s" % ' '.join(packages)).split(): + kw.setdefault(flag_map.get(token[:2]), []).append(token[2:]) + + return kw VERSION_FILE = os.path.join (os.path.dirname (__file__), "VERSION") @@ -14,7 +27,7 @@ pkgconfig_libs = subprocess.Popen (["pkg-config", "--libs", "libcompizconfig"], if len (pkgconfig_libs) is 0: print "CompizConfig Python [ERROR]: No libcompizconfig.pc found in the pkg-config search path" print "Ensure that libcompizonfig is installed or libcompizconfig.pc is in your $PKG_CONFIG_PATH" - + exit (1); libs = pkgconfig_libs[2:].split (" ")[0] INSTALLED_FILES = "installed_files" @@ -82,14 +95,13 @@ class uninstall (_install): setup ( name = "compizconfig-python", version = open (VERSION_FILE).read ().split ("=")[1], - ext_modules=[ - Extension ("compizconfig", ["src/compizconfig.pyx"], - library_dirs = [libs], - libraries = ["compizconfig"]) - ], cmdclass = {"uninstall" : uninstall, "install" : install, "install_data" : install_data, - "build_ext" : build_ext} + "build_ext" : build_ext}, + ext_modules=[ + Extension ("compizconfig", ["src/compizconfig.pyx"], + **pkgconfig("libcompizconfig")) + ] ) commit 40815af866d1543d6ad44d0c84c9a731fc9d8c92 Author: Dominique Leuenberger <[email protected]> Date: Sun Jun 6 15:12:20 2010 +0200 No RPATH to a relative path. In fact, we link to libcompizconfig.so.0, which typically is in %libdir diff --git a/setup.py b/setup.py index 3dafd0a..b77f1a7 100644 --- a/setup.py +++ b/setup.py @@ -85,7 +85,6 @@ setup ( ext_modules=[ Extension ("compizconfig", ["src/compizconfig.pyx"], library_dirs = [libs], - runtime_library_dirs = [libs], libraries = ["compizconfig"]) ], cmdclass = {"uninstall" : uninstall, commit 0234e60ccd7f20e69c6466bd15a841ad799ee6e3 Author: Sam Spilsbury <[email protected]> Date: Sun May 23 23:19:52 2010 +0800 Pick up bits of the ccsm buildsystem, particularly uninstall support diff --git a/setup.py b/setup.py index 54a12ab..3dafd0a 100644 --- a/setup.py +++ b/setup.py @@ -1,5 +1,7 @@ # -*- coding: utf-8 -*- from distutils.core import setup +from distutils.command.install import install as _install +from distutils.command.install_data import install_data as _install_data from distutils.extension import Extension from Cython.Distutils import build_ext import os @@ -15,6 +17,68 @@ if len (pkgconfig_libs) is 0: libs = pkgconfig_libs[2:].split (" ")[0] +INSTALLED_FILES = "installed_files" + +class install (_install): + + def run (self): + _install.run (self) + outputs = self.get_outputs () + length = 0 + if self.root: + length += len (self.root) + if self.prefix: + length += len (self.prefix) + if length: + for counter in xrange (len (outputs)): + outputs[counter] = outputs[counter][length:] + data = "\n".join (outputs) + try: + file = open (INSTALLED_FILES, "w") + except: + self.warn ("Could not write installed files list %s" % \ + INSTALLED_FILES) + return + file.write (data) + file.close () + -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected] Archive: http://lists.debian.org/[email protected]
