From: Yang Gu <yang.gu@intel.com>
To: ofono@ofono.org
Subject: [PATCH 1/1] Add option to support version
Date: Wed, 03 Nov 2010 14:57:46 +0800 [thread overview]
Message-ID: <1288767466-12837-2-git-send-email-yang.gu@intel.com> (raw)
In-Reply-To: <1288767466-12837-1-git-send-email-yang.gu@intel.com>
[-- Attachment #1: Type: text/plain, Size: 2340 bytes --]
---
Makefile.am | 2 +-
bootstrap | 2 +-
configure.ac | 1 +
src/main.cpp | 11 +++++++++--
4 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index f124b08..dd54c42 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -50,7 +50,7 @@ dist_pkgdata_DATA = src/default.xml
EXTRA_DIST = src/controlbase.ui src/GSMSpecification.xml
MAINTAINERCLEANFILES = Makefile.in \
- aclocal.m4 configure depcomp missing install-sh
+ aclocal.m4 configure config.h.in depcomp missing install-sh
$(src_phonesim_OBJECTS): src/ui_controlbase.h
diff --git a/bootstrap b/bootstrap
index 562c115..05eee20 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1,3 +1,3 @@
#!/bin/sh
-aclocal && automake --add-missing --copy && autoconf
+aclocal && autoheader && automake --add-missing --copy && autoconf
diff --git a/configure.ac b/configure.ac
index 725ae7e..445a11c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,6 +2,7 @@ AC_PREREQ(2.60)
AC_INIT(phonesim, 1.8)
AM_INIT_AUTOMAKE([foreign subdir-objects])
+AM_CONFIG_HEADER(config.h)
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
diff --git a/src/main.cpp b/src/main.cpp
index d7de416..6a00cb5 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -17,6 +17,10 @@
**
****************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <server.h>
#include "control.h"
#include <qapplication.h>
@@ -28,7 +32,7 @@ static void usage()
{
qWarning() << "Usage:"
<< QFileInfo(QCoreApplication::instance()->applicationFilePath()).fileName().toLocal8Bit().constData()
- << "[-p port] [-gui] filename";
+ << "[-v] [-p port] [-gui] filename";
exit(-1);
}
@@ -43,7 +47,10 @@ int main(int argc, char **argv)
// Parse the command-line.
index = 1;
for (index = 1; index < argc; index++) {
- if (strcmp(argv[index],"-p") == 0) {
+ if (strcmp(argv[index],"-v") == 0) {
+ qWarning() << VERSION;
+ exit(0);
+ } else if (strcmp(argv[index],"-p") == 0) {
index++;
if (index >= argc) {
qWarning() << "ERROR: Got -p but missing port number";
--
1.7.2.3
next prev parent reply other threads:[~2010-11-03 6:57 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-11-03 6:57 [PATCH 0/1] Patch Description Yang Gu
2010-11-03 6:57 ` Yang Gu [this message]
2010-11-03 7:40 ` [PATCH 1/1] Add option to support version Marcel Holtmann
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1288767466-12837-2-git-send-email-yang.gu@intel.com \
--to=yang.gu@intel.com \
--cc=ofono@ofono.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox