Changes: Modularized libdui

RevBy: Tomas, Holger
Details: Libdui is split into modules as follows:
 - extensions: application extensions and mashup components
 - settings: settingslanguage
 - views: widget views
 - corelib: everything else

benchmarks/common_top.pri

@@ -1,6 +1,16 @@
 DUISRCDIR = ../../src/
 STUBSDIR = ../stubs
-INCLUDEPATH += . $$DUISRCDIR $$STUBSDIR $$DUISRCDIR/include $$DUISRCDIR/core $$DUISRCDIR/widgets $$DUISRCDIR/workspace $$DUISRCDIR/style ../memorybenchmark/
+INCLUDEPATH += \
+    . \
+    $$STUBSDIR \
+    $$DUISRCDIR/include \
+    $$DUISRCDIR/corelib/core \
+    $$DUISRCDIR/corelib/widgets \
+    $$DUISRCDIR/corelib/workspace \
+    $$DUISRCDIR/corelib/style \
+    $$DUISRCDIR/views \
+    $$DUISRCDIR/views/style \
+    ../memorybenchmark/
 
 DEPENDPATH = $$INCLUDEPATH
 QMAKE_LIBDIR += ../../lib
@@ -17,9 +27,9 @@ win32|macx {
         QMAKE_LFLAGS += -F../../lib
         LIBS += -framework dui
     }
-    win32:LIBS += -L../../lib -ldui0
+    win32:LIBS += -lduicore0
 } else {
-    LIBS += ../../lib/libdui.so
+    LIBS += -lduicore
 }
 
 QMAKE_CXXFLAGS += -Werror

benchmarks/mt_duilabel/mt_duilabel.pro

@@ -6,3 +6,5 @@ TARGET = mt_duilabel
 SOURCES += mt_duilabel.cpp
 HEADERS += mt_duilabel.h
 CONFIG += release
+
+LIBS += -lduiviews

benchmarks/pt_duibutton/pt_duibutton.pro

@@ -1,5 +1,5 @@
 include(../common_top.pri)
-INCLUDEPATH += ../../src/include ../../src/theme
+INCLUDEPATH += ../../src/include ../../src/corelib/theme
 DEPENDPATH += $$INCLUDEPATH
 TARGET = pt_duibutton
 

benchmarks/pt_duiimagewidget/pt_duiimagewidget.pro

@@ -1,5 +1,5 @@
 include(../common_top.pri)
-INCLUDEPATH += ../../src/include ../../src/theme
+INCLUDEPATH += ../../src/include
 DEPENDPATH += $$INCLUDEPATH
 TARGET = pt_duiimagewidget
 

benchmarks/pt_duiprogressindicator/pt_duiprogressindicator.pro

@@ -5,3 +5,5 @@ TARGET = pt_duiprogressindicator
 
 SOURCES += pt_duiprogressindicator.cpp
 HEADERS += pt_duiprogressindicator.h
+
+LIBS += -lduiviews

benchmarks/pt_duislider/pt_duislider.pro

@@ -5,3 +5,5 @@ TARGET = pt_duislider
 
 SOURCES += pt_duislider.cpp
 HEADERS += pt_duislider.h
+
+LIBS += -lduiviews

configure

@@ -533,6 +533,7 @@ DUI_QMAKE_CACHE="$outpath/.qmake.cache"
 cat >>"$DUI_QMAKE_CACHE.tmp" <<EOF
 # Autogenerated by configure script
 DUI_BUILD_TREE = \$\$quote($outpath)
+DUI_SOURCE_TREE = \$\$quote($relpath)
 
 EOF
 

demos/animatedlayout/animatedlayout.cpp

@@ -64,7 +64,7 @@
 ****************************************************************************/
 
 #include <QtGui>
-#include "../../src/core/duiexport.h"
+#include "../../src/corelib/core/duiexport.h"
 #include <DuiApplication>
 #include <DuiImageWidget>
 #include <DuiScene>

demos/animatedlayout/animatedlayout.pro

@@ -18,9 +18,9 @@ win32|macx {
         QMAKE_LFLAGS += -F../../lib
         LIBS += -framework dui
     }
-    win32:LIBS += -L../../lib -ldui0
+    win32:LIBS += -ldui0
 } else {
-    LIBS += ../../lib/libdui.so
+    LIBS += -lduicore
 }
 
 TEMPLATE = app

demos/appletinstallationsource/appletinstallationsource.pro

@@ -25,10 +25,9 @@ win32|macx {
         LIBS += -framework \
             dui
     }
-    win32:LIBS += -L../../lib \
-        -ldui0
+    win32:LIBS += -lduicore0
 }
-else:LIBS += ../../lib/libdui.so
+else:LIBS += -lduicore
 
 TARGET = $$qtLibraryTarget(appletinventory-fakeinstallationsource)
 DESTDIR = ../../lib

demos/applicationextension/applicationextension.pro

@@ -15,10 +15,14 @@ win32|macx {
         LIBS += -framework \
             dui
     }
-    win32:LIBS += -L../../lib \
-        -ldui0
+    win32:LIBS += -lduicore0
 }
-else:LIBS += ../../lib/libdui.so
+else:LIBS += \
+    -lduicore \
+    -lduiviews \
+    -lduisettings \
+    -lduiextensions \
+
 TEMPLATE = app
 TARGET = applicationextensiondemo
 target.path = $$DUI_INSTALL_BIN

demos/applicationextension/demoextension/demoextension.pro

@@ -24,10 +24,9 @@ win32|macx {
         LIBS += -framework \
             dui
     }
-    win32:LIBS += -L../../../lib \
-        -ldui0
+    win32:LIBS += -lduicore0
 }
-else:LIBS += ../../../lib/libdui.so
+else:LIBS += -lduicore
 
 TARGET = $$qtLibraryTarget(demoextension)
 DESTDIR = ../../../lib

demos/applicationextension/demoextension2/demoextension2.pro

@@ -24,10 +24,9 @@ win32|macx {
         LIBS += -framework \
             dui
     }
-    win32:LIBS += -L../../../lib \
-        -ldui0
+    win32:LIBS += -lduicore0
 }
-else:LIBS += ../../../lib/libdui.so
+else:LIBS += -lduicore
 
 TARGET = $$qtLibraryTarget(demoextension2)
 DESTDIR = ../../../lib

demos/widgetsgallery/applets/galleryapplet/galleryapplet.pro

@@ -20,10 +20,9 @@ win32|macx {
 	        QMAKE_LFLAGS += -F$$DUILIB
 	        LIBS += -framework dui
 	     }
-        win32:LIBS += -L$$DUILIB -ldui0
+        win32:LIBS += -lduicore0
 } else {
-    LIBS += $$DUILIB/libdui.so
-
+    LIBS += -lduicore
 }
 
 

demos/widgetsgallery/theme/base/style/widgetsgallery.css

@@ -1,5 +1,5 @@
-@import "../../libdui/style/fonts.css";
-@import "../../libdui/style/colors.css";
+@import "../../libduicore/style/fonts.css";
+@import "../../libduicore/style/colors.css";
 
 DuiButtonStyle#theme-selection-button {
     minimum-size: 10mm 10mm;

demos/widgetsgallery/widgetsgallery.pro

@@ -6,18 +6,22 @@ DUISRCINCLUDE = $$DUISRC/include
 DUISFWINCLUDE = $$DUIROOT/servicefw/include
 INCLUDEPATH += . \
     $$DUISRCINCLUDE \
-    $$DUISRC
+    $$DUISRC/corelib
+
 QMAKE_LIBDIR += $$DUILIB
 win32|macx {
     macx {
         QMAKE_LFLAGS += -F../../lib
         LIBS += -framework \
             dui
     }
-    win32:LIBS += -L../../lib \
-        -ldui0
+    win32:LIBS += -lduicore0
 }
-else:LIBS += ../../lib/libdui.so
+else:LIBS += \
+    -lduicore \
+    -lduiviews \
+    -lduisettings \
+    -lduiextensions \
 
 TEMPLATE = app
 TARGET = widgetsgallery

doc/src/news.dox

@@ -134,6 +134,18 @@
   - pannedRange() was renamed to range()
   - pannedPos() was renamed to position()
   - updateSizePosData() was split into three new methods: setPosition(), setViewportSize() and setRange().
+- Libdui modularization:
+  - moved src/applicationextension and src/mashup into new library libduiextensions.
+  - moved src/settingslanguage into new library libduisettings.
+  - moved part of the views in src/widgets/views to new library libduiviews.
+  - moved the rest of src/ to new library libduicore.
+  - You possibly have to update your include pathes.
+  - You possibly have to update your linking statement in the .pro
+    file. Before: -ldui, now: -lduicore -lduiviews -lduisettings -lduiextensions.
+    Or a subset of these four libs.
+  - Also make sure that you update duitheme in sync with this update, as
+    it requires some changes in duitheme.
+
 
 \section v0190
 

duiappletrunner/duiappletrunner.pro

@@ -1,17 +1,23 @@
 include(../mkspecs/common.pri)
 
 INCLUDEPATH += . \
-    ../src/mashup/mashup \
+    ../src/extensions/mashup/mashup \
     ../src/include \
-    ../src/mashup/appletcommunication \
-    ../src/mashup/appletinterface \
-    ../src/applicationextension
+    ../src/extensions/mashup/appletcommunication \
+    ../src/extensions/mashup/appletinterface \
+    ../src/extensions/applicationextension
 DEPENDPATH += $$INCLUDEPATH
 QMAKE_LIBDIR += ../lib
 TEMPLATE = app
 TARGET =
 DEPENDPATH += .
-QMAKE_LFLAGS += ../lib/libdui.so
+
+LIBS += \
+    -lduicore \
+    -lduiviews \
+    -lduisettings \
+    -lduiextensions \
+
 QT += core \
     network \
     gui \

duiapplicationextensionrunner/duiapplicationextensionrunner.pro

@@ -1,17 +1,24 @@
 include(../mkspecs/common.pri)
 
 INCLUDEPATH += . \
-    ../src/mashup/mashup \
     ../src/include \
-    ../src/mashup/appletcommunication \
-    ../src/mashup/appletinterface \
-    ../src/applicationextension
+    ../src/extensions/mashup/mashup \
+    ../src/extensions/mashup/appletcommunication \
+    ../src/extensions/mashup/appletinterface \
+    ../src/extensions/applicationextension
+
 DEPENDPATH += $$INCLUDEPATH
 QMAKE_LIBDIR += ../lib
 TEMPLATE = app
 TARGET =
 DEPENDPATH += .
-QMAKE_LFLAGS += ../lib/libdui.so
+
+LIBS += \
+    -lduicore \
+    -lduiviews \
+    -lduisettings \
+    -lduiextensions \
+
 QT += core \
     network \
     gui \
@@ -22,7 +29,7 @@ QT += core \
 # Input
 SOURCES += main.cpp \
     duiapplicationextensionrunner.cpp \
-    ../src/applicationextension/duiapplicationextensionloader.cpp
+    ../src/extensions/applicationextension/duiapplicationextensionloader.cpp
 
 HEADERS += duiapplicationextensionrunner.h \
     duiapplicationextensionloader.h

duithemedaemon/duithemedaemon.pro

@@ -1,6 +1,11 @@
 include(../mkspecs/common.pri)
 
-INCLUDEPATH += . ../src/include ../src ../src/core
+INCLUDEPATH += \
+    . \
+    ../src/include \
+    ../src/corelib \
+    ../src/corelib/core \
+
 DEPENDPATH += $$INCLUDEPATH
 QMAKE_LIBDIR += ../lib
 TEMPLATE = app
@@ -24,25 +29,25 @@ PKGCONFIG += gconf-2.0
 # Input
 SOURCES += main.cpp \
            duithemedaemonserver.cpp \
-           ../src/theme/duithemedaemon.cpp \
-           ../src/theme/duicommonpixmaps.cpp \
-           ../src/theme/duiimagedirectory.cpp \
-           ../src/theme/duithemedaemonclient.cpp \
-           ../src/theme/duithemedaemonprotocol.cpp \
-           ../src/theme/duithemeresourcemanager.cpp \
-           ../src/core/duigconfitem.cpp \
-           ../src/core/duicpumonitor.cpp \
+           ../src/corelib/theme/duithemedaemon.cpp \
+           ../src/corelib/theme/duicommonpixmaps.cpp \
+           ../src/corelib/theme/duiimagedirectory.cpp \
+           ../src/corelib/theme/duithemedaemonclient.cpp \
+           ../src/corelib/theme/duithemedaemonprotocol.cpp \
+           ../src/corelib/theme/duithemeresourcemanager.cpp \
+           ../src/corelib/core/duigconfitem.cpp \
+           ../src/corelib/core/duicpumonitor.cpp \
 
 HEADERS += \
            duithemedaemonserver.h \
-           ../src/theme/duithemedaemon.h \
-           ../src/theme/duicommonpixmaps.h \
-           ../src/theme/duiimagedirectory.h \
-           ../src/theme/duithemedaemonclient.h \
-           ../src/theme/duithemedaemonprotocol.h \
-           ../src/theme/duithemeresourcemanager.h \
-           ../src/core/duigconfitem.h \
-           ../src/core/duicpumonitor.h \
+           ../src/corelib/theme/duithemedaemon.h \
+           ../src/corelib/theme/duicommonpixmaps.h \
+           ../src/corelib/theme/duiimagedirectory.h \
+           ../src/corelib/theme/duithemedaemonclient.h \
+           ../src/corelib/theme/duithemedaemonprotocol.h \
+           ../src/corelib/theme/duithemeresourcemanager.h \
+           ../src/corelib/core/duigconfitem.h \
+           ../src/corelib/core/duicpumonitor.h \
            keypresswaiter.h \
 
 QMAKE_EXTRA_TARGETS += check

examples/lifecycle/lifecycle.pro

@@ -15,10 +15,10 @@ win32|macx {
         LIBS += -framework \
             dui
     }
-    win32:LIBS += -L../../lib \
-        -ldui0
+    win32:LIBS += -lduicore0
 }
-else:LIBS += ../../lib/libdui.so
+else:LIBS += -lduicore
+
 TEMPLATE = app
 TARGET = lifecycle
 target.path = /usr/bin

examples/servicefw/user/user.pro

@@ -30,8 +30,7 @@ SOURCES    = \
     echowindow.cpp \
     main.cpp \
 
-LIBS += \
-    ../../../lib/libdui.so \
+LIBS += -lduicore
 
 QT += dbus
 LIBS += \

mkspecs/common.pri

@@ -86,4 +86,6 @@ contains(USE_CCACHE, "true") {
     QMAKE_CXX = ccache g++
 }
 
+QMAKE_LIBDIR += $${DUI_BUILD_TREE}/lib
+
 include(shared.pri)

mkspecs/features/dui.prf

@@ -28,7 +28,7 @@ macx {
         DEPENDPATH += $${DUI_INC_DIR}
 
         unix: QMAKE_LFLAGS += $${QMAKE_RPATH}$${DUI_LIB_DIR}
-        LIBS += -L$${DUI_LIB_DIR} -ldui
+        LIBS += -L$${DUI_LIB_DIR} -lduicore -lduiviews -lduisettings -lduiextensions
         QMAKE_MOC = duimoc
 
         isEmpty(DUIGEN_OUTDIR) {

plainqt/style/style.pri

@@ -1,5 +1,4 @@
-INCLUDEPATH+=../../src/style
-#../../src/widgets
+INCLUDEPATH+=../../src/views/style
 
 PUBLIC_HEADERS += \
   qtmaemo6style.h