From ea45d64656f8a0defe3c9713fac45005428a29ea Mon Sep 17 00:00:00 2001 From: "Javier S. Pedro" Date: Sun, 18 Sep 2011 04:57:46 +0200 Subject: trying to fix Harmattan packaging --- metawatch/metawatch.pro | 11 +- qtc_packaging/debian_harmattan/control | 2 +- qtc_packaging/debian_harmattan/rules | 19 +- sowatch.pro | 5 +- sowatch.pro.user | 18 +- sowatchd/sowatchd.pro | 8 +- sowsim/main.cpp | 8 - sowsim/sowsim.pro | 30 -- sowsim/sowsim.pro.user | 550 --------------------------------- 9 files changed, 30 insertions(+), 621 deletions(-) delete mode 100644 sowsim/main.cpp delete mode 100644 sowsim/sowsim.pro delete mode 100644 sowsim/sowsim.pro.user diff --git a/metawatch/metawatch.pro b/metawatch/metawatch.pro index fe04b11..f4b86f8 100644 --- a/metawatch/metawatch.pro +++ b/metawatch/metawatch.pro @@ -4,9 +4,10 @@ # #------------------------------------------------- -TARGET = metawatch +TARGET = metawatchdriver TEMPLATE = lib # CONFIG += plugin # Stupid Qt creator doesn't want to deploy plugins +QT += gui CONFIG += mobility MOBILITY += connectivity systeminfo @@ -33,10 +34,10 @@ OTHER_FILES += \ idle_gmail.bmp \ idle_call.bmp -win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../libsowatch/release/ -llibsowatch -else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../libsowatch/debug/ -llibsowatch -else:symbian: LIBS += -llibsowatch -else:unix: LIBS += -L$$OUT_PWD/../libsowatch/ -llibsowatch +win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../libsowatch/release/ -lsowatch +else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../libsowatch/debug/ -lsowatch +else:symbian: LIBS += -lsowatch +else:unix: LIBS += -L$$OUT_PWD/../libsowatch/ -lsowatch INCLUDEPATH += $$PWD/../libsowatch DEPENDPATH += $$PWD/../libsowatch diff --git a/qtc_packaging/debian_harmattan/control b/qtc_packaging/debian_harmattan/control index fd0b257..0253449 100644 --- a/qtc_packaging/debian_harmattan/control +++ b/qtc_packaging/debian_harmattan/control @@ -2,7 +2,7 @@ Source: sowatch Section: user/other Priority: optional Maintainer: Javier -Build-Depends: debhelper (>= 5), libqt4-dev +Build-Depends: debhelper (>= 5), libqt4-dev, libqtm-dev Standards-Version: 3.7.3 Homepage: diff --git a/qtc_packaging/debian_harmattan/rules b/qtc_packaging/debian_harmattan/rules index da02eb9..fe6b318 100755 --- a/qtc_packaging/debian_harmattan/rules +++ b/qtc_packaging/debian_harmattan/rules @@ -7,11 +7,7 @@ # This special exception was added by Craig Small in version 0.37 of dh-make. # Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 - - - - +# export DH_VERBOSE=1 configure: configure-stamp configure-stamp: @@ -64,25 +60,16 @@ binary-arch: build install dh_installdocs dh_installexamples # dh_install -# dh_installmenu -# dh_installdebconf -# dh_installlogrotate -# dh_installemacsen -# dh_installpam # dh_installmime -# dh_python # dh_installinit -# dh_installcron -# dh_installinfo dh_installman dh_link dh_strip dh_compress dh_fixperms -# dh_perl -# dh_makeshlibs + dh_makeshlibs dh_installdeb - # dh_shlibdeps # Uncomment this line for use without Qt Creator + dh_shlibdeps dh_gencontrol dh_md5sums dh_builddeb diff --git a/sowatch.pro b/sowatch.pro index d32b0da..62f30fe 100644 --- a/sowatch.pro +++ b/sowatch.pro @@ -1,8 +1,7 @@ TEMPLATE = subdirs SUBDIRS = libsowatch \ metawatch \ - sowatchd \ - sowsim + sowatchd OTHER_FILES += \ qtc_packaging/debian_harmattan/rules \ @@ -20,3 +19,5 @@ OTHER_FILES += \ + + diff --git a/sowatch.pro.user b/sowatch.pro.user index fe14858..320b827 100644 --- a/sowatch.pro.user +++ b/sowatch.pro.user @@ -1,6 +1,6 @@ - + ProjectExplorer.Project.ActiveTarget @@ -528,10 +528,18 @@ Deploy Debian package via SFTP upload MaemoUploadAndInstallDpkgPackageStep - - - - + + /mnt/Fuentes/Javier/Maemo/qt/sowatch-build-harmattan-release/sowatch_0.1.1_armel.deb + + + harm + + + + + + 2011-09-18T04:49:50 + 3 Deploy diff --git a/sowatchd/sowatchd.pro b/sowatchd/sowatchd.pro index 1c09046..1e02404 100644 --- a/sowatchd/sowatchd.pro +++ b/sowatchd/sowatchd.pro @@ -15,10 +15,10 @@ CONFIG -= app_bundle SOURCES += main.cpp \ daemon.cpp -win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../libsowatch/release/ -llibsowatch -else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../libsowatch/debug/ -llibsowatch -else:symbian: LIBS += -llibsowatch -else:unix: LIBS += -L$$OUT_PWD/../libsowatch/ -llibsowatch +win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../libsowatch/release/ -lsowatch +else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../libsowatch/debug/ -lsowatch +else:symbian: LIBS += -lsowatch +else:unix: LIBS += -L$$OUT_PWD/../libsowatch/ -lsowatch INCLUDEPATH += $$PWD/../libsowatch DEPENDPATH += $$PWD/../libsowatch diff --git a/sowsim/main.cpp b/sowsim/main.cpp deleted file mode 100644 index b09960a..0000000 --- a/sowsim/main.cpp +++ /dev/null @@ -1,8 +0,0 @@ -#include - -int main(int argc, char *argv[]) -{ - QApplication a(argc, argv); - - return a.exec(); -} diff --git a/sowsim/sowsim.pro b/sowsim/sowsim.pro deleted file mode 100644 index 576479b..0000000 --- a/sowsim/sowsim.pro +++ /dev/null @@ -1,30 +0,0 @@ -#------------------------------------------------- -# -# Project created by QtCreator 2011-09-16T23:52:50 -# -#------------------------------------------------- - -TEMPLATE = app - -TARGET = sowsim - -QT += core - -SOURCES += main.cpp - -win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../libsowatch/release/ -llibsowatch -else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../libsowatch/debug/ -llibsowatch -else:symbian: LIBS += -llibsowatch -else:unix: LIBS += -L$$OUT_PWD/../libsowatch/ -llibsowatch - -INCLUDEPATH += $$PWD/../libsowatch -DEPENDPATH += $$PWD/../libsowatch - -unix { - maemo5 { - target.path = /opt/sowatch - } else { - target.path = /usr/bin - } - INSTALLS += target -} diff --git a/sowsim/sowsim.pro.user b/sowsim/sowsim.pro.user deleted file mode 100644 index 11de97a..0000000 --- a/sowsim/sowsim.pro.user +++ /dev/null @@ -1,550 +0,0 @@ - - - - - - ProjectExplorer.Project.ActiveTarget - 0 - - - ProjectExplorer.Project.EditorSettings - - true - false - - Cpp - - false - CppGlobal - true - false - true - false - false - false - true - true - false - true - false - false - false - true - false - - - 1 - System - Global - 4 - true - 1 - true - false - true - - Cpp - - true - false - CppGlobal - 4 - 1 - false - true - 0 - 8 - - - - QmlJS - - true - false - QmlJSGlobal - 4 - 1 - false - true - 0 - 8 - - - 2 - 0 - 8 - true - 2 - true - true - true - false - - - - ProjectExplorer.Project.Target.0 - - Desktop - Desktop - Qt4ProjectManager.Target.DesktopTarget - 0 - 1 - 0 - - ProjectExplorer.ToolChain.Gcc:/usr/bin/g++.x86-linux-generic-elf-64bit.gdb - - - qmake - - QtProjectManager.QMakeBuildStep - false - true - - false - - - Make - - Qt4ProjectManager.MakeStep - false - - - - 2 - Build - - ProjectExplorer.BuildSteps.Build - - - - Make - - Qt4ProjectManager.MakeStep - true - clean - - - 1 - Clean - - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Desktop Qt 4.7.4 for GCC (Qt SDK) Release - - Qt4ProjectManager.Qt4BuildConfiguration - 0 - /home/javier/maemo/qt/sowsim-build-desktop-release - 13 - true - - - ProjectExplorer.ToolChain.Gcc:/usr/bin/g++.x86-linux-generic-elf-64bit.gdb - - - qmake - - QtProjectManager.QMakeBuildStep - false - true - - false - - - Make - - Qt4ProjectManager.MakeStep - false - - - - 2 - Build - - ProjectExplorer.BuildSteps.Build - - - - Make - - Qt4ProjectManager.MakeStep - true - clean - - - 1 - Clean - - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Desktop Qt 4.7.4 for GCC (Qt SDK) Debug - - Qt4ProjectManager.Qt4BuildConfiguration - 2 - /home/javier/maemo/qt/sowsim-build-desktop-debug - 13 - true - - 2 - - - 0 - Deploy - - ProjectExplorer.BuildSteps.Deploy - - 1 - No deployment - - ProjectExplorer.DefaultDeployConfiguration - - - - - Create tarball - - MaemoTarPackageCreationStep - - - Deploy tarball via SFTP upload - - MaemoUploadAndInstallTarPackageStep - - - - - - 2 - Deploy - - ProjectExplorer.BuildSteps.Deploy - - 1 - Build Tarball and Install to Linux Host - - DeployToGenericLinux - 0 - - 2 - - true - true - - - false - false - false - false - false - false - false - false - true - true - 0.01 - 0.01 - 10 - 10 - true - true - 25 - 25 - - - true - true - valgrind - valgrind - - 0 - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - 11 - 12 - 13 - 14 - - - 0 - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - 11 - 12 - 13 - 14 - - sowsim - - Qt4ProjectManager.Qt4RunConfiguration - 2 - - sowsim.pro - false - true - - - 3768 - true - false - false - - 1 - - - - ProjectExplorer.Project.Target.1 - - Harmattan - Harmattan - Qt4ProjectManager.Target.HarmattanDeviceTarget - 0 - 0 - 0 - - Qt4ProjectManager.ToolChain.Maemo:/home/javier/opt/QtSDK/Madde/targets/harmattan-nokia-meego-api/bin/gcc.arm-linux-generic-elf-32bit./home/javier/opt/QtSDK/pythongdb/gdb - - - qmake - - QtProjectManager.QMakeBuildStep - false - true - - false - - - Make - - Qt4ProjectManager.MakeStep - false - - - - 2 - Build - - ProjectExplorer.BuildSteps.Build - - - - Make - - Qt4ProjectManager.MakeStep - true - clean - - - 1 - Clean - - ProjectExplorer.BuildSteps.Clean - - 2 - false - - MeeGo 1.2 Harmattan API (Qt SDK) Release - - Qt4ProjectManager.Qt4BuildConfiguration - 0 - /home/javier/maemo/qt/sowsim-build-harmattan-release - 10 - true - - - Qt4ProjectManager.ToolChain.Maemo:/home/javier/opt/QtSDK/Madde/targets/harmattan-nokia-meego-api/bin/gcc.arm-linux-generic-elf-32bit./home/javier/opt/QtSDK/pythongdb/gdb - - - qmake - - QtProjectManager.QMakeBuildStep - false - true - - false - - - Make - - Qt4ProjectManager.MakeStep - false - - - - 2 - Build - - ProjectExplorer.BuildSteps.Build - - - - Make - - Qt4ProjectManager.MakeStep - true - clean - - - 1 - Clean - - ProjectExplorer.BuildSteps.Clean - - 2 - false - - MeeGo 1.2 Harmattan API (Qt SDK) Debug - - Qt4ProjectManager.Qt4BuildConfiguration - 2 - /home/javier/maemo/qt/sowsim-build-harmattan-debug - 10 - true - - 2 - - - - Create Debian Package - - MaemoDebianPackageCreationStep - - - - Install Debian package to sysroot - MaemoInstallDebianPackageToSysrootStep - - - Deploy Debian package via SFTP upload - - MaemoUploadAndInstallDpkgPackageStep - - - - - - 3 - Deploy - - ProjectExplorer.BuildSteps.Deploy - - 1 - Build Debian Package and Install to Harmattan Device - - DeployToHarmattan - 0 - - 1 - - true - true - - - false - false - false - false - false - false - false - false - true - true - 0.01 - 0.01 - 10 - 10 - true - true - 25 - 25 - - - true - true - valgrind - valgrind - - 0 - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - 11 - 12 - 13 - 14 - - - 0 - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - 11 - 12 - 13 - 14 - - sowsim (remote) - - Qt4ProjectManager.MaemoRunConfiguration - - 1 - - sowsim.pro - - - 3768 - true - false - false - - 1 - - - - ProjectExplorer.Project.TargetCount - 2 - - - ProjectExplorer.Project.Updater.EnvironmentId - {4e827e92-6882-4bad-8513-da5dad54ff3f} - - - ProjectExplorer.Project.Updater.FileVersion - 10 - - -- cgit v1.2.3