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

[From: subversion at stage.maemo.org]

Author: guillem
Date: 2008-12-19 15:09:30 +0200 (Fri, 19 Dec 2008)
New Revision: 17023

Added:
   projects/haf/trunk/maemo-launcher/launcher/booster_qt.c
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/launcher/Makefile.am
Log:
Add support for a Qt booster (not built by default)

Modified: projects/haf/trunk/maemo-launcher/ChangeLog
===================================================================
--- projects/haf/trunk/maemo-launcher/ChangeLog	2008-12-19 13:09:28 UTC (rev 17022)
+++ projects/haf/trunk/maemo-launcher/ChangeLog	2008-12-19 13:09:30 UTC (rev 17023)
@@ -1,5 +1,16 @@
 2008-12-19  Guillem Jover  <guillem.jover at nokia.com>
 
+	* configure.ac: Add --enable-qt-booster.
+	* launcher/Makefile.am (booster_qt_so_SOURCES): New variable.
+	(booster_qt_so_CFLAGS): Likewise.
+	(booster_qt_so_LDFLAGS): Likewise.
+	(booster_qt_so_CPPFLAGS): Likewise.
+	(booster_qt_so_LDADD): Likewise.
+	[USE_QT_BOOSTER] (booster_PROGRAMS): Likewise.
+	* launcher/booster_qt.c: New file.
+
+2008-12-19  Guillem Jover  <guillem.jover at nokia.com>
+
 	* configure.ac: Bump version to 0.32~.
 
 2008-07-03  Guillem Jover  <guillem.jover at nokia.com>

Modified: projects/haf/trunk/maemo-launcher/configure.ac
===================================================================
--- projects/haf/trunk/maemo-launcher/configure.ac	2008-12-19 13:09:28 UTC (rev 17022)
+++ projects/haf/trunk/maemo-launcher/configure.ac	2008-12-19 13:09:30 UTC (rev 17023)
@@ -88,6 +88,30 @@
 	$BOOSTER_GTK_DEPENDS
 ])
 
+AC_ARG_ENABLE([qt-booster],
+	[AS_HELP_STRING([--enable-qt-booster],
+			[link with QT libs to reduce runtime linker time])],
+	[case "${enableval}" in
+	  (yes) qt_booster=true ;;
+	  (no)  qt_booster=false ;;
+	  (*) AC_MSG_ERROR([bad value ${enableval} for --enable-qt-booster]) ;;
+	esac], [qt_booster=false])
+AM_CONDITIONAL([USE_QT_BOOSTER], [test x$qt_booster = xtrue])
+
+BOOSTER_QT_DEPENDS="
+	QtCore
+	QtDBus
+	QtGui
+"
+if test x$qt_booster = xtrue
+then
+
+PKG_CHECK_MODULES([BOOSTER_QT], [
+	$BOOSTER_QT_DEPENDS
+])
+
+fi
+
 #
 # Test client program
 #

Modified: projects/haf/trunk/maemo-launcher/debian/changelog
===================================================================
--- projects/haf/trunk/maemo-launcher/debian/changelog	2008-12-19 13:09:28 UTC (rev 17022)
+++ projects/haf/trunk/maemo-launcher/debian/changelog	2008-12-19 13:09:30 UTC (rev 17023)
@@ -1,6 +1,7 @@
 maemo-launcher (0.32-1) UNRELEASED; urgency=low
 
   * New Upstream Release.
+    - Add support for a Qt booster (not built by default).
 
  -- Guillem Jover <guillem.jover at nokia.com>  Fri, 19 Dec 2008 14:53:59 +0200
 

Modified: projects/haf/trunk/maemo-launcher/debian/control
===================================================================
--- projects/haf/trunk/maemo-launcher/debian/control	2008-12-19 13:09:28 UTC (rev 17022)
+++ projects/haf/trunk/maemo-launcher/debian/control	2008-12-19 13:09:30 UTC (rev 17023)
@@ -7,6 +7,7 @@
  gtkhtml-dev, clinkc-dev, libosso-dev, libosso-gnomevfs2-dev (>= 2.8.0-1),
  libhildonmime-dev, libhildonhelp-dev, libhildonfm2-dev, libhildondesktop-dev,
  libhildon1-dev
+# To build the QT Booster we need libqt4-dev
 Standards-Version: 3.7.2
 
 Package: maemo-launcher

Modified: projects/haf/trunk/maemo-launcher/launcher/Makefile.am
===================================================================
--- projects/haf/trunk/maemo-launcher/launcher/Makefile.am	2008-12-19 13:09:28 UTC (rev 17022)
+++ projects/haf/trunk/maemo-launcher/launcher/Makefile.am	2008-12-19 13:09:30 UTC (rev 17023)
@@ -30,6 +30,16 @@
 booster_gtk_so_CPPFLAGS = $(BOOSTER_GTK_CFLAGS)
 booster_gtk_so_LDADD = $(BOOSTER_GTK_LIBS)
 
+if USE_QT_BOOSTER
+booster_PROGRAMS += booster-qt.so
+endif
+
+booster_qt_so_SOURCES = booster_qt.c
+booster_qt_so_CFLAGS = -fPIC
+booster_qt_so_LDFLAGS = -shared -fPIC
+booster_qt_so_CPPFLAGS = $(BOOSTER_QT_CFLAGS)
+booster_qt_so_LDADD = $(BOOSTER_QT_LIBS)
+
 bin_PROGRAMS = maemo-launcher maemo-invoker maemo-summoner
 
 pkgconfigdir = $(libdir)/pkgconfig

Added: projects/haf/trunk/maemo-launcher/launcher/booster_qt.c
===================================================================
--- projects/haf/trunk/maemo-launcher/launcher/booster_qt.c	2008-12-19 13:09:28 UTC (rev 17022)
+++ projects/haf/trunk/maemo-launcher/launcher/booster_qt.c	2008-12-19 13:09:30 UTC (rev 17023)
@@ -0,0 +1,54 @@
+/*
+ * $Id$
+ *
+ * Copyright (C) 2008 Nokia Corporation
+ *
+ * Authors: Guillem Jover <guillem.jover at nokia.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ *
+ */
+
+#include <stdio.h>
+
+#include "booster.h"
+#include "report.h"
+
+static booster_state_t
+booster_qt_preinit(int *argc, char ***argv)
+{
+  debug("booster QT module preinit (%s)\n", *argv[0]);
+
+  return NULL;
+}
+
+static void
+booster_qt_init(const char *progfilename, const booster_state_t state)
+{
+  debug("booster QT module init (%s)\n", progfilename);
+}
+
+static void
+booster_qt_reload(booster_state_t state)
+{
+  debug("booster QT module reload\n");
+}
+
+booster_api_t booster_qt_api = {
+  .booster_version = BOOSTER_API_VERSION,
+  .booster_preinit = booster_qt_preinit,
+  .booster_init = booster_qt_init,
+  .booster_reload = booster_qt_reload,
+};
+


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