Merge branch 'master' of ssh://drop.maemo.org/git/mdictionary

diff --git a/debian/control b/debian/control
index 76f85ae..a8254ed 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,11 +2,35 @@ Source: mdictionary
 Section: user/education
 Priority: optional
 Maintainer: Jakub Jaszczyński <jakub.jaszczynski@comarch.pl>, Piotr Pilarczyk <piotr.pilarczyk@comarch.pl>, Mateusz Półrola <mateusz.polrola@comarch.pl>, Bartosz Szatkowski <bartosz.szatkowski@comarch.pl>
-Build-Depends: debhelper (>= 5), libqt4-core, libqt4-gui, libqt4-xml
+Build-Depends: debhelper (>= 5), libqt4-dev (>= 4.6), doxygen
 Standards-Version: 3.8.0
 
 Package: mdictionary
+Section: user/education
 Architecture: any
 Depends: ${shlibs:Depends}
 Description: Multilanguage dictionary
- Long desc
+
+Package: mdictionary-google-plugin
+Section: user/education
+Architecture: any
+Depends: mdictionary
+Description: Google plugin for mDictionary
+
+Package: mdictionary-homescreen-widget
+Section: user/education
+Architecture: any
+Depends: mdictionary
+Description: home sreen widget for mDictionary
+
+Package: mdictionary-dev
+Section: devel
+Architecture: any
+Depends: libqt4-dev (>= 4.6)
+Description: mDictionary development files
+
+Package: mdictionary-doc
+Section: doc
+Architecture: any
+Depends: mdictionary-dev
+Description: mDictionary documentation

diff --git a/debian/docs b/debian/docs
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/debian/mdictionary-dev.install b/debian/mdictionary-dev.install
new file mode 100644 (file)
index 0000000..e43b95c
--- /dev/null
+++ b/debian/mdictionary-dev.install
@@ -0,0 +1 @@
+usr/include

diff --git a/debian/mdictionary-doc.docs b/debian/mdictionary-doc.docs
new file mode 100644 (file)
index 0000000..3d068ab
--- /dev/null
+++ b/debian/mdictionary-doc.docs
@@ -0,0 +1,2 @@
+AUTHORS
+doc/html

diff --git a/debian/mdictionary-google-plugin.install b/debian/mdictionary-google-plugin.install
new file mode 100644 (file)
index 0000000..488d41c
--- /dev/null
+++ b/debian/mdictionary-google-plugin.install
@@ -0,0 +1 @@
+usr/lib/mdictionary/plugins/libgoogle.so

diff --git a/debian/mdictionary-homescreen-widget.install b/debian/mdictionary-homescreen-widget.install
new file mode 100644 (file)
index 0000000..98a0883
--- /dev/null
+++ b/debian/mdictionary-homescreen-widget.install
@@ -0,0 +1,2 @@
+usr/lib/hildon-desktop
+usr/share/applications/hildon-home

diff --git a/debian/mdictionary.install b/debian/mdictionary.install
new file mode 100644 (file)
index 0000000..4e92616
--- /dev/null
+++ b/debian/mdictionary.install
@@ -0,0 +1,8 @@
+usr/share/dbus-1/
+usr/share/icons/
+usr/share/mdictionary/staron.png
+usr/bin/mdictionary
+usr/lib/mdictionary/plugins/libxdxf.so
+usr/lib/mdictionary/plugins/eng-us.xdxf
+usr/lib/mdictionary/plugins/eng-thai.xdxf
+usr/share/applications/hildon/mdictionary.desktop

diff --git a/debian/mdictionary.png b/debian/mdictionary.png
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/debian/rules b/debian/rules
index adc54e0..6b6af66 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -12,13 +12,14 @@ build: build-stamp
 build-stamp: configure-stamp
        dh_testdir
        $(MAKE)
+       $(MAKE) doc
        touch $@
 
 clean:
        dh_testdir
        dh_testroot
        rm -f build-stamp configure-stamp
-       if test -f $(CURDIR)/Makefile; then \
+       if test -f $(CURDIR)/Makefile ; then \
                $(MAKE) distclean; \
        fi
        dh_clean
