diff options
| -rwxr-xr-x | configure | 15 | ||||
| -rw-r--r-- | debian/control | 12 | ||||
| -rw-r--r-- | debian/libmeegotouch-dev.install | 2 | ||||
| -rw-r--r-- | debian/meegotouch-demos-widgetsgallery.install | 3 | ||||
| -rw-r--r-- | debian/meegotouch-dev-tools.install | 1 | ||||
| -rw-r--r-- | debian/meegotouch-examples.install | 40 | ||||
| -rwxr-xr-x | debian/rules | 2 | ||||
| -rw-r--r-- | examples/imtoolbar/imtoolbar.pro | 9 | ||||
| -rw-r--r-- | examples/multipleinstances/multipleinstances.pro | 1 | ||||
| -rw-r--r-- | examples/separatorTest/separatorTest.pro | 28 | ||||
| -rw-r--r-- | projects.pro | 2 |
11 files changed, 84 insertions, 31 deletions
@@ -61,6 +61,7 @@ CFG_MINIMAL=no CFG_BUILD_TESTS=no CFG_BUILD_BENCHMARKS=no CFG_BUILD_PLAINQT=yes +CFG_BUILD_EXAMPLES=no M_DEFAULT_BUILD_PARTS="libs demos" CFG_BUILD_PARTS="" @@ -217,6 +218,7 @@ while [ "$#" -gt 0 ]; do dev) CFG_DEV="yes" CFG_BUILD_TESTS="yes" + CFG_BUILD_EXAMPLES="yes" CFG_BUILD_BENCHMARKS="yes" CFG_BUILD_PLAINQT="yes" ;; @@ -226,6 +228,9 @@ while [ "$#" -gt 0 ]; do tests) CFG_BUILD_TESTS="yes" ;; + examples) + CFG_BUILD_EXAMPLES="yes" + ;; benchmarks) CFG_BUILD_BENCHMARKS="yes" ;; @@ -337,6 +342,14 @@ else fi fi +if [ "$CFG_BUILD_EXAMPLES" = "yes" ]; then + CFG_BUILD_PARTS="$CFG_BUILD_PARTS examples" +else + if echo $CFG_BUILD_PARTS | grep examples >/dev/null 2>&1; then + CFG_BUILD_EXAMPLES="yes" + fi +fi + # is this a shadow build? if [ "$OPT_SHADOW" = "maybe" ]; then OPT_SHADOW=no @@ -462,6 +475,7 @@ Additional options: -tests ............. Build the tests. -benchmarks ........ Build the benchmarks. + -examples .......... Build the examples. -n900 .............. Build libmeegotouch for the N900 device. @@ -781,6 +795,7 @@ echo echo "Benchmarks .......... $CFG_BUILD_BENCHMARKS" echo "Plain Qt support .... $CFG_BUILD_PLAINQT" echo "Tests ............... $CFG_BUILD_TESTS" +echo "Examples ............ $CFG_BUILD_EXAMPLES" if [ "$HAVE_N900" = "yes" ]; then echo "" diff --git a/debian/control b/debian/control index e295d11f..50f7c012 100644 --- a/debian/control +++ b/debian/control @@ -356,3 +356,15 @@ Section: devel Architecture: any Enhances: meegotouch-demos-widgetsgallery Description: Simplified Chinese translations for widgetsgallery + +Package: meegotouch-examples +Section: devel +Architecture: any +Depends: ${shlibs:Depends} +Description: Example applications + +Package: meegotouch-examples-dbg +Section: devel +Architecture: any +Depends: meegotouch-examples (= ${Source-Version}) +Description: Debug symbols of the example applications diff --git a/debian/libmeegotouch-dev.install b/debian/libmeegotouch-dev.install index 48dd7028..b97e16a7 100644 --- a/debian/libmeegotouch-dev.install +++ b/debian/libmeegotouch-dev.install @@ -1,4 +1,4 @@ usr/lib/libmeegotouch*.so -usr/include/* +usr/include/meegotouch/* usr/lib/pkgconfig/* usr/share/qt4/mkspecs/features/meegotouch* diff --git a/debian/meegotouch-demos-widgetsgallery.install b/debian/meegotouch-demos-widgetsgallery.install index 1f5e8e0c..414c052a 100644 --- a/debian/meegotouch-demos-widgetsgallery.install +++ b/debian/meegotouch-demos-widgetsgallery.install @@ -1,5 +1,6 @@ usr/bin/widgetsgallery -usr/share/themes/* +usr/share/themes/base/meegotouch/icons/* +usr/share/themes/base/meegotouch/widgetsgallery/* usr/share/applications/*widgetsgallery.desktop usr/share/applications/hildon/*widgetsgallery.desktop usr/share/dbus-1/services/com.nokia.widgetsgallery.service diff --git a/debian/meegotouch-dev-tools.install b/debian/meegotouch-dev-tools.install index 2807e627..664e0fdf 100644 --- a/debian/meegotouch-dev-tools.install +++ b/debian/meegotouch-dev-tools.install @@ -8,3 +8,4 @@ usr/bin/mnotificationtool usr/bin/mnotificationstresstest usr/bin/dui-rename-files usr/bin/dui-rename-symbols +usr/share/themes/base/meegotouch/mapplettester/style/mapplettester.css diff --git a/debian/meegotouch-examples.install b/debian/meegotouch-examples.install new file mode 100644 index 00000000..bd15e8ec --- /dev/null +++ b/debian/meegotouch-examples.install @@ -0,0 +1,40 @@ +usr/bin/animatedlayout +usr/bin/chainingexampleapp1 +usr/bin/chainingexampleapp2 +usr/bin/com.nokia.textprocessor +usr/bin/lifecycle +usr/bin/org.maemo.textprocessor +usr/bin/user +usr/lib/libchainingexampleinterface.so.1 +usr/lib/libchainingexampleinterface.so.1.0 +usr/lib/libchainingexampleinterface.so.1.0.0 +usr/lib/libtextprocessor.so.1 +usr/lib/libtextprocessor.so.1.0 +usr/lib/libtextprocessor.so.1.0.0 +usr/share/animatedlayout/themes/animatedlayout.conf +usr/share/animatedlayout/themes/images/background.png +usr/share/animatedlayout/themes/images/dui-logo-blue.png +usr/share/animatedlayout/themes/images/dui-logo-red.png +usr/share/animatedlayout/themes/images/dui-logo.png +usr/share/animatedlayout/themes/images/flow.png +usr/share/animatedlayout/themes/images/horizontal.png +usr/share/animatedlayout/themes/images/tile.png +usr/share/animatedlayout/themes/images/vertical.png +usr/share/animatedlayout/themes/style/animatedlayout.css +usr/share/applications/chainingexampleapp1.desktop +usr/share/applications/chainingexampleapp2.desktop +usr/share/applications/lifecycle.desktop +usr/share/dbus-1/interfaces/com.nokia.ChainingExampleInterface.xml +usr/share/dbus-1/interfaces/com.nokia.TextProcessorInterface.xml +usr/share/dbus-1/services/com.nokia.chainingexampleapp1.service +usr/share/dbus-1/services/com.nokia.chainingexampleapp2.service +usr/share/dbus-1/services/com.nokia.lifecycle.service +usr/share/dbus-1/services/com.nokia.textprocessor.service +usr/share/dbus-1/services/org.maemo.textprocessor.service +usr/share/l10n/meegotouch/animatedlayout.qm +usr/share/l10n/meegotouch/animatedlayout_de.qm +usr/share/l10n/meegotouch/animatedlayout_en.qm +usr/share/l10n/meegotouch/animatedlayout_ja.qm +usr/share/meegotouch/imtoolbars/toolbar1.xml +usr/share/meegotouch/imtoolbars/toolbar2.xml +usr/share/themes/base/meegotouch/SeparatorTest/style/SeparatorTest.css diff --git a/debian/rules b/debian/rules index 62ed5cc8..ae77c0cb 100755 --- a/debian/rules +++ b/debian/rules @@ -66,7 +66,7 @@ endif # Perform a minimal build by setting DEB_BUILD_OPTION=minimal,... ifeq (,$(findstring minimal,$(DEB_BUILD_OPTIONS))) - OPTIONS += -make "tests benchmarks" + OPTIONS += -make "tests benchmarks examples" else OPTIONS += -minimal MAKEDOCS = 0 diff --git a/examples/imtoolbar/imtoolbar.pro b/examples/imtoolbar/imtoolbar.pro index 721baa00..a2e72c71 100644 --- a/examples/imtoolbar/imtoolbar.pro +++ b/examples/imtoolbar/imtoolbar.pro @@ -1,6 +1,3 @@ -MROOT = ../.. -include($$MROOT/mkspecs/common.pri) - TEMPLATE = app TARGET = imtoolbar CONFIG += meegotouch @@ -12,8 +9,8 @@ INCLUDEPATH += . HEADERS += imtoolbarpage.h SOURCES += imtoolbarpage.cpp main.cpp -install.files = ./toolbar1.xml \ - ./toolbar2.xml -install.path = /usr/share/m/imtoolbars/ +install.files = toolbar1.xml \ + toolbar2.xml +install.path = /usr/share/meegotouch/imtoolbars/ INSTALLS += install diff --git a/examples/multipleinstances/multipleinstances.pro b/examples/multipleinstances/multipleinstances.pro index a56e7e36..f6e92ac5 100644 --- a/examples/multipleinstances/multipleinstances.pro +++ b/examples/multipleinstances/multipleinstances.pro @@ -10,4 +10,3 @@ SOURCES += main.cpp # libm first: INCLUDEPATH += ../../src/include QMAKE_LIBDIR += ../../lib/ -LIBS += -lmeegotouchcore diff --git a/examples/separatorTest/separatorTest.pro b/examples/separatorTest/separatorTest.pro index 97c317e1..55b95d57 100644 --- a/examples/separatorTest/separatorTest.pro +++ b/examples/separatorTest/separatorTest.pro @@ -1,32 +1,18 @@ +include(../../mkspecs/common.pri) + TEMPLATE = app TARGET = SeparatorTest -CONFIG += meegotouch +CONFIG += meegotouch + +LIBS += -lmeegotouchcore # Input SOURCES += main.cpp SeparatorTestPage.cpp -MROOT = ../.. - -include($$MROOT/mkspecs/common.pri) - -MLIB = $$MROOT/lib -MSRC = $$MROOT/src -MSRCINCLUDE = $$MSRC/include -MSFWINCLUDE = $$MROOT/servicefw/include - -INCLUDEPATH += . \ - $$MSRCINCLUDE \ - $$MSRC \ - -QMAKE_LIBDIR += \ - $$MLIB \ - -INCLUDEPATH += ../../src/include -QMAKE_LIBDIR += ../../lib/ +INCLUDEPATH += . ../../src ../../src/include -style_sheet.path = $$M_THEME_DIR/SeparatorTest style_sheet.files = style/SeparatorTest.css -view_configuration.path = $$M_THEME_DIR/SeparatorTest +style_sheet.path = $$M_THEME_DIR/base/meegotouch/SeparatorTest/style INSTALLS += \ style_sheet \ diff --git a/projects.pro b/projects.pro index 34bc76e7..5f8a2643 100644 --- a/projects.pro +++ b/projects.pro @@ -60,6 +60,8 @@ for(PROJECT, $$list($$lower($$unique(M_BUILD_PARTS)))) { win32:SUBDIRS -= benchmarks } else:isEqual(PROJECT, demos) { SUBDIRS += demos + } else:isEqual(PROJECT, examples) { + SUBDIRS += examples } else { message(Unknown PROJECT: $$PROJECT) } |