Merge lp:~xnox/ubiquity/parallel into lp:ubiquity

[Dimitri John Ledkov]

[Dimitri John Ledkov (xnox)]

meh

review: Disapprove

[Dimitri John Ledkov (xnox)]

The development of ubiquity has moved to git, still hosted on launchpad. If this merge proposal is still relevant, please resubmit it against the git branches found at https://code.launchpad.net/ubiquity

Sorry for any inconvenience caused.

review: Needs Resubmitting

Unmerged revisions

5953. By Dimitri John Ledkov on 2013-07-09

Use GNU parallel, to speed up d-i build and checks.

=== modified file 'd-i/Makefile'
--- d-i/Makefile	2010-02-12 20:27:37 +0000
+++ d-i/Makefile	2013-07-09 14:21:27 +0000
@@ -4,6 +4,14 @@
 LISTDIR := lists
 SOURCEDIR := source
 
+ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+else
+NUMJOBS = 1
+endif
+
+PARALLEL = parallel --gnu -k -j $(NUMJOBS)
+
 ifndef DEB_HOST_ARCH
 DEB_HOST_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH)
 endif
@@ -36,34 +44,19 @@
 	rm -rf $(SOURCEDIR)
 
 build:
-	set -e; for package in $(PACKAGES); do \
-		if [ -d "$(SOURCEDIR)/$$package" ]; then \
-			(cd "$(SOURCEDIR)/$$package" && \
-			 debian/rules build) || exit 1; \
-		fi; \
-	done
+	$(PARALLEL) make -f debian/rules -C $(SOURCEDIR)/{} build ::: $(PACKAGES)
 
 clean:
 	rm -rf $(APTDIR)