@@ -28,14 +29,20 @@ install:
        dh_testroot
        dh_clean -k
        dh_installdirs
-       cd $(CURDIR)/src && $(MAKE) -j 4 INSTALL_ROOT=$(CURDIR)/debian/mdictionary install
+       INSTALL_ROOT=$(CURDIR)/debian/tmp $(MAKE) install
 
 binary-indep: build install
 
 binary-arch: install
-       dh_maemo_package_icons
        dh_testdir
        dh_testroot
+       if [ -e $(CURDIR)/debian/tmp/usr/share/applications/mdictionary.desktop ] ; then \
+               sed -i -e 's/.*mdictionary.desktop/usr\/share\/applications\/mdictionary.desktop/g' $(CURDIR)/debian/mdictionary.install ;\
+       else \
+               sed -i -e 's/.*mdictionary.desktop/usr\/share\/applications\/hildon\/mdictionary.desktop/g' $(CURDIR)/debian/mdictionary.install ;\
+       fi
+       dh_install --sourcedir=$(CURDIR)/debian/tmp
+       dh_installdocs
        dh_strip
        dh_compress
        dh_fixperms
@@ -44,7 +51,7 @@ binary-arch: install
        dh_gencontrol
        dh_md5sums
        dh_builddeb
-       dh_maemo_package_icons -r
+#      dh_maemo_package_icons -r
        
 binary: binary-indep binary-arch
 .PHONY: build clean binary-indep binary-arch binary install configure

diff --git a/mdictionary.pri b/mdictionary.pri
index 2be5fbd..7973f09 100644 (file)
--- a/mdictionary.pri
+++ b/mdictionary.pri
@@ -1,3 +1,4 @@
+PROJECTNAME = mdictionary
 VERSION = 0.1
 
 QT = \
@@ -14,7 +15,9 @@ maemo5:QT += maemo5
 
 CONFIG += \
        qt \
-       release
+    release
+
+CONFIG -= debug
 
 isEmpty(ENABLED_SRC):ENABLED_SRC = "mdictionary plugins desktopWidget"
 isEmpty(ENABLED_PLUGINS):ENABLED_PLUGINS = "xdxf google"

diff --git a/mdictionary.pro b/mdictionary.pro
index f501bf2..e0fbf59 100644 (file)
--- a/mdictionary.pro
+++ b/mdictionary.pro
@@ -1,14 +1,17 @@
 TEMPLATE = subdirs
-SUBDIRS = src tests
+SUBDIRS = src
 CONFIG += ordered
 include (mdictionary.pri)
 
 
 check.CONFIG += recursive
-check.recurse = src tests
-check.depends = install
+check.recurse = src 
 QMAKE_EXTRA_TARGETS += check
 
+
+include (doc/doc.pri)
+QMAKE_EXTRA_TARGETS += doc
+
 message("Enabled sources: "$$ENABLED_SRC)
 message("Enabled plugins: "$$ENABLED_PLUGINS)
 
@@ -18,14 +21,3 @@ message("Data directory: "$$DATA_DIR)
 message("Plugins directory: "$$PLUGINS_DIR)
 message("Documentation directory: "$$DOCS_DIR)
 
-
-if(coverage) {
-        coverage-report.CONFIG = recursive
-        coverage-report.recurse = src
-        QMAKE_EXTRA_TARGETS += coverage-report
-        message('******************************************************************' )
-        message('* Remember to disable CCACHE in scratchbox to make Code Coverage' )
-        message('* report!' )
-        message('* use command: export SBOX_USE_CCACHE="no"' )
-        message('******************************************************************' )
-}

diff --git a/src/desktopWidget/desktopWidget.pro b/src/desktopWidget/desktopWidget.pro
index dfa6b78..64820d8 100644 (file)
--- a/src/desktopWidget/desktopWidget.pro
+++ b/src/desktopWidget/desktopWidget.pro
@@ -27,4 +27,5 @@ unix {
                        desktop
 }
 
-
+check.commands = echo 'No check here'
+QMAKE_EXTRA_TARGETS += check

