[maemo-commits] [maemo-commits] r13512 - projects/haf/trunk/maemo-launcher

[From: subversion at stage.maemo.org]

Author: guillem
Date: 2007-08-30 21:17:47 +0300 (Thu, 30 Aug 2007)
New Revision: 13512

Modified:
   projects/haf/trunk/maemo-launcher/ChangeLog
   projects/haf/trunk/maemo-launcher/README
Log:
Cleanup.


Modified: projects/haf/trunk/maemo-launcher/ChangeLog
===================================================================
--- projects/haf/trunk/maemo-launcher/ChangeLog	2007-08-30 17:12:03 UTC (rev 13511)
+++ projects/haf/trunk/maemo-launcher/ChangeLog	2007-08-30 18:17:47 UTC (rev 13512)
@@ -1,3 +1,7 @@
+2007-08-30  Guillem Jover  <guillem.jover at nokia.com>
+
+	* README: Cleanup.
+
 2007-08-28  Guillem Jover  <guillem.jover at nokia.com>
 
 	* launcher/comm_dbus.c (conn, comm_dbus_finish, comm_dbus_init): Merge

Modified: projects/haf/trunk/maemo-launcher/README
===================================================================
--- projects/haf/trunk/maemo-launcher/README	2007-08-30 17:12:03 UTC (rev 13511)
+++ projects/haf/trunk/maemo-launcher/README	2007-08-30 18:17:47 UTC (rev 13512)
@@ -71,24 +71,24 @@
 
 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])
+,----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<----
 
-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:
 
@@ -109,37 +109,41 @@
   - Add a "${launcher:Depends} to the "Depends:" line of the package
     containing the application to be launched.
 
-* debian/rules:
+* debian/rules (debhelper):
 
   - 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<---
+,----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<---
+,----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:
+* debian/package.launcher or debian/launcher
 
----X<---
-/usr/bin/application-foo
-/usr/bin/application-bar
----X<---
+  - Create either, depending if there's multiple binary packages being
+    build from the same source or only one.
 
+  - Add to it the list of programs that are being built with maemo-launcher
+    support. Some example content:
 
+,----X<----
+|/usr/bin/application-foo
+|/usr/bin/application-bar
+`----X<----
+
+
 Development and testing
 =======================