Merge lp:~ockham-razor/unity-lens-bliss/distutils into lp:unity-lens-bliss

[Bernhard Reiter]

Switch from autotools to distutils. This almost certainly will require some (or a lot) more polishing, but I hope we'll get there.

[lp:~ockham-razor/unity-lens-bliss/distutils]

38. By Bernhard Reiter on 2011-12-07

Use get_config_var to determine values for datarootdir and libexecdir substitution variables.

39. By Bernhard Reiter on 2011-12-12

Move unity-bliss-daemon back to data_files, and fix libexecdir argument.

40. By Bernhard Reiter on 2011-12-12

Fix check if running from source tree to finding setup.py instead of configure.ac

Unmerged revisions

40. By Bernhard Reiter on 2011-12-12

Fix check if running from source tree to finding setup.py instead of configure.ac

39. By Bernhard Reiter on 2011-12-12

Move unity-bliss-daemon back to data_files, and fix libexecdir argument.

38. By Bernhard Reiter on 2011-12-07

Use get_config_var to determine values for datarootdir and libexecdir substitution variables.

37. By Bernhard Reiter on 2011-12-07

Add unity-lens-bliss to MANIFEST.in

36. By Bernhard Reiter on 2011-12-07

Move AUTHORS et al to MANIFEST.in

35. By Bernhard Reiter on 2011-12-07

Fix indentation

34. By Bernhard Reiter on 2011-12-07

Comment out stuff that goes to etc

33. By Bernhard Reiter on 2011-12-07

Install unity-bliss-daemon as a script instead of a data_file

32. By Bernhard Reiter on 2011-12-07

Install bliss/ directory contents as a package, not as data_files.

31. By Bernhard Reiter on 2011-12-07

