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

Thu Jul 26 19:43:43 EEST 2007

Author: guillem
Date: 2007-07-26 19:43:40 +0300 (Thu, 26 Jul 2007)
New Revision: 12859

Added:
   projects/haf/trunk/maemo-launcher/debian/dh_maemolauncher
   projects/haf/trunk/maemo-launcher/launcher/launcher.pc.in
Modified:
   projects/haf/trunk/maemo-launcher/ChangeLog
   projects/haf/trunk/maemo-launcher/configure.ac
   projects/haf/trunk/maemo-launcher/debian/changelog
   projects/haf/trunk/maemo-launcher/debian/control
   projects/haf/trunk/maemo-launcher/debian/maemo-launcher-dev.install
   projects/haf/trunk/maemo-launcher/debian/maemo-launcher.install
   projects/haf/trunk/maemo-launcher/debian/rules
   projects/haf/trunk/maemo-launcher/launcher/Makefile.am
Log:
* Add a dh_maemolauncher to automate launcherizing packages.
  - Add a Build-Depends on debhelper to maemo-launcher-dev.
  - Generate and install the manpage from the perl script.
* Add an pkgconfig file for launcherized applications. (Fixes: NB#52992)


Modified: projects/haf/trunk/maemo-launcher/ChangeLog
===================================================================

--- projects/haf/trunk/maemo-launcher/ChangeLog	2007-07-26 15:42:19 UTC (rev 12858)
+++ projects/haf/trunk/maemo-launcher/ChangeLog	2007-07-26 16:43:40 UTC (rev 12859)
@@ -1,3 +1,11 @@
+2007-07-26  Guillem Jover  <guillem.jover at nokia.com>
+
+	* launcher/Makefile.am (dist_pkgconfig_DATA): Add
+	'maemo-launcher-app.pc'.
+	* configure.ac (PIC): New variable.
+	(AC_CONFIG_FILES): Generate 'maemo-launcher-app.pc'.
+	* launcher/launcher.pc.in: New file.
+
 2007-07-25  Guillem Jover  <guillem.jover at nokia.com>
 
 	* configure.ac (HILDON_DEPENDS): Remove clinkcav, hildon-base-lib and

Modified: projects/haf/trunk/maemo-launcher/configure.ac
===================================================================
--- projects/haf/trunk/maemo-launcher/configure.ac	2007-07-26 15:42:19 UTC (rev 12858)
+++ projects/haf/trunk/maemo-launcher/configure.ac	2007-07-26 16:43:40 UTC (rev 12859)
@@ -105,6 +105,9 @@
 # Test client program
 #
 
+PIC="-fPIC"
+AC_SUBST([PIC])
+
 AC_ARG_ENABLE([pie],
 	[AS_HELP_STRING([--enable-pie],
 			[link the client as a PIE])],
@@ -140,6 +143,7 @@
 AC_CONFIG_FILES([
 	Makefile
 	launcher/Makefile
+	launcher/maemo-launcher-app.pc:launcher/launcher.pc.in
 	launcher/maemo-launcher-booster.pc:launcher/booster.pc.in
 	launcher/maemo-invoker.1:launcher/invoker.1.in
 	launcher/maemo-summoner.1:launcher/summoner.1.in

Modified: projects/haf/trunk/maemo-launcher/debian/changelog
===================================================================
--- projects/haf/trunk/maemo-launcher/debian/changelog	2007-07-26 15:42:19 UTC (rev 12858)
+++ projects/haf/trunk/maemo-launcher/debian/changelog	2007-07-26 16:43:40 UTC (rev 12859)
@@ -12,6 +12,10 @@
     - Replace hildon-fm-dev with libhildonfm2-dev.
     - Replace libossomime-dev with libhildonmime-dev.
     - Replace libhildonmenu-dev with libhildondesktop-dev.
+  * Add a dh_maemolauncher to automate launcherizing packages.
+    - Add a Build-Depends on debhelper to maemo-launcher-dev.
+    - Generate and install the manpage from the perl script.
+  * Add an pkgconfig file for launcherized applications. (Fixes: NB#52992)
 
  -- Guillem Jover <guillem.jover at nokia.com>  Wed, 21 Feb 2007 14:41:33 +0200
 

Modified: projects/haf/trunk/maemo-launcher/debian/control
===================================================================
--- projects/haf/trunk/maemo-launcher/debian/control	2007-07-26 15:42:19 UTC (rev 12858)
+++ projects/haf/trunk/maemo-launcher/debian/control	2007-07-26 16:43:40 UTC (rev 12859)
@@ -30,6 +30,7 @@
 
 Package: maemo-launcher-dev
 Architecture: all
+Depends: debhelper (>= 4)
 Description: Maemo Launcher for GTK applications - development files
  Maemo Launcher for any gtk+ application. Tries to reduce startup time by
  pre-initializing the state of some libraries and then dynamically loading

Added: projects/haf/trunk/maemo-launcher/debian/dh_maemolauncher
===================================================================
--- projects/haf/trunk/maemo-launcher/debian/dh_maemolauncher	2007-07-26 15:42:19 UTC (rev 12858)
+++ projects/haf/trunk/maemo-launcher/debian/dh_maemolauncher	2007-07-26 16:43:40 UTC (rev 12859)
@@ -0,0 +1,83 @@
+#!/usr/bin/perl
+
+=head1 NAME
+
+dh_maemolauncher - prepare a package to use maemo-launcher
+
+=cut
+
+use strict;
+use warnings;
+use Debian::Debhelper::Dh_Lib;
+
+=head1 SYNOPSIS
+
+B<dh_maemolauncher> [S<I<debhelper options>>] [S<I<shared object ...>>]
+
+=head1 DESCRIPTION
+
+dh_maemolauncher is a debhelper program that is responsible for adding
+the ${launcher:Depends} into the substvars file and creating the proper
+symlinks for launcherizable programs.
+
+Any shared object specified as parameteres will be prepared to be used
+by maemo-launcher into the first package dh_maemolauncher is told to act
+on. By default, this is the first binary package in debian/control, but
+if you use -p, -i or -a flags, it will be the first package specified by
+those flags.
+
+Files named debian/package.launcher (or debian/launcher source packages
+produging a single binary) can list other shared objects to be prepared.
+
+=head1 OPTIONS
+
+=over 4
+
+=item I<shared object ...>
+
+Prepare these shared objects to be used by the launcher. Namely, renaming
+them to use the proper extension, and symlink the original name to
+maemo-invoker.
+
+=back
+
+=head1 EXAMPLES
+
+	dh_maemolauncher usr/bin/foo
+
+=cut
+
+init();
+
+foreach my $package (@{$dh{DOPACKAGES}}) {
+	my $tmp = tmpdir($package);
+	my $launcher_file = pkgfile($package, "launcher");
+	my @binaries;
+
+	addsubstvar($package, "launcher:Depends", "maemo-launcher");
+
+	if ($launcher_file) {
+		@binaries = filearray($launcher_file, ".");
+	}
+
+	if (($package eq $dh{FIRSTPACKAGE} || $dh{PARAMS_ALL}) && @ARGV) {
+		push @binaries, @ARGV;
+	}
+
+	foreach my $so (@binaries) {
+		doit("mv", "-f", "$tmp/$so", "$tmp/$so.launch");
+		doit("ln", "-s", "/usr/bin/maemo-invoker", "$tmp/$so");
+	}
+}
+
+=head1 SEE ALSO
+
+L<debhelper(7)>
+
+This program is a part of maemo-launcher but is made to work with debhelper.
+
+=head1 AUTHOR
+
+Guillem Jover <guillem.jover at nokia.com>
+
+=cut


Property changes on: projects/haf/trunk/maemo-launcher/debian/dh_maemolauncher
___________________________________________________________________
Name: svn:executable
   + *

Modified: projects/haf/trunk/maemo-launcher/debian/maemo-launcher-dev.install
===================================================================
--- projects/haf/trunk/maemo-launcher/debian/maemo-launcher-dev.install	2007-07-26 15:42:19 UTC (rev 12858)
+++ projects/haf/trunk/maemo-launcher/debian/maemo-launcher-dev.install	2007-07-26 16:43:40 UTC (rev 12859)
@@ -1,2 +1,4 @@
+usr/bin/dh_*
 usr/include
 usr/lib/pkgconfig
+usr/share/man/man1/dh_*

Modified: projects/haf/trunk/maemo-launcher/debian/maemo-launcher.install
===================================================================
--- projects/haf/trunk/maemo-launcher/debian/maemo-launcher.install	2007-07-26 15:42:19 UTC (rev 12858)
+++ projects/haf/trunk/maemo-launcher/debian/maemo-launcher.install	2007-07-26 16:43:40 UTC (rev 12859)
@@ -1,3 +1,3 @@
-usr/bin
+usr/bin/maemo-*
 usr/lib/maemo-launcher
-usr/share
+usr/share/man/man1/maemo-*

Modified: projects/haf/trunk/maemo-launcher/debian/rules
===================================================================
--- projects/haf/trunk/maemo-launcher/debian/rules	2007-07-26 15:42:19 UTC (rev 12858)
+++ projects/haf/trunk/maemo-launcher/debian/rules	2007-07-26 16:43:40 UTC (rev 12859)
@@ -6,6 +6,8 @@
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
+POD2MAN := pod2man -c maemo-launcher
+
 CFLAGS = -g -Wall
 
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
@@ -38,6 +40,9 @@
 	dh_testdir
 	
 	$(MAKE)
+	
+	$(POD2MAN) $(CURDIR)/debian/dh_maemolauncher > \
+	           $(CURDIR)/debian/dh_maemolauncher.1
 
 clean:
 	dh_testdir
@@ -55,6 +60,11 @@
 	dh_installdirs -a
 	
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
+	
+	cp $(CURDIR)/debian/dh_maemolauncher \
+	   $(CURDIR)/debian/tmp/usr/bin
+	cp $(CURDIR)/debian/dh_maemolauncher.1 \
+	   $(CURDIR)/debian/tmp/usr/share/man/man1/
 
 binary-indep: build install
 	dh_testdir

Modified: projects/haf/trunk/maemo-launcher/launcher/Makefile.am
===================================================================
--- projects/haf/trunk/maemo-launcher/launcher/Makefile.am	2007-07-26 15:42:19 UTC (rev 12858)
+++ projects/haf/trunk/maemo-launcher/launcher/Makefile.am	2007-07-26 16:43:40 UTC (rev 12859)
@@ -33,7 +33,9 @@
 bin_PROGRAMS = maemo-launcher maemo-invoker maemo-summoner
 
 pkgconfigdir = $(libdir)/pkgconfig
-dist_pkgconfig_DATA = maemo-launcher-booster.pc
+dist_pkgconfig_DATA = \
+	maemo-launcher-app.pc \
+	maemo-launcher-booster.pc
 
 maemo_launcherdir = $(pkgincludedir)
 maemo_launcher_HEADERS = booster_api.h

Added: projects/haf/trunk/maemo-launcher/launcher/launcher.pc.in
===================================================================
--- projects/haf/trunk/maemo-launcher/launcher/launcher.pc.in	2007-07-26 15:42:19 UTC (rev 12858)
+++ projects/haf/trunk/maemo-launcher/launcher/launcher.pc.in	2007-07-26 16:43:40 UTC (rev 12859)
@@ -0,0 +1,10 @@
+#
+# $Id$
+#
+
+Name: maemo-launcher-app
+Description: maemo-launcher application startup accelerator
+Version: @VERSION@
+Libs: -shared @PIC@ -export-dynamic
+Cflags: -shared @PIC@
+


Property changes on: projects/haf/trunk/maemo-launcher/launcher/launcher.pc.in
___________________________________________________________________
Name: svn:keywords
   + Id Revision