diff --git a/src/mdictionary/mdictionary.pro b/src/mdictionary/mdictionary.pro
index 00118ca..f0cf4bd 100644 (file)
--- a/src/mdictionary/mdictionary.pro
+++ b/src/mdictionary/mdictionary.pro
@@ -85,19 +85,5 @@ unix {
 }
 
 
-
-coverage {
-        # add flags to compiler
-        LIBS += -lgcov
-        QMAKE_CXXFLAGS += -ftest-coverage -fprofile-arcs -fno-elide-constructors
-
-        # and add a target for generating report
-        QMAKE_EXTRA_TARGETS += coverage-report
-        coverage-report.commands  = lcov -d .obj --capture --output-file all.cov -b . &&
-        coverage-report.commands += lcov -r all.cov '*thumbtest*' -r all.cov '*/src/dbus/*' -r all.cov '*/src/.moc/*' -o to_test.cov &&
-        coverage-report.commands += lcov -e to_test.cov '*/*/src/*.cpp*' -e to_test.cov '*/*/src/*.h*' -e to_test.cov '*/*/src/common/*.h*' -o final.cov &&
-        coverage-report.commands += genhtml -o coverage final.cov
-}
-
 check.commands = echo 'No check here'
 QMAKE_EXTRA_TARGETS += check

diff --git a/src/plugins/google/google.pro b/src/plugins/google/google.pro
index 3b39bc5..a7c7bd5 100644 (file)
--- a/src/plugins/google/google.pro
+++ b/src/plugins/google/google.pro
@@ -21,3 +21,6 @@ HEADERS += \
 
 RESOURCES += \
     icons.qrc
+
+check.commands = echo 'No check here'
+QMAKE_EXTRA_TARGETS += check

diff --git a/src/plugins/plugins.pro b/src/plugins/plugins.pro
index fca995c..14a3403 100644 (file)
--- a/src/plugins/plugins.pro
+++ b/src/plugins/plugins.pro
@@ -2,3 +2,7 @@ include (plugins.pri)
 
 TEMPLATE = subdirs
 SUBDIRS = $$ENABLED_PLUGINS
+
+check.CONFIG = recursive
+check.recurse = $$ENABLED_PLUGINS
+QMAKE_EXTRA_TARGETS += check

diff --git a/src/plugins/xdxf/xdxf.pro b/src/plugins/xdxf/xdxf.pro
index 91955f4..d7e0f6a 100644 (file)
--- a/src/plugins/xdxf/xdxf.pro
+++ b/src/plugins/xdxf/xdxf.pro
@@ -35,3 +35,5 @@ unix {
   dicts.files += ../../../data/dicts/eng-thai.xdxf
 }
 
+check.commands = echo 'No check here'
+QMAKE_EXTRA_TARGETS += check

diff --git a/src/src.pro b/src/src.pro
index 6c65bf4..90f8853 100644 (file)
--- a/src/src.pro
+++ b/src/src.pro
@@ -1,4 +1,5 @@
 include(src.pri)
+include(../mdictionary.pri)
 
 TEMPLATE = subdirs
 SUBDIRS = $$ENABLED_SRC
@@ -7,8 +8,9 @@ check.CONFIG = recursive
 check.recurse = $$ENABLED_SRC
 QMAKE_EXTRA_TARGETS += check
 