-	for dir in $(SOURCEDIR)/*; do \
-		if [ "$${dir##*/}" != console-setup ] && [ -d "$$dir" ]; then \
-			(cd "$$dir" && debian/rules clean) || exit 1; \
-		fi; \
-	done
+	$(PARALLEL) make -f debian/rules -C {} clean ::: $(filter-out $(SOURCEDIR)/console-setup $(SOURCEDIR)/README, $(wildcard $(SOURCEDIR)/*))
 	$(MAKE) -C $(SOURCEDIR)/console-setup/Keyboard clean
 	rm -f $(SOURCEDIR)/*.deb $(SOURCEDIR)/*.udeb
 	rm -f manifest.old
 	rm -rf udeb-control templates
 
 install:
-	set -e; for package in $(PACKAGES); do \
-		if [ -d "$(SOURCEDIR)/$$package" ]; then \
-			(export NO_PKG_MANGLE=1; \
-			 cd "$(SOURCEDIR)/$$package" && \
-			 debian/rules binary && \
-			 rm -rf debian/*/DEBIAN) || exit 1; \
-		fi; \
-	done
+	$(PARALLEL) 'export NO_PKG_MANGLE=1 && make -f debian/rules -C $(SOURCEDIR)/{} binary' ::: $(PACKAGES)
+	$(PARALLEL) rm -rf $(SOURCEDIR)/{}/debian/*/DEBIAN ::: $(PACKAGES)
 	rm -rf udeb-control templates
 	mkdir -p udeb-control
 	set -e; for udeb in $(SOURCEDIR)/*.udeb; do \
 
=== modified file 'd-i/update-control'
--- d-i/update-control	2013-07-01 11:32:25 +0000
+++ d-i/update-control	2013-07-09 14:21:27 +0000
@@ -52,6 +52,7 @@
     'liblocale-gettext-perl',
     'gobject-introspection',
     'pep8',
+    'parallel',
     'pkg-config',
     'po-debconf (>= 1.0)',
     'pyflakes (>= 0.7.2)',
 
=== modified file 'debian/changelog'
--- debian/changelog	2013-07-09 11:22:26 +0000
+++ debian/changelog	2013-07-09 14:21:27 +0000
@@ -1,3 +1,9 @@
+ubiquity (2.15.9ubuntu1) UNRELEASED; urgency=low
+
+  * Use GNU parallel, to speed up d-i build and checks.
+
+ -- Dmitrijs Ledkovs <[e-mail]>  Tue, 09 Jul 2013 15:18:48 +0100
+
 ubiquity (2.15.9) saucy; urgency=low
 
   [ Dmitrijs Ledkovs ]
 
=== modified file 'debian/control'
--- debian/control	2013-07-01 11:32:25 +0000
+++ debian/control	2013-07-09 14:21:27 +0000
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Ubuntu Installer Team <[e-mail]>
 Uploaders: Colin Watson <[e-mail]>, Evan Dandrea <[e-mail]>
-Build-Depends: apt, autopoint, bf-utf-source, dctrl-tools, debconf (>= 1.5.43), debconf-utils, debhelper (>= 9), devio, dh-autoreconf, dh-di (>= 3), dpkg-dev (>= 1.15.7), gir1.2-gnomekeyring-1.0, gir1.2-soup-2.4, gir1.2-timezonemap-1.0, gir1.2-webkit-3.0, gir1.2-xkl-1.0, gnome-icon-theme, gobject-introspection, intltool (>= 0.40.0), intltool-debian (>= 0.30+20040212), iso-codes, isoquery, keymapper (>= 0.5.3-7), libbogl-dev, libcairo2-dev, libdebconfclient0-dev (>= 0.68), libdebian-installer4-dev (>= 0.76), libgirepository1.0-dev, libglib2.0-dev, libgtk-3-dev, libindicator3-dev, libiw-dev (>= 27+28pre9), liblocale-gettext-perl, libparted-dev, libparted0-dev (>= 2.2), locales, pep8, pkg-config, po-debconf (>= 1.0), pyflakes (>= 0.7.2), python-gi-dev, python-scour, python3-all (>= 3.1), python3-apt (>= 0.7.100.3~), python3-cairo, python3-dbus, python3-gi, python3-gi-cairo, python3-mock (>= 0.7.0), python3-oauthlib, python3-pyicu (>= 1.0), tzdata, ubuntu-artwork, udev, wget, xkb-data (>= 0.9), xkb-data-i18n, xvfb
+Build-Depends: apt, autopoint, bf-utf-source, dctrl-tools, debconf (>= 1.5.43), debconf-utils, debhelper (>= 9), devio, dh-autoreconf, dh-di (>= 3), dpkg-dev (>= 1.15.7), gir1.2-gnomekeyring-1.0, gir1.2-soup-2.4, gir1.2-timezonemap-1.0, gir1.2-webkit-3.0, gir1.2-xkl-1.0, gnome-icon-theme, gobject-introspection, intltool (>= 0.40.0), intltool-debian (>= 0.30+20040212), iso-codes, isoquery, keymapper (>= 0.5.3-7), libbogl-dev, libcairo2-dev, libdebconfclient0-dev (>= 0.68), libdebian-installer4-dev (>= 0.76), libgirepository1.0-dev, libglib2.0-dev, libgtk-3-dev, libindicator3-dev, libiw-dev (>= 27+28pre9), liblocale-gettext-perl, libparted-dev, libparted0-dev (>= 2.2), locales, parallel, pep8, pkg-config, po-debconf (>= 1.0), pyflakes (>= 0.7.2), python-gi-dev, python-scour, python3-all (>= 3.1), python3-apt (>= 0.7.100.3~), python3-cairo, python3-dbus, python3-gi, python3-gi-cairo, python3-mock (>= 0.7.0), python3-oauthlib, python3-pyicu (>= 1.0), tzdata, ubuntu-artwork, udev, wget, xkb-data (>= 0.9), xkb-data-i18n, xvfb
 Standards-Version: 3.9.4
 X-Python3-Version: >= 3.1
 XS-Testsuite: autopkgtest
 
=== modified file 'debian/rules'
--- debian/rules	2013-06-12 16:41:04 +0000
+++ debian/rules	2013-07-09 14:21:27 +0000
@@ -43,13 +43,11 @@
 
 check:
 	# Sanity-check before upload.
-	find -name debian -prune -o -name \*.py -print | xargs py3compile
+	find -name debian -prune -o -name \*.py -print | parallel --gnu py3compile
 	find -type f \( -name \*.pyc -o -name \*.pyo \) -print0 | xargs -0r rm -f
 	find -name __pycache__ -print0 | xargs -0r rm -rf
 	# Check the syntax of any shell scripts.
-	set -e; for x in $$(find -type f \! -name \*.po \! -name \*.pot -print0 | xargs -0 file -i | grep "text/x-shellscript" | cut -d':' -f1); do \
-		sh -n $$x; \
-	done
+	find -type f \! -name \*.po \! -name \*.pot -print0 | xargs -0 file -i | grep "text/x-shellscript" | cut -d':' -f1 | parallel --gnu sh -n
 	# Check the syntax of any Python scripts.
 	./tests/run-pyflakes
 	./tests/run-pep8