Further cleanup of the build system

diff --git a/common.pri b/common.pri
deleted file mode 100644 (file)
index f7d3012..0000000
--- a/common.pri
+++ /dev/null
@@ -1,47 +0,0 @@
-VERSION = 0.2.5
-TARGET = dialer
-CONFIG += link_pkgconfig network opengl
-
-# Build configuration
-
-!win32-msvc*:QMAKE_CXXFLAGS += -g
-
-# Features
-DEFINES += DBUS_SERVICE_PATH=\\\"/com/tizen/${QMAKE_TARGET}\\\"
-DEFINES += DBUS_SERVICE=\\\"com.tizen.${QMAKE_TARGET}\\\"
-
-# Sound theme base dir
-DEFINES += SOUNDS_DIR=\\\"\"$$M_INSTALL_DATA/sounds\"\\\"
-
-M_DBUS_SERVICES_DIR = $$M_INSTALL_DATA/dbus-1/services
-
-# Defines for directories, for use in source code.
-# They work cross-platform like this.
-{
-    # APPLET_LIBS determines the location where all applet binaries are
-    DEFINES += APPLET_LIBS=\\\"\"$$M_APPLET_DIR\"\\\"
-
-    # APPLET_DATA determines where the .desktop files are located
-    DEFINES += APPLET_DATA=\\\"\"$$M_APPLET_DATA_DIR\"\\\"
-
-    # APPLET_SETTINGS_DIR determines where the applet global and instance settings files are located
-    DEFINES += APPLET_SETTINGS_DIR=\\\"\"$$M_APPLET_SETTINGS_DIR\"\\\"
-
-    # TRANSLATION_DIR determines the default translation path
-    DEFINES += TRANSLATION_DIR=\\\"\"$$M_TRANSLATION_DIR\"\\\"
-
-    # M_THEME_PRELOAD_DIR and M_THEME_POST_PRELOAD_DIR defines from where
-    # to get lists of images to be preloaded
-    DEFINES += M_THEME_PRELOAD_DIR=\\\"\"$$M_THEME_PRELOAD_DIR\"\\\"
-    DEFINES += M_THEME_POST_PRELOAD_DIR=\\\"\"$$M_THEME_POST_PRELOAD_DIR\"\\\"
-    DEFINES += M_DBUS_SERVICES_DIR=\\\"\"$$M_DBUS_SERVICES_DIR\"\\\"
-    DEFINES += M_XDG_DIR=\\\"\"$$M_XDG_DIR\"\\\"
-}
-
-# defines for dependencies
-!win32:!macx{
-    DEFINES += HAVE_CONTEXTSUBSCRIBER
-    DEFINES += HAVE_ICU
-    DEFINES += HAVE_GCONF
-    DEFINES += HAVE_GSTREAMER
-}

diff --git a/dialer.desktop b/dialer.desktop
index d8b400b..18e5bf8 100644 (file)
--- a/dialer.desktop
+++ b/dialer.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Application
-Name=Dialer
-Icon=icons-Applications-dialer
+Name=Handsfree Dialer
+Icon=hfdialer
 Exec=dialer
-Comment=Tizen voice call application
+Comment=Handsfree Dialer Application
 X-Desktop-File-Install-Version=0.16

