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

[From: subversion at stage.maemo.org]

Author: makarhun
Date: 2009-04-07 13:20:39 +0300 (Tue, 07 Apr 2009)
New Revision: 18020

Added:
   projects/haf/trunk/maemo-launcher/launcher/booster_cpp.c
Modified:
   projects/haf/trunk/maemo-launcher/configure.ac
   projects/haf/trunk/maemo-launcher/debian/control
   projects/haf/trunk/maemo-launcher/debian/rules
   projects/haf/trunk/maemo-launcher/launcher/Makefile.am
Log:
initial cpp booster version

Modified: projects/haf/trunk/maemo-launcher/configure.ac
===================================================================
--- projects/haf/trunk/maemo-launcher/configure.ac	2009-04-06 09:33:55 UTC (rev 18019)
+++ projects/haf/trunk/maemo-launcher/configure.ac	2009-04-07 10:20:39 UTC (rev 18020)
@@ -112,6 +112,23 @@
 
 fi
 
+AC_ARG_ENABLE([cpp-booster],
+        [AS_HELP_STRING([--enable-cpp-booster],
+                        [link with libstdc++ to reduce runtime linker time])],
+        [case "${enableval}" in
+          (yes) cpp_booster=true ;;
+          (no)  cpp_booster=false ;;
+          (*) AC_MSG_ERROR([bad value ${enableval} for --enable-cpp-booster]) ;;
+        esac], [cpp_booster=false])
+AM_CONDITIONAL([USE_CPP_BOOSTER], [test x$cpp_booster = xtrue])
+
+if test x$cpp_booster = xtrue
+then
+
+AC_CHECK_LIB(stdc++, main,,AC_MSG_ERROR(gdu requires libstdc++))
+
+fi
+
 #
 # Test client program
 #

Modified: projects/haf/trunk/maemo-launcher/debian/control
===================================================================
--- projects/haf/trunk/maemo-launcher/debian/control	2009-04-06 09:33:55 UTC (rev 18019)
+++ projects/haf/trunk/maemo-launcher/debian/control	2009-04-07 10:20:39 UTC (rev 18020)
@@ -1,7 +1,7 @@
 Source: maemo-launcher
 Section: embedded
 Priority: optional
-Maintainer: Guillem Jover <guillem.jover at nokia.com>
+Maintainer: Janne Karhunen <Janne.Karhunen at nokia.com>
 Build-Depends: debhelper (>= 4.0.0), libgtk2.0-dev (>= 2.6.4-1),
  libfontconfig1-dev, libpango1.0-dev, libdbus-1-dev (>= 0.60-1),
  gtkhtml-dev, clinkc-dev, libosso-dev, libosso-gnomevfs2-dev (>= 2.8.0-1),

Modified: projects/haf/trunk/maemo-launcher/debian/rules
===================================================================
--- projects/haf/trunk/maemo-launcher/debian/rules	2009-04-06 09:33:55 UTC (rev 18019)
+++ projects/haf/trunk/maemo-launcher/debian/rules	2009-04-07 10:20:39 UTC (rev 18020)
@@ -19,7 +19,7 @@
 ifneq (,$(findstring nohildon,$(DEB_BUILD_OPTIONS)))
 	opt_hildon :=
 else
-	opt_hildon := --enable-hildon-booster
+	opt_hildon := --enable-hildon-booster --enable-cpp-booster
 endif
 
 # Nasty thing due to having the upstream and debian stuff merged.

Modified: projects/haf/trunk/maemo-launcher/launcher/Makefile.am
===================================================================
--- projects/haf/trunk/maemo-launcher/launcher/Makefile.am	2009-04-06 09:33:55 UTC (rev 18019)
+++ projects/haf/trunk/maemo-launcher/launcher/Makefile.am	2009-04-07 10:20:39 UTC (rev 18020)
@@ -40,6 +40,16 @@
 booster_qt_so_CPPFLAGS = $(BOOSTER_QT_CFLAGS)
 booster_qt_so_LDADD = $(BOOSTER_QT_LIBS)
 
+if USE_CPP_BOOSTER
+booster_PROGRAMS += booster-cpp.so
+endif
+
+booster_cpp_so_SOURCES = booster_cpp.c
+booster_cpp_so_CFLAGS = -fPIC
+booster_cpp_so_LDFLAGS = -shared -fPIC
+booster_cpp_so_CPPFLAGS = $(BOOSTER_CPP_CFLAGS)
+booster_cpp_so_LDADD = $(BOOSTER_CPP_LIBS) -lstdc++
+
 bin_PROGRAMS = maemo-launcher maemo-invoker maemo-summoner
 
 pkgconfigdir = $(libdir)/pkgconfig

Added: projects/haf/trunk/maemo-launcher/launcher/booster_cpp.c
===================================================================
--- projects/haf/trunk/maemo-launcher/launcher/booster_cpp.c	2009-04-06 09:33:55 UTC (rev 18019)
+++ projects/haf/trunk/maemo-launcher/launcher/booster_cpp.c	2009-04-07 10:20:39 UTC (rev 18020)
@@ -0,0 +1,54 @@
+/*
+ * $Id: booster_cpp.c Tue, 07 Apr 2009 09:38:38 +0300 makarhun $
+ *
+ * Copyright (C) 2008 Nokia Corporation
+ *
+ * Authors: Janne Karhunen <Janne.Karhunen 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_cpp_preinit(int *argc, char ***argv)
+{
+  debug("booster CPP module preinit (%s)\n", *argv[0]);
+
+  return NULL;
+}
+
+static void
+booster_cpp_init(const char *progfilename, const booster_state_t state)
+{
+  debug("booster CPP module init (%s)\n", progfilename);
+}
+
+static void
+booster_cpp_reload(booster_state_t state)
+{
+  debug("booster CPP module reload\n");
+}
+
+booster_api_t booster_qt_api = {
+  .booster_version = BOOSTER_API_VERSION,
+  .booster_preinit = booster_cpp_preinit,
+  .booster_init = booster_cpp_init,
+  .booster_reload = booster_cpp_reload,
+};
+