-coverage {
-        # add flags to compiler
-        LIBS += -lgcov
-        QMAKE_CXXFLAGS += -ftest-coverage -fprofile-arcs -fno-elide-constructors
-}
+INSTALL_HEADERS = include/*
+install_headers.path = $$INSTALL_PREFIX/include/mdictionary
+install_headers.files = $$INSTALL_HEADERS
+
+INSTALLS += install_headers
+

diff --git a/tests/GooglePluginTests/GooglePluginTests.pro b/tests/GooglePluginTests/GooglePluginTests.pro
new file mode 100644 (file)
index 0000000..33c891a
--- /dev/null
+++ b/tests/GooglePluginTests/GooglePluginTests.pro
@@ -0,0 +1,35 @@
+######################################################################
+# Automatically generated by qmake (1.07a) Wed Aug 4 11:35:12 2010
+######################################################################
+
+CONFIG += qtestlib
+QT += core gui network
+TARGET = GooglePluginTests
+TEMPLATE = app
+INCLUDEPATH += .
+
+# Input
+HEADERS += test.h \
+    ../../src/plugins/google/GooglePlugin.h \
+    ../../src/include/translation.h \
+    ../../src/include/settings.h \
+    ../../src/include/DictDialog.h \
+    ../../src/include/CommonDictInterface.h \
+    ../../src/plugins/google/TranslationGoogle.h \
+    ../../src/plugins/google/GoogleDictDialog.h \
+    ../../src/plugins/google/GoogleSettingsDialog.h
+
+SOURCES += test.cpp \
+    ../../src/plugins/google/GooglePlugin.cpp \
+    ../../src/plugins/google/TranslationGoogle.cpp \
+    ../../src/plugins/google/GoogleDictDialog.cpp \
+    ../../src/plugins/google/GoogleSettingsDialog.cpp
+
+target.path = .
+target.commands = ./GooglePluginTests
+INSTALLS += target
+
+
+check.depends = $$TARGET
+check.commands = ./$${TARGET}
+QMAKE_EXTRA_TARGETS += check

diff --git a/tests/GooglePluginTests/tests.pro b/tests/GooglePluginTests/tests.pro
deleted file mode 100644 (file)
index 9c1092b..0000000
--- a/tests/GooglePluginTests/tests.pro
+++ /dev/null
@@ -1,30 +0,0 @@
-######################################################################
-# Automatically generated by qmake (1.07a) Wed Aug 4 11:35:12 2010
-######################################################################
-
-CONFIG += qtestlib
-QT += core gui network
-TARGET = GooglePluginTests
-TEMPLATE = app
-INCLUDEPATH += .
-
-# Input
-HEADERS += test.h \
-    ../../src/plugins/google/GooglePlugin.h \
-    ../../src/common/translation.h \
-    ../../src/common/settings.h \
-    ../../src/common/DictDialog.h \
-    ../../src/common/CommonDictInterface.h \
-    ../../src/plugins/google/TranslationGoogle.h \
-    ../../src/plugins/google/GoogleDictDialog.h \
-    ../../src/plugins/google/GoogleSettingsDialog.h
-
-SOURCES += test.cpp \
-    ../../src/plugins/google/GooglePlugin.cpp \
-    ../../src/plugins/google/TranslationGoogle.cpp \
-    ../../src/plugins/google/GoogleDictDialog.cpp \
-    ../../src/plugins/google/GoogleSettingsDialog.cpp
-
-target.path = .
-target.commands = ./GooglePluginTests
-INSTALLS += target

diff --git a/tests/XdxfPluginTests/XdxfPluginTests.pro b/tests/XdxfPluginTests/XdxfPluginTests.pro
new file mode 100644 (file)
index 0000000..8375447
--- /dev/null
+++ b/tests/XdxfPluginTests/XdxfPluginTests.pro
@@ -0,0 +1,39 @@
+######################################################################
+# Automatically generated by qmake (1.07a) Wed Aug 4 11:35:12 2010
+######################################################################
+
+CONFIG += qtestlib
+QT += sql
+TARGET = xdxfPluginTests
+TEMPLATE = app
+INCLUDEPATH += .
+
+# Input
+HEADERS += test.h \
+    ../../src/plugins/xdxf/xdxfplugin.h \
+    ../../src/plugins/xdxf/TranslationXdxf.h \
+    ../../src/include/translation.h \
+    ../../src/include/settings.h \
+    ../../src/include/DictDialog.h \
+    ../../src/include/CommonDictInterface.h \
+    ../../src/plugins/xdxf/XdxfDictDialog.h \
+    ../../src/plugins/xdxf/XdxfLoadDialog.h \
+    ../../src/plugins/xdxf/XdxfSettingsDialog.h \
+    ../../src/plugins/xdxf/XdxfCachingDialog.h
+
+
+SOURCES += test.cpp \
+    ../../src/plugins/xdxf/xdxfplugin.cpp \
+    ../../src/plugins/xdxf/TranslationXdxf.cpp \
+    ../../src/plugins/xdxf/XdxfLoadDialog.cpp \
+    ../../src/plugins/xdxf/XdxfDictDialog.cpp \
+    ../../src/plugins/xdxf/XdxfCachingDialog.cpp \
+    ../../src/plugins/xdxf/XdxfSettingsDialog.cpp
+
+target.path = .
+target.commands = ./xdxfPluginTests
+INSTALLS += target
+
+check.depends = $$TARGET
+check.commands = ./$${TARGET}
+QMAKE_EXTRA_TARGETS += check

diff --git a/tests/XdxfPluginTests/tests.pro b/tests/XdxfPluginTests/tests.pro
deleted file mode 100644 (file)
index 7ef99cb..0000000
--- a/tests/XdxfPluginTests/tests.pro
+++ /dev/null
@@ -1,35 +0,0 @@
-######################################################################
-# Automatically generated by qmake (1.07a) Wed Aug 4 11:35:12 2010
-######################################################################
-
-CONFIG += qtestlib
-QT += sql
-TARGET = xdxfPluginTests
-TEMPLATE = app
-INCLUDEPATH += .
-
-# Input
-HEADERS += test.h \
-    ../../src/plugins/xdxf/xdxfplugin.h \
-    ../../src/plugins/xdxf/TranslationXdxf.h \
-    ../../src/common/translation.h \
-    ../../src/common/settings.h \
-    ../../src/common/DictDialog.h \
-    ../../src/common/CommonDictInterface.h \
-    ../../src/plugins/xdxf/XdxfDictDialog.h \
-    ../../src/plugins/xdxf/XdxfLoadDialog.h \
-    ../../src/plugins/xdxf/XdxfSettingsDialog.h \
-    ../../src/plugins/xdxf/XdxfCachingDialog.h
-
-
-SOURCES += test.cpp \
-    ../../src/plugins/xdxf/xdxfplugin.cpp \
-    ../../src/plugins/xdxf/TranslationXdxf.cpp \
-    ../../src/plugins/xdxf/XdxfLoadDialog.cpp \
-    ../../src/plugins/xdxf/XdxfDictDialog.cpp \
-    ../../src/plugins/xdxf/XdxfCachingDialog.cpp \
-    ../../src/plugins/xdxf/XdxfSettingsDialog.cpp
-
-target.path = .
-target.commands = ./xdxfPluginTests
-INSTALLS += target

diff --git a/tests/mDictionaryTests/mDictionaryTests.pro b/tests/mDictionaryTests/mDictionaryTests.pro
index 1287425..d812473 100644 (file)
--- a/tests/mDictionaryTests/mDictionaryTests.pro
+++ b/tests/mDictionaryTests/mDictionaryTests.pro
@@ -36,11 +36,6 @@ target.commands += ./mDictionaryTests
 INSTALLS += target
 
 
-coverage {
-        LIBS += -lgcov
-        QMAKE_CXXFLAGS += -ftest-coverage -fprofile-arcs -fno-elide-constructors
-}
-
 check.depends = $$TARGET
-check.commands = ./mDictionaryTests
+check.commands = ./$${TARGET}
 QMAKE_EXTRA_TARGETS += check

diff --git a/tests/tests.pro b/tests/tests.pro
index 18f3045..0acde8b 100644 (file)
--- a/tests/tests.pro
+++ b/tests/tests.pro
@@ -1,12 +1,6 @@
-TEMPLATE=subdirs
-SUBDIRS = mDictionaryTests
+TEMPLATE = subdirs
+SUBDIRS = mDictionaryTests GooglePluginTests XdxfPluginTests
 
 check.CONFIG = recursive
-check.recurse = mDictionaryTests
+check.recurse = mDictionaryTests GooglePluginTests XdxfPluginTests
 QMAKE_EXTRA_TARGETS += check
-
-coverage {
-        # add flags to compiler
-        LIBS += -lgcov
-        QMAKE_CXXFLAGS += -ftest-coverage -fprofile-arcs -fno-elide-constructors
-}