Merge lp:~cr3/checkbox/setup_virtualenv into lp:checkbox

[Marc Tardif]

Merged support for installing in virtualenv by cr3.

Added support for installing in virtualenv.

[Daniel Manrique (roadmr)]

Looks nice! I'll just build the package to ensure we don't break anything and then merge. I'll do it manually, as I don't know if Tarmac is lurking waiting for my approval, or off on vacation on a spanish beach :D

review: Approve

[Daniel Manrique (roadmr)]

Sorry :(

sbuild fails with this error:

xgettext: error while opening "./../qt/frontend/ui_qtfront.h" for reading: No such file or directory
ERROR: xgettext failed to generate PO template file. Please consult
       error message above if there is any.
error: command 'intltool-update' failed with exit status 1
make[1]: *** [override_dh_auto_build] Error 1
make[1]: Leaving directory `/«PKGBUILDDIR»'
make: *** [build] Error 2
dpkg-buildpackage: error: debian/rules build gave error exit status 2

Apparently the qt build process is not running properly, thus the UI .h file is not being generated, and I suspect the qt binaries aren't either.

From the branch I did:

bzr-buildpackage -S

then to build the package:

sbuild -A --arch=amd64 -d quantal checkbox_0.14.10.dsc

review: Needs Fixing

[Marc Tardif (cr3)]

That's weird, works for me:

$ bzr-buildpackage -S
...
dpkg-source: info: using source format `3.0 (native)'
dpkg-source: info: building checkbox in checkbox_0.14.10.tar.gz
dpkg-source: info: building checkbox in checkbox_0.14.10.dsc
 dpkg-genchanges -S >../checkbox_0.14.10_source.changes
dpkg-genchanges: including full source code in upload
 dpkg-source --after-build checkbox-0.14.10
dpkg-buildpackage: source only upload: Debian-native package
$ sbuild -A --arch=amd64 -d quantal ../checkbox_0.14.10.dsc
...
Architecture: amd64
Build-Space: 46504
Build-Time: 49
Distribution: quantal
Install-Time: 170
Job: ../checkbox_0.14.10.dsc
Package: checkbox
Package-Time: 527
Source-Version: 0.14.10
Space: 46504
Status: successful
Version: 0.14.10
────────────────────────────────────────────────────────────────────────────────
Finished at 20121012-1006
Build needed 00:08:47, 46504k disc space

I'll look into it some more...

[Daniel Manrique (roadmr)]

This is my buildlog. I also just updated my chroots to have latest versions.

http://paste.ubuntu.com/1275030/

[Marc Tardif (cr3)]

This is my buildlog, build_i18n still works. I don't get it:

http://pastebin.ubuntu.com/1275118/

[lp:~cr3/checkbox/setup_virtualenv]

1766. By Marc Tardif on 2012-10-12

Moved building of frontend before building of i18n files.

[Marc Tardif (cr3)]

Fixed and now builds in Launchpad:

https://launchpad.net/~cr3/+archive/ppa/+packages

review: Needs Resubmitting

[Daniel Manrique (roadmr)]

Awesome, merging then. Thanks!

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2012-10-12 15:08:45 +0000
+++ debian/changelog	2012-10-12 18:50:25 +0000
@@ -2,6 +2,7 @@
 
   * Increased version number after final Ubuntu Quantal release.
 
+<<<<<<< TREE
   [Brendan Donegan]
   * jobs/suspend.txt.in - make sure FWTS logs end with .log so file names
     don't get tampered with (LP: #1065932)
@@ -20,6 +21,12 @@
     appear in the checkbox UI (LP: #1064189)
 
  -- Daniel Manrique <[e-mail]>  Fri, 12 Oct 2012 10:47:26 -0400
+=======
+  [Marc Tardif]
+  * setup.py: Added support for installing in virtualenv.
+
+ -- Daniel Manrique <[e-mail]>  Wed, 10 Oct 2012 09:45:08 -0400
+>>>>>>> MERGE-SOURCE
 
 checkbox (0.14.6) quantal; urgency=low
 

=== modified file 'debian/rules'
--- debian/rules	2012-07-13 03:09:52 +0000
+++ debian/rules	2012-10-12 18:50:25 +0000
@@ -4,7 +4,6 @@
 	dh "$@" --with python2,python3,translations
 
 override_dh_auto_build:
-	(cd qt/frontend; qmake-qt4; make)
 	set -ex; for python in $(shell py3versions -r); do \
 		$$python setup.py build; \
 	done;

=== modified file 'setup.py'
--- setup.py	2012-10-09 07:21:40 +0000
+++ setup.py	2012-10-12 18:50:25 +0000
@@ -4,6 +4,7 @@
 import re
 import errno
 import posixpath
+import subprocess
 from glob import glob
 
 from distutils.core import setup
@@ -12,7 +13,6 @@
 from distutils.ccompiler import new_compiler
 from distutils.command.build import build
 from distutils.command.clean import clean
-from distutils.command.install import install
 from distutils.command.install_data import install_data
 from distutils.command.install_scripts import install_scripts
 try:
@@ -107,6 +107,11 @@
         self.sources = extract_sources_from_data_files(data_files)
 
     def run(self):
+        errno = subprocess.call(
+            "(cd qt/frontend; qmake-qt4; make)", shell=True)
+        if errno:
+            raise SystemExit(errno)
+
         super(checkbox_build, self).run()
 
         cc = new_compiler()
@@ -141,19 +146,6 @@
                     raise
 
 
-# Hack to workaround unsupported option in Python << 2.5
-class checkbox_install(install, object):
-
-    user_options = install.user_options + [
-        ('install-layout=', None,
-         "installation layout to choose (known values: deb)")]
-
-    def initialize_options(self):
-        super(checkbox_install, self).initialize_options()
-
-        self.install_layout = None
-
-
 class checkbox_install_data(install_data, object):
 
     def finalize_options(self):
@@ -181,11 +173,11 @@
             return
 
         # Create etc directory
-        etcdir = convert_path("/etc/checkbox.d")
-        if not posixpath.isabs(etcdir):
-            etcdir = posixpath.join(self.install_dir, etcdir)
-        elif self.root:
-            etcdir = change_root(self.root, etcdir)
+        if self.install_dir == "/usr":
+            basedir = posixpath.sep
+        else:
+            basedir = self.install_dir
+        etcdir = posixpath.join(basedir, "etc", "checkbox.d")
         self.mkpath(etcdir)
 
         # Create configs symbolic link
@@ -275,7 +267,6 @@
         "build_i18n": build_i18n,
         "build_icons": checkbox_build_icons,
         "clean": checkbox_clean,
-        "install": checkbox_install,
         "install_data": checkbox_install_data,
         "install_scripts": checkbox_install_scripts}
 )