from DistUtilsExtra.command import s/*/build_extra/

=== added file 'MANIFEST.in'
--- MANIFEST.in	1970-01-01 00:00:00 +0000
+++ MANIFEST.in	2011-12-12 19:47:27 +0000
@@ -0,0 +1,2 @@
+include AUTHORS COPYING NEWS README
+include data/unity-lens-bliss.menu

=== removed file 'Makefile.am'
--- Makefile.am	2011-11-03 13:47:07 +0000
+++ Makefile.am	1970-01-01 00:00:00 +0000
@@ -1,72 +0,0 @@
-NULL = 
-
-EXTRA_DIST = \
-  bin/unity-bliss-daemon.in \
-  data/bliss.lens.in \
-  data/bliss-lens.svg \
-  data/unity-lens-bliss.menu.in \
-  data/unity-lens-bliss.service.in \
-  $(docs_DATA) \
-  $(NULL)
-
-DISTCLEANFILES = 
-
-DISTCHECK_CONFIGURE_FLAGS = 
-
-######################################################
-# Documents
-######################################################
-docsdir = $(datadir)/doc/unity-lens-bliss
-docs_DATA = \
-  AUTHORS \
-  ChangeLog \
-  COPYING \
-  NEWS \
-  README \
-  $(NULL)
-
-######################################################
-# Lens code
-######################################################
-lensdir = $(datadir)/unity-lens-bliss/bliss
-lens_PYTHON = \
-  bliss/__init__.py \
-  bliss/apps.py \
-  $(NULL)
-
-libexec_SCRIPTS = \
-  bin/unity-bliss-daemon \
-  $(NULL)
-
-######################################################
-# Unity .lens file
-######################################################
-dotlensdir = $(datadir)/unity/lenses/bliss
-dotlens_DATA = \
-  data/bliss.lens \
-  $(NULL)
-
-######################################################
-# Icons
-######################################################
-iconsdir = $(datadir)/unity-lens-bliss
-icons_DATA = \
-  data/bliss-lens.svg \
-  $(NULL)
-
-######################################################
-# DBus .service file
-######################################################
-dbusdir = $(datadir)/dbus-1/services
-dbus_DATA = \
-  data/unity-lens-bliss.service \
-  $(NULL)
-
-######################################################
-# XDG .menu file
-######################################################
-menudir = $(sysconfdir)/xdg/menus
-menu_DATA = \
-  data/unity-lens-bliss.menu \
-  $(NULL)
-

=== modified file 'README'
--- README	2011-11-03 13:47:07 +0000
+++ README	2011-12-12 19:47:27 +0000
@@ -12,11 +12,7 @@
 
 Install with:
 
-  ./configure --prefix=/usr --sysconfdir=/etc && make && sudo make install
-
-or if you checked the code out from a bazaar branch:
-
-  ./autogen.sh --prefix=/usr --sysconfdir=/etc  && make && sudo make install
+  python setup.py --prefix=/usr
 
 RESOURCES
 ---------
@@ -30,10 +26,3 @@
 instrumented by the executable found in bin/unity-bliss-daemon. The executable
 is launched indirectly by the Unity shell via DBus activation when needed.
 
-To simplify the build this project is set up with "non-recursive automake"
-which is not completely standard (yet?), but is much easier to work with than
-the normal recursive approach. In recursive automake setups each subdirectory
-must contain a Makefile.am, in our non-recursive setup we only have a single
-Makewfile.am at the top of the source tree.
-
-

=== removed file 'acinclude.m4'
--- acinclude.m4	2011-11-03 14:55:33 +0000
+++ acinclude.m4	1970-01-01 00:00:00 +0000
@@ -1,40 +0,0 @@
-dnl AS_AC_EXPAND(VAR, CONFIGURE_VAR)
-dnl
-dnl example
-dnl AS_AC_EXPAND(SYSCONFDIR, $sysconfdir)
-dnl will set SYSCONFDIR to /usr/local/etc if prefix=/usr/local
-
-AC_DEFUN([AS_AC_EXPAND],
-[
-  EXP_VAR=[$1]
-  FROM_VAR=[$2]
-
-  dnl first expand prefix and exec_prefix if necessary
-  prefix_save=$prefix
-  exec_prefix_save=$exec_prefix
-
-  dnl if no prefix given, then use /usr/local, the default prefix
-  if test "x$prefix" = "xNONE"; then
-    prefix=$ac_default_prefix
-  fi
-  dnl if no exec_prefix given, then use prefix
-  if test "x$exec_prefix" = "xNONE"; then
-    exec_prefix=$prefix
-  fi
-
-  full_var="$FROM_VAR"
-  dnl loop until it doesn't change anymore
-  while true; do
-    new_full_var="`eval echo $full_var`"
-    if test "x$new_full_var"="x$full_var"; then break; fi
-    full_var=$new_full_var
-  done
-
-  dnl clean up
-  full_var=$new_full_var
-  AC_SUBST([$1], "$full_var")
-
-  dnl restore prefix and exec_prefix
-  prefix=$prefix_save
-  exec_prefix=$exec_prefix_save
-])

=== removed file 'autogen.sh'
--- autogen.sh	2011-11-03 11:34:31 +0000
+++ autogen.sh	1970-01-01 00:00:00 +0000
@@ -1,13 +0,0 @@
-#!/bin/sh
-
-srcdir=`dirname $0`
-
-PKG_NAME="unity-lens-bliss"
-
-which gnome-autogen.sh || {
-        echo "You need gnome-common from the GNOME Git repository"
-        exit 1
-}
-
-USE_GNOME2_MACROS=1 \
-. gnome-autogen.sh

=== modified file 'bin/unity-bliss-daemon'
--- bin/unity-bliss-daemon	2011-11-03 13:47:07 +0000
+++ bin/unity-bliss-daemon	2011-12-12 19:47:27 +0000
@@ -4,7 +4,7 @@
 # of the source tree, otherwise point at the installed code
 import sys, os
 execpath = os.path.dirname(__file__)
-if os.path.isfile(os.path.join(execpath, "..", "configure.ac")):
+if os.path.isfile(os.path.join(execpath, "..", "setup.py")):
     print "Running from source tree"
     sys.path.insert (0, os.path.join(execpath, ".."))
 else:

=== modified file 'bin/unity-bliss-daemon.in'
--- bin/unity-bliss-daemon.in	2011-11-03 14:56:53 +0000
+++ bin/unity-bliss-daemon.in	2011-12-12 19:47:27 +0000
@@ -4,7 +4,7 @@
 # of the source tree, otherwise point at the installed code
 import sys, os
 execpath = os.path.dirname(__file__)
-if os.path.isfile(os.path.join(execpath, "..", "configure.ac")):
+if os.path.isfile(os.path.join(execpath, "..", "setup.py")):
     print "Running from source tree"
     sys.path.insert (0, os.path.join(execpath, ".."))
 else:

=== removed file 'configure.ac'
--- configure.ac	2011-11-04 10:01:38 +0000
+++ configure.ac	1970-01-01 00:00:00 +0000
@@ -1,34 +0,0 @@
-# When releasing also remember to update the soname as instructed below
-AC_INIT(unity-lens-bliss, 0.1.3, https://launchpad.net/unity-lens-bliss)
-AM_INIT_AUTOMAKE([subdir-objects])
-AM_PATH_PYTHON
-
-AC_PREREQ(2.59)
-
-# Variables to escape in .in files
-AS_AC_EXPAND(PREFIX, $prefix)
-AC_SUBST(PREFIX)
-
-AS_AC_EXPAND(DATADIR, $datarootdir)
-AC_SUBST(DATADIR)
-
-AS_AC_EXPAND(LIBEXECDIR, $libexecdir)
-AC_SUBST(LIBEXECDIR)
-
-AC_OUTPUT([
-bin/unity-bliss-daemon
-data/bliss.lens
-data/unity-lens-bliss.menu
-data/unity-lens-bliss.service
-Makefile
-])
-
-AC_MSG_NOTICE([
-
-  unity-lens-bliss
-  --------------------
-
-  Prefix           : ${prefix}
-
-])
-

=== modified file 'data/bliss.lens.in'
--- data/bliss.lens.in	2011-11-03 12:32:19 +0000
+++ data/bliss.lens.in	2011-12-12 19:47:27 +0000
@@ -2,7 +2,7 @@
 DBusName=net.launchpad.UnityLensBliss.Lens
 DBusPath=/net/launchpad/unitylensbliss/lens
 Name=Apps Lens
-Icon=@DATADIR@/unity-lens-bliss/bliss-lens.svg
+Icon=$datarootdir/unity-lens-bliss/bliss-lens.svg
 Description=Easily find and launch apps
 SearchHint=Type to search
 Shortcut=a

=== modified file 'data/unity-lens-bliss.service.in'
--- data/unity-lens-bliss.service.in	2011-11-03 15:33:52 +0000
+++ data/unity-lens-bliss.service.in	2011-12-12 19:47:27 +0000
@@ -1,3 +1,3 @@
 [D-BUS Service]
 Name=net.launchpad.UnityLensBliss.Lens
-Exec=@LIBEXECDIR@/unity-bliss-daemon
+Exec=$libexecdir/unity-bliss-daemon

=== added file 'setup.py'
--- setup.py	1970-01-01 00:00:00 +0000
+++ setup.py	2011-12-12 19:47:27 +0000
@@ -0,0 +1,41 @@
+#!/usr/bin/env python
+#
+from distutils.core import setup
+from distutils.util import subst_vars
+from distutils.sysconfig import get_config_var
+from DistUtilsExtra.command import build_extra
+from os import remove
+
+files = [#'bin/unity-bliss-daemon', 
+         'data/bliss.lens',
+         'data/unity-lens-bliss.menu',
+         'data/unity-lens-bliss.service']
+
+for filename in files:
+    o = open(filename,"w")
+    for line in open(filename + '.in'):
+        line = subst_vars(line, {'datarootdir': get_config_var('datarootdir'),
+                                 'libexecdir':  get_config_var('LIBDIR') + '/unity-lens-bliss'})
+        o.write(line)
+    o.close()
+
+setup(name="unity-lens-bliss",
+    version="0.1.3",
+    author="Mikkel Kamstrup Erlandsen",
+    author_email="[e-mail]",
+    url="http://launchpad.net/unity-lens-bliss",
+    license="GNU General Public License Version 3 (GPLv3)",
+    description="Simple Applications Lens for Unity",
+    long_description="This is a very simple implementation of an apps lens for Unity. It can be used as a replacement for the default apps lens if you want something simpler, or it can be used as a solid starting point for writing your own lens.",
+    packages=['bliss'],
+    data_files=[
+      ('lib/unity-lens-bliss', ['bin/unity-bliss-daemon']),
+      ('share/unity/lenses/bliss', ['data/bliss.lens']),
+      ('share/dbus-1/services', ['data/unity-lens-bliss.service']),
+      ('share/unity-lens-bliss', ['data/bliss-lens.svg']),
+    ],
+    cmdclass = { "build" :  build_extra.build_extra }
+)
+
+for filename in files:
+    remove(filename)