diff --git a/makedist b/makedist
deleted file mode 100755 (executable)
index b215f37..0000000
--- a/makedist
+++ /dev/null
@@ -1,61 +0,0 @@
-#!/bin/bash
-
-# Determine project name based on current directory
-#PROJECT=$(basename $PWD)
-PROJECT="tizen-handset-dialer"
-
-# NOTE: Don't like this?  Then uncomment one of the following as appropriate
-#
-# Just set it explictly to whatever you like:
-# PROJECT=libseaside
-#
-# Parse it from any Qt *.pro or *.pri files in CWD:
-# PROJECT=$(grep -E "TARGET ?= ?" *.pr[io]|cut -d' ' -f3)
-
-# Grab most recent tag from git
-TAG=$(git describe --tags --abbrev=0)
-
-# If arg1 is provided, use it as commit/tag/tree-ish id to start
-# the archive creation from...
-[ "${1}z" != "z" ] && {
-       TAG=${1}
-       echo "Creating release starting from: ${TAG}"
-}
-
-VERSION=$(git describe --tags ${1})
-VERSION=${VERSION//version-/}
-VERSION=${VERSION//-g/+}
-VERSION=${VERSION//-/+git}
-
-# Set name of toplevel directory for the archive
-BASE_PREFIX="${PROJECT}-${VERSION}/"
-BRANDING_PREFIX="${PROJECT}-branding-tizen-${VERSION}/"
-
-# Set name of resulting release archive file
-BASE_ARCHIVE=${PROJECT}-${VERSION}.tar.bz2
-BRANDING_ARCHIVE=${PROJECT}-branding-tizen-${VERSION}.tar.bz2
-
-# Clean up any existing base package for this version
-[ -e ${BASE_ARCHIVE} ] && rm -rf ${BASE_ARCHIVE} &&
-       echo "Removed: ${BASE_ARCHIVE}"
-
-# Generate the base package release tar ball
-# NOTE: Becuase I used a git attribute that ignores the tizen theme dir
-#       this archive will not include it... that's intentional!
-git archive --prefix=${BASE_PREFIX} ${TAG} | bzip2 -c -- > ${BASE_ARCHIVE} && {
-       echo "Created: ${BASE_ARCHIVE}"
-} || {
-       echo "Creation of release archive ${BASE_ARCHIVE} failed.  Reason unknown."
-}
-
-# Clean up any existing branding package for this version
-[ -e ${BRANDING_ARCHIVE} ] && rm -rf ${BRANDING_ARCHIVE} &&
-       echo "Removed: ${BRANDING_ARCHIVE}"
-# Generate the branding package release tar ball
-pushd themes > /dev/null
-git archive --prefix=${BRANDING_PREFIX} ${TAG} tizen/ themes.pro | bzip2 -c -- > ../${BRANDING_ARCHIVE} && {
-       echo "Created: ${BRANDING_ARCHIVE}"
-} || {
-       echo "Creation of release archive ${BRANDING_ARCHIVE} failed.  Reason unknown."
-}
-popd > /dev/null

diff --git a/projects.pro b/projects.pro
index 6fa3d40..c5aae48 100644 (file)
--- a/projects.pro
+++ b/projects.pro
@@ -1,12 +1,11 @@
-include (common.pri)
+VERSION = 0.2.5
+CONFIG += link_pkgconfig network opengl
+
 TEMPLATE = subdirs
 CONFIG += ordered 
 SUBDIRS = src qml dialerassets sounds
 
-#OTHER_FILES += dialer.service
 OTHER_FILES += *.service *.desktop *.sh
-M_INSTALL_BIN = /usr/bin
-M_INSATLL_DATA = /usr/share
 
 # Desktop
 desktop_entry.files = dialer.desktop
@@ -15,7 +14,7 @@ desktop_entry.CONFIG += no_check_exist
 
 # DBus service
 dbus_service.files = dialer.service
-dbus_service.path += $$INSTALL_ROOT/usr/share$$M_DBUS_SERVICES_DIR
+dbus_service.path += $$INSTALL_ROOT/usr/share/dbus-1/services
 
 # Documentation
 documentation.files = AUTHORS ChangeLog LICENSE README TODO

diff --git a/src/main.cpp b/src/main.cpp
index 2721898..fc60ac8 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -18,12 +18,6 @@
 #include <QDeclarativeView>
 #include <QFile>
 
-#define CONFIG_KEY_TARGET_UX "/apps/dialer/ux"
-
-#if !defined(CONFIG_DEFAULT_TARGET_UX)
-#  define CONFIG_DEFAULT_TARGET_UX "tizen-ux-components"
-#endif
-
 int main(int argc, char *argv[])
 {
     TRACE

diff --git a/src/src.pro b/src/src.pro
index 7862de5..a18581c 100644 (file)
--- a/src/src.pro
+++ b/src/src.pro
@@ -1,4 +1,4 @@
-include (../common.pri)
+TARGET = dialer
 TEMPLATE = app
 QT += dbus declarative
 CONFIG += qdbus mobility qt-mobility link_pkgconfig network
@@ -8,6 +8,9 @@ MOC_DIR = .moc
 OBJECTS_DIR = .obj
 MGEN_OUTDIR = .gen
 
+DEFINES += DBUS_SERVICE_PATH=\\\"/com/tizen/${QMAKE_TARGET}\\\"
+DEFINES += DBUS_SERVICE=\\\"com.tizen.${QMAKE_TARGET}\\\"
+
 if (verbose) {
     DEFINES += VERBOSE 
 }
@@ -20,8 +23,6 @@ if (wayland) {
     PKGCONFIG += mlite ofono-qt
 }
 
-DEFINES += CONFIG_DEFAULT_TARGET_UX=\\\"tizen-ux-components\\\"
-
 target.path += $$INSTALL_ROOT/usr/bin 
 
 SOURCES += main.cpp \