Swift
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2011-06-18 22:09:38 (GMT)
committerRemko Tronçon <git@el-tramo.be>2011-06-18 22:09:38 (GMT)
commita23b90319f9de8db0b455f5cd56e2428a3fcc53b (patch)
tree95d5baed116136cc214d8e1b5c49136b4abded5f
parentce4eb88be2eba12d5580bb22b48af3a0e915363b (diff)
parent5b88d16b2ea7edfbc1487751fb95f128b2c30330 (diff)
downloadswift-a23b90319f9de8db0b455f5cd56e2428a3fcc53b.zip
swift-a23b90319f9de8db0b455f5cd56e2428a3fcc53b.tar.bz2
Merge branch 'swift-1.x'
* swift-1.x: Fixed Debian manpages installation. Use LibXML as a Debian source dependency (instead of Expat) Tweak help documentation and add manpages. Conflicts: Swift/QtUI/QtSwift.cpp
Diffstat
-rw-r--r--Swift/Packaging/Debian/debian/control.in4
-rw-r--r--Swift/Packaging/Debian/debian/libswiften-dev.manpages1
-rwxr-xr-xSwift/Packaging/Debian/debian/rules1
-rw-r--r--Swift/Packaging/Debian/debian/swift-im.manpages1
-rw-r--r--Swift/Packaging/Debian/debian/swift.133
-rw-r--r--Swift/Packaging/Debian/debian/swiften-config.121
-rwxr-xr-xSwift/Packaging/Debian/package.sh1
-rw-r--r--Swift/QtUI/QtSwift.cpp13
-rw-r--r--Swift/QtUI/main.cpp11
-rw-r--r--Swiften/Config/swiften-config.cpp10
-rw-r--r--Swiften/SConscript1
11 files changed, 88 insertions, 9 deletions
diff --git a/Swift/Packaging/Debian/debian/control.in b/Swift/Packaging/Debian/debian/control.in
index 24ef6d8..572840b 100644
--- a/Swift/Packaging/Debian/debian/control.in
+++ b/Swift/Packaging/Debian/debian/control.in
@@ -2,7 +2,7 @@ Source: swift-im
Section: net
Priority: optional
Maintainer: Swift Package Maintainer <packages@swift.im>
-Build-Depends: debhelper (>= 7), scons (>= 1.2.0), libssl-dev (>= 0.9.8g), libqt4-dev (>= 4.5.0), libexpat1-dev (>= 2.0.1), lintian (>= 2.2.5), libxss-dev (>= 1.2.0), libboost-dev (>= 1.34.1), libboost-filesystem-dev (>= 1.34.1), libboost-program-options-dev (>= 1.34.1), libboost-regex-dev (>= 1.34.1), libboost-signals-dev (>= 1.34.1), libboost-system-dev (>= 1.34.1), libboost-thread-dev (>= 1.34.1), libboost-date-time-dev (>= 1.34.1), libidn11-dev (>= 1.10), docbook-xsl (>= 1.75.0), docbook-xml (>= 4.5), xsltproc, libxml2-utils
+Build-Depends: debhelper (>= 7), scons (>= 1.2.0), libssl-dev (>= 0.9.8g), libqt4-dev (>= 4.5.0), libxml2-dev (>= 2.7.8), lintian (>= 2.2.5), libxss-dev (>= 1.2.0), libboost-dev (>= 1.34.1), libboost-filesystem-dev (>= 1.34.1), libboost-program-options-dev (>= 1.34.1), libboost-regex-dev (>= 1.34.1), libboost-signals-dev (>= 1.34.1), libboost-system-dev (>= 1.34.1), libboost-thread-dev (>= 1.34.1), libboost-date-time-dev (>= 1.34.1), libidn11-dev (>= 1.10), docbook-xsl (>= 1.75.0), docbook-xml (>= 4.5), xsltproc, libxml2-utils
Standards-Version: 3.9.1
Vcs-Git: git://swift.im/swift
Vcs-Browser: http://swift.im/git/swift
@@ -36,6 +36,6 @@ Package: swift-im-dbg
Architecture: any
Section: debug
Priority: extra
-Depends: swift-im (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Depends: swift-im (= ${binary:Version}), ${misc:Depends}
Description: Debugging symbols for swift-im.
The Swift IM client.
diff --git a/Swift/Packaging/Debian/debian/libswiften-dev.manpages b/Swift/Packaging/Debian/debian/libswiften-dev.manpages
new file mode 100644
index 0000000..6424391
--- /dev/null
+++ b/Swift/Packaging/Debian/debian/libswiften-dev.manpages
@@ -0,0 +1 @@
+debian/swiften-config.1
diff --git a/Swift/Packaging/Debian/debian/rules b/Swift/Packaging/Debian/debian/rules
index 4105fec..ddafbdb 100755
--- a/Swift/Packaging/Debian/debian/rules
+++ b/Swift/Packaging/Debian/debian/rules
@@ -31,6 +31,7 @@ binary-arch: install
dh_installchangelogs
dh_installdocs
dh_installmenu
+ dh_installman -a
dh_link
dh_strip --dbg-package=swift-im-dbg
dh_compress
diff --git a/Swift/Packaging/Debian/debian/swift-im.manpages b/Swift/Packaging/Debian/debian/swift-im.manpages
new file mode 100644
index 0000000..f3fb91e
--- /dev/null
+++ b/Swift/Packaging/Debian/debian/swift-im.manpages
@@ -0,0 +1 @@
+debian/swift.1
diff --git a/Swift/Packaging/Debian/debian/swift.1 b/Swift/Packaging/Debian/debian/swift.1
new file mode 100644
index 0000000..6626b40
--- /dev/null
+++ b/Swift/Packaging/Debian/debian/swift.1
@@ -0,0 +1,33 @@
+.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.38.4.
+.TH SWIFT "1" "June 2011" "Swift" "Swift Manual"
+.SH NAME
+Swift \- swift
+.SH SYNOPSIS
+.B swift
+[\fIOPTIONS\fR]...
+.SH DESCRIPTION
+Swift is an instant messaging client for the XMPP network.
+.SH OPTIONS
+.TP
+\fB\-\-debug\fR
+Turn on debug logging
+.TP
+\fB\-\-help\fR
+Show this help message
+.TP
+\fB\-\-version\fR
+Show version information
+.TP
+\fB\-\-netbook\-mode\fR
+Use netbook mode display (unsupported)
+.TP
+\fB\-\-no\-tabs\fR
+Don't manage chat windows in tabs (unsupported)
+.TP
+\fB\-\-latency\-debug\fR
+Use latency debugging (unsupported)
+.HP
+\fB\-\-multi\-account\fR arg (=1) Number of accounts to open windows for (unsupported)
+.TP
+\fB\-\-start\-minimized\fR
+Don't show the login/roster window at startup
diff --git a/Swift/Packaging/Debian/debian/swiften-config.1 b/Swift/Packaging/Debian/debian/swiften-config.1
new file mode 100644
index 0000000..3717df6
--- /dev/null
+++ b/Swift/Packaging/Debian/debian/swiften-config.1
@@ -0,0 +1,21 @@
+.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.38.4.
+.TH SWIFTEN-CONFIG "1" "June 2011" "swiften-config" "Swift Manual"
+.SH NAME
+swiften-config \- swiften-config
+.SH SYNOPSIS
+.B swiften-config
+[\fIOPTIONS\fR]...
+.SH DESCRIPTION
+swiften\-config outputs the Swiften build options.
+.TP
+\fB\-\-help\fR
+Show this help message
+.TP
+\fB\-\-version\fR
+Show version information
+.TP
+\fB\-\-libs\fR
+List the library flags
+.TP
+\fB\-\-cflags\fR
+List the compiler & preprocessor flags
diff --git a/Swift/Packaging/Debian/package.sh b/Swift/Packaging/Debian/package.sh
index c395d25..5ccb6c1 100755
--- a/Swift/Packaging/Debian/package.sh
+++ b/Swift/Packaging/Debian/package.sh
@@ -41,6 +41,7 @@ ln -s Swift/Packaging/Debian/debian $DIRNAME/debian
cat $DIRNAME/debian/control.in | sed -e "s/%SWIFTEN_SOVERSION%/$SWIFTEN_SOVERSION/g" > $DIRNAME/debian/control
mv $DIRNAME/debian/libswiften.install $DIRNAME/debian/libswiften$SWIFTEN_SOVERSION.install
mv $DIRNAME/debian/libswiften-dev.install $DIRNAME/debian/libswiften$SWIFTEN_SOVERSION-dev.install
+mv $DIRNAME/debian/libswiften-dev.manpages $DIRNAME/debian/libswiften$SWIFTEN_SOVERSION-dev.manpages
# Build
cd $DIRNAME
diff --git a/Swift/QtUI/QtSwift.cpp b/Swift/QtUI/QtSwift.cpp
index f0c876c..1d820b1 100644
--- a/Swift/QtUI/QtSwift.cpp
+++ b/Swift/QtUI/QtSwift.cpp
@@ -67,12 +67,13 @@ po::options_description QtSwift::getOptionsDescription() {
po::options_description result("Options");
result.add_options()
("debug", "Turn on debug logging")
- ("help", "produce help message")
- ("netbook-mode", "use netbook mode display (unsupported)")
- ("no-tabs", "don't manage chat windows in tabs (unsupported)")
- ("latency-debug", "use latency debugging (unsupported)")
- ("multi-account", po::value<int>()->default_value(1), "number of accounts to open windows for (unsupported)")
- ("start-minimized", "don't show the login/roster window at startup")
+ ("help", "Show this help message")
+ ("version", "Show version information")
+ ("netbook-mode", "Use netbook mode display (unsupported)")
+ ("no-tabs", "Don't manage chat windows in tabs (unsupported)")
+ ("latency-debug", "Use latency debugging (unsupported)")
+ ("multi-account", po::value<int>()->default_value(1), "Number of accounts to open windows for (unsupported)")
+ ("start-minimized", "Don't show the login/roster window at startup")
("eagle-mode", "Settings more suitable for military/secure deployments")
;
return result;
diff --git a/Swift/QtUI/main.cpp b/Swift/QtUI/main.cpp
index d44bd01..2eef379 100644
--- a/Swift/QtUI/main.cpp
+++ b/Swift/QtUI/main.cpp
@@ -16,6 +16,7 @@
#include <Swift/Controllers/Translator.h>
#include <Swift/Controllers/ApplicationInfo.h>
+#include <Swift/Controllers/BuildVersion.h>
#include <SwifTools/Application/PlatformApplicationPathProvider.h>
#include "QtSwift.h"
@@ -52,9 +53,17 @@ int main(int argc, char* argv[]) {
}
boost::program_options::notify(vm);
if (vm.count("help") > 0) {
- std::cout << desc << "\n";
+ std::cout << SWIFT_APPLICATION_NAME << " is an instant messaging client for the XMPP network." << std::endl;
+ std::cout << std::endl;
+ std::cout << "Usage: " << argv[0] << " [OPTIONS]..." << std::endl;
+ std::cout << std::endl;
+ std::cout << desc << std::endl;
return 1;
}
+ if (vm.count("version") > 0) {
+ std::cout << SWIFT_APPLICATION_NAME << " " << buildVersion << std::endl;
+ return 0;
+ }
Swift::QtSwift swift(vm);
int result = app.exec();
diff --git a/Swiften/Config/swiften-config.cpp b/Swiften/Config/swiften-config.cpp
index 0c46cf0..81a8357 100644
--- a/Swiften/Config/swiften-config.cpp
+++ b/Swiften/Config/swiften-config.cpp
@@ -16,6 +16,7 @@
#include <Swiften/Base/Platform.h>
#include <Swiften/Base/Paths.h>
+#include <Swiften/Version.h>
#include "swiften-config.h"
@@ -35,6 +36,7 @@ int main(int argc, char* argv[]) {
boost::program_options::options_description desc;
desc.add_options()
("help", "Show this help message")
+ ("version", "Show version information")
("libs", "List the library flags")
("cflags", "List the compiler & preprocessor flags")
;
@@ -56,9 +58,17 @@ int main(int argc, char* argv[]) {
}
if (vm.count("help") > 0) {
+ std::cout << "swiften-config outputs the Swiften build options." << std::endl;
+ std::cout << std::endl;
+ std::cout << "Usage: swiften-config [OPTIONS]..." << std::endl;
+ std::cout << std::endl;
std::cout << desc << "\n";
return 0;
}
+ if (vm.count("version") > 0) {
+ std::cout << "swiften-config " << SWIFTEN_VERSION_STRING << std::endl;
+ return 0;
+ }
// Read in all variables
std::vector<std::string> libs;
diff --git a/Swiften/SConscript b/Swiften/SConscript
index f8392a8..d98c9b7 100644
--- a/Swiften/SConscript
+++ b/Swiften/SConscript
@@ -394,6 +394,7 @@ if env["SCONS_STAGE"] == "build" :
version_header = "#pragma once\n\n"
version_header += "#define SWIFTEN_VERSION 0x%02X%02X%02X\n" % (swiften_env["SWIFTEN_VERSION_MAJOR"], swiften_env["SWIFTEN_VERSION_MINOR"], swiften_env["SWIFTEN_VERSION_PATCH"])
+ version_header += "#define SWIFTEN_VERSION_STRING \"%s\"\n" % swiften_env["SWIFTEN_VERSION"]
swiften_env.WriteVal("Version.h", swiften_env.Value(version_header))
swiften_includes.append("Swiften/Version.h")