[maemo-commits] [maemo-commits] r13219 - in projects/haf/trunk/maemo-launcher: . debian

[From: subversion at stage.maemo.org]

Author: guillem
Date: 2007-08-15 20:27:26 +0300 (Wed, 15 Aug 2007)
New Revision: 13219

Modified:
   projects/haf/trunk/maemo-launcher/ChangeLog
   projects/haf/trunk/maemo-launcher/README
   projects/haf/trunk/maemo-launcher/debian/changelog
   projects/haf/trunk/maemo-launcher/debian/dh_maemolauncher
Log:
Add support for DEB_BUILD_OPTIONS nolauncher.


Modified: projects/haf/trunk/maemo-launcher/ChangeLog
===================================================================
--- projects/haf/trunk/maemo-launcher/ChangeLog	2007-08-15 16:00:47 UTC (rev 13218)
+++ projects/haf/trunk/maemo-launcher/ChangeLog	2007-08-15 17:27:26 UTC (rev 13219)
@@ -1,5 +1,9 @@
 2007-08-15  Guillem Jover  <guillem.jover at nokia.com>
 
+	* README: Add support for DEB_BUILD_OPTIONS nolauncher.
+
+2007-08-15  Guillem Jover  <guillem.jover at nokia.com>
+
 	* README: Update to reflect the new debhelper script and pkg-config
 	file support.
 

Modified: projects/haf/trunk/maemo-launcher/README
===================================================================
--- projects/haf/trunk/maemo-launcher/README	2007-08-15 16:00:47 UTC (rev 13218)
+++ projects/haf/trunk/maemo-launcher/README	2007-08-15 17:27:26 UTC (rev 13219)
@@ -69,11 +69,25 @@
 Upstream Changes
 ----------------
 
-On configure.ac add something like:
+On configure.ac (or the deprecated configure.in) add something like:
 
+---X<---
+AC_ARG_ENABLE([maemo-launcher],
+              [AS_HELP_STRING([--enable-maemo-launcher],
+                              [build with maemo-launcher support])],
+                              [case "${enableval}" in
+                               yes) maemo_launcher=true ;;
+                               no)  maemo_launcher=false ;;
+                               *) AC_MSG_ERROR([bad value ${enableval} for --enable-maemo-launcher]) ;;
+                               esac], [maemo_launcher=false])
+
+if test x$maemo_launcher = xtrue
+then
 	PKG_CHECK_MODULES(MAEMO_LAUNCHER, [maemo-launcher-app])
 	AC_SUBST(MAEMO_LAUNCHER_CFLAGS)
 	AC_SUBST(MAEMO_LAUNCHER_LIBS)
+fi
+---X<---
 
 On the Makefile.am that is creating the final application binary, add to
 the application_CFLAGS variable:
@@ -97,8 +111,25 @@
 
 * debian/rules:
 
-  - Add a call to dh_maemolauncher.
+  - At the top of the file around other code processing DEB_BUILD_OPTIONS,
+    add:
 
+---X<---
+ifeq (,$(findstring nolauncher,$(DEB_BUILD_OPTIONS)))
+       conf_opt := --enable-maemo-launcher
+endif
+---X<---
+
+  - On the configure call, add $(conf_opt), so that it becomes something
+    like:
+
+---X<---
+	./configure --enable-foo --enable-bar $(conf_opt)
+---X<---
+
+  - On the binary target producing the package with launcherized files,
+    add a call to dh_maemolauncher.
+
   - Add a debian/package.launcher or debian/launcher (for sources producing
     single binary package) with the list of binaries that are being built
     with maemo-launcher support. Some example content:
@@ -108,3 +139,18 @@
 /usr/bin/application-bar
 ---X<---
 
+
+Development and testing
+=======================
+
+
+Testing w/o launcher support
+----------------------------
+
+Sometimes during development, or in some cases when bugs appear, and one
+wants to discard the launcher from the diangosis, it's useful to be able
+to disable it. This can be done by building with the following command
+line:
+
+	DEB_BUILD_OPTIONS=nolauncher dpkg-buildpackage -us -uc -b
+

Modified: projects/haf/trunk/maemo-launcher/debian/changelog
===================================================================
--- projects/haf/trunk/maemo-launcher/debian/changelog	2007-08-15 16:00:47 UTC (rev 13218)
+++ projects/haf/trunk/maemo-launcher/debian/changelog	2007-08-15 17:27:26 UTC (rev 13219)
@@ -5,6 +5,7 @@
       ApplicationDied signal. (Fixes: NB#65588)
     - Update documentation on how to integrate the launcher support into
       other projects.
+    - Add support for nolauncher on DEB_BUILD_OPTIONS to dh_maemolauncher.
 
  -- Guillem Jover <guillem.jover at nokia.com>  Wed, 15 Aug 2007 17:52:44 +0300
 

Modified: projects/haf/trunk/maemo-launcher/debian/dh_maemolauncher
===================================================================
--- projects/haf/trunk/maemo-launcher/debian/dh_maemolauncher	2007-08-15 16:00:47 UTC (rev 13218)
+++ projects/haf/trunk/maemo-launcher/debian/dh_maemolauncher	2007-08-15 17:27:26 UTC (rev 13219)
@@ -41,6 +41,11 @@
 
 =back
 
+=head1 NOTES
+
+If the DEB_BUILD_OPTIONS environment variable contains "nolauncher", no
+binary will be prepared to support maemo-launcher.
+
 =head1 EXAMPLES
 
 	dh_maemolauncher usr/bin/foo
@@ -49,6 +54,11 @@
 
 init();
 
+if (defined $ENV{DEB_BUILD_OPTIONS} &&
+    $ENV{DEB_BUILD_OPTIONS} =~ /nolauncher/) {
+	exit;
+}
+
 foreach my $package (@{$dh{DOPACKAGES}}) {
 	my $tmp = tmpdir($package);
 	my $launcher_file = pkgfile($package, "launcher");