Ubuntu Notes app

Merge lp:~mzanetti/reminders-app/switch-to-cmake into lp:reminders-app

  1. switch-to-cmake
  2. Merge into trunk
Proposed by Michael Zanetti
Status: Merged
Approved by: Alan Pope 🍺🐧🐱 🦄
Approved revision: 46
Merged at revision: 27
Proposed branch: lp:~mzanetti/reminders-app/switch-to-cmake
Merge into: lp:reminders-app
Prerequisite: lp:~mzanetti/reminders-app/use-webview
Diff against target: 455 lines (+153/-194)
18 files modified
3rdParty/3rdParty.pro (+0/-4)
3rdParty/CMakeLists.txt (+2/-0)
3rdParty/evernote-sdk-cpp/CMakeLists.txt (+21/-0)
3rdParty/evernote-sdk-cpp/evernote-sdk-cpp.pro (+0/-35)
3rdParty/libthrift/CMakeLists.txt (+40/-0)
3rdParty/libthrift/libthrift.pro (+0/-43)
CMakeLists.txt (+10/-0)
debian/control (+2/-1)
reminders-app.pro (+0/-8)
run_on_ubuntu_touch.sh (+2/-3)
src/CMakeLists.txt (+2/-0)
src/app/CMakeLists.txt (+15/-0)
src/app/app.pro (+0/-25)
src/plugin/CMakeLists.txt (+6/-0)
src/plugin/Evernote/CMakeLists.txt (+53/-0)
src/plugin/Evernote/Evernote.pro (+0/-71)
src/plugin/plugin.pro (+0/-2)
src/src.pro (+0/-2)
To merge this branch: bzr merge lp:~mzanetti/reminders-app/switch-to-cmake
Reviewer Review Type Date Requested Status
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Alan Pope 🍺🐧🐱 🦄 (community) Needs Fixing
Review via email: mp+199377@code.launchpad.net

Commit message

switch from qmake to cmake

To post a comment you must log in.
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

FAILED: Continuous integration, rev:40
http://91.189.93.70:8080/job/reminders-app-ci/52/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/515/console
    FAILURE: http://91.189.93.70:8080/job/reminders-app-saucy-amd64-ci/52/console
    FAILURE: http://91.189.93.70:8080/job/reminders-app-trusty-amd64-ci/52/console

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/reminders-app-ci/52/rebuild

review: Needs Fixing (continuous-integration)
lp:~mzanetti/reminders-app/switch-to-cmake updated
41. By Michael Zanetti

merge trunk

Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

FAILED: Continuous integration, rev:41
http://91.189.93.70:8080/job/reminders-app-ci/54/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/517/console
    FAILURE: http://91.189.93.70:8080/job/reminders-app-saucy-amd64-ci/54/console
    FAILURE: http://91.189.93.70:8080/job/reminders-app-trusty-amd64-ci/54/console

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/reminders-app-ci/54/rebuild

review: Needs Fixing (continuous-integration)
lp:~mzanetti/reminders-app/switch-to-cmake updated
42. By Michael Zanetti

install plugin files as expected by .install file

Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

PASSED: Continuous integration, rev:42
http://91.189.93.70:8080/job/reminders-app-ci/55/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/518
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-saucy-amd64-ci/55
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-trusty-amd64-ci/55

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/reminders-app-ci/55/rebuild

review: Approve (continuous-integration)
lp:~mzanetti/reminders-app/switch-to-cmake updated
43. By Michael Zanetti

merge prerequisite branch

44. By Michael Zanetti

use absolute include path

Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

PASSED: Continuous integration, rev:43
http://91.189.93.70:8080/job/reminders-app-ci/56/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/519
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-saucy-amd64-ci/56
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-trusty-amd64-ci/56

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/reminders-app-ci/56/rebuild

review: Approve (continuous-integration)
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

PASSED: Continuous integration, rev:44
http://91.189.93.70:8080/job/reminders-app-ci/57/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/520
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-saucy-amd64-ci/57
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-trusty-amd64-ci/57

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/reminders-app-ci/57/rebuild

review: Approve (continuous-integration)
Revision history for this message
Alan Pope 🍺🐧🐱 🦄 (popey) wrote :
Download full text (5.1 KiB)

This fails to deploy/build for me because cmake isn't pre-installed by "run_on_ubuntu_touch.sh -s" I guess?

alan@deep-thought:/tmp/switch-to-cmake$ ./run_on_ubuntu_touch.sh -s
adbd is already running as root
ssh start/running, process 3020
Transferring code..
Warning: Permanently added '[127.0.0.1]:2222' (RSA) to the list of known hosts.
sending incremental file list

sent 11638 bytes received 77 bytes 23430.00 bytes/sec
total size is 3231629 speedup is 275.85
Setting up environment for building reminders-app...
/home/alan/.ssh/known_hosts updated.
Original contents retained as /home/alan/.ssh/known_hosts.old
9 KB/s (399 bytes in 0.041s)
Reading package lists... Done
Building dependency tree
Reading state information... Done
build-essential is already the newest version.
libboost-dev is already the newest version.
libssl-dev is already the newest version.
qt5-default is already the newest version.
qtbase5-dev is already the newest version.
qtdeclarative5-dev is already the newest version.
0 upgraded, 0 newly installed, 0 to remove and 3 not upgraded.
Warning: Permanently added '[127.0.0.1]:2222' (RSA) to the list of known hosts.
sending incremental file list

sent 11638 bytes received 77 bytes 23430.00 bytes/sec
total size is 3231629 speedup is 275.85
alan@deep-thought:/tmp/switch-to-cmake$ ./run_on_ubuntu_touch.sh
adbd is already running as root
start: Job is already running: ssh
Transferring code..
Warning: Permanently added '[127.0.0.1]:2222' (RSA) to the list of known hosts.
sending incremental file list

sent 11638 bytes received 77 bytes 23430.00 bytes/sec
total size is 3231629 speedup is 275.85
Building..
Warning: Permanently added '[127.0.0.1]:2222' (RSA) to the list of known hosts.
Connection to 127.0.0.1 closed.
Warning: Permanently added '[127.0.0.1]:2222' (RSA) to the list of known hosts.
bash: cmake: command not found
Connection to 127.0.0.1 closed.
Warning: Permanently added '[127.0.0.1]:2222' (RSA) to the list of known hosts.
make: *** No targets specified and no makefile found. Stop.
Connection to 127.0.0.1 closed.
Running..
Warning: Permanently added '[127.0.0.1]:2222' (RSA) to the list of known hosts.
bash: cd: reminders-app/builddir/src/app/: No such file or directory
Connection to 127.0.0.1 closed.
alan@deep-thought:/tmp/switch-to-cmake$ adb shell
root@ubuntu-phablet:/# sudo apt-get ^C
root@ubuntu-phablet:/# apt-get install cmake
Reading package lists... Done
Building dependency tree
Reading state information... Done
The following extra packages will be installed:
  cmake-data
Suggested packages:
  codeblocks eclipse
The following NEW packages will be installed:
  cmake cmake-data
0 upgraded, 2 newly installed, 0 to remove and 3 not upgraded.
Need to get 3002 kB of archives.
After this operation, 12.5 MB of additional disk space will be used.
Do you want to continue? [Y/n]
Get:1 http://ports.ubuntu.com/ubuntu-ports/ trusty/main cmake-data all 2.8.12.1-1ubuntu3 [675 kB]
Get:2 http://ports.ubuntu.com/ubuntu-ports/ trusty/main cmake armhf 2.8.12.1-1ubuntu3 [23...

Read more...

Revision history for this message
Alan Pope 🍺🐧🐱 🦄 (popey) wrote :

Other than that, it works okay once cmake is installed on device.

review: Needs Fixing
lp:~mzanetti/reminders-app/switch-to-cmake updated
45. By Michael Zanetti

added cmake to run_on_ubuntu_touch -s

Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

FAILED: Continuous integration, rev:45
http://91.189.93.70:8080/job/reminders-app-ci/58/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/593/console
    FAILURE: http://91.189.93.70:8080/job/reminders-app-saucy-amd64-ci/58/console
    FAILURE: http://91.189.93.70:8080/job/reminders-app-trusty-amd64-ci/58/console

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/reminders-app-ci/58/rebuild

review: Needs Fixing (continuous-integration)
lp:~mzanetti/reminders-app/switch-to-cmake updated
46. By Michael Zanetti

merge prerequisite

Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

PASSED: Continuous integration, rev:46
http://91.189.93.70:8080/job/reminders-app-ci/61/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/640
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-saucy-amd64-ci/61
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-trusty-amd64-ci/61

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/reminders-app-ci/61/rebuild

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== removed file '3rdParty/3rdParty.pro'
--- 3rdParty/3rdParty.pro 2013-11-21 23:30:15 +0000
+++ 3rdParty/3rdParty.pro 1970-01-01 00:00:00 +0000
@@ -1,4 +0,0 @@
1TEMPLATE = subdirs
2SUBDIRS = libthrift evernote-sdk-cpp
3
4evernote-sdk-cpp.depends = libthrift
50
=== added file '3rdParty/CMakeLists.txt'
--- 3rdParty/CMakeLists.txt 1970-01-01 00:00:00 +0000
+++ 3rdParty/CMakeLists.txt 2014-01-10 12:07:36 +0000
@@ -0,0 +1,2 @@
1add_subdirectory(libthrift)
2add_subdirectory(evernote-sdk-cpp)
03
=== added file '3rdParty/evernote-sdk-cpp/CMakeLists.txt'
--- 3rdParty/evernote-sdk-cpp/CMakeLists.txt 1970-01-01 00:00:00 +0000
+++ 3rdParty/evernote-sdk-cpp/CMakeLists.txt 2014-01-10 12:07:36 +0000
@@ -0,0 +1,21 @@
1include_directories(
2 ${CMAKE_CURRENT_SOURCE_DIR}
3 ${CMAKE_SOURCE_DIR}/3rdParty/libthrift
4)
5
6SET(evernote-sdk-cpp_SRCS
7 src/Errors_constants.cpp
8 src/Errors_types.cpp
9 src/Limits_constants.cpp
10 src/Limits_types.cpp
11 src/NoteStore_constants.cpp
12 src/NoteStore.cpp
13 src/NoteStore_types.cpp
14 src/Types_constants.cpp
15 src/Types_types.cpp
16 src/UserStore_constants.cpp
17 src/UserStore.cpp
18 src/UserStore_types.cpp
19)
20
21add_library(evernote-sdk-cpp ${evernote-sdk-cpp_SRCS})
022
=== removed file '3rdParty/evernote-sdk-cpp/evernote-sdk-cpp.pro'
--- 3rdParty/evernote-sdk-cpp/evernote-sdk-cpp.pro 2013-11-21 23:30:15 +0000
+++ 3rdParty/evernote-sdk-cpp/evernote-sdk-cpp.pro 1970-01-01 00:00:00 +0000
@@ -1,35 +0,0 @@
1TEMPLATE = lib
2
3CONFIG = staticlib
4
5QMAKE_CXXFLAGS += -std=c++0x -fPIC
6
7INCLUDEPATH += ../libthrift
8
9LIBS += -L../libthrift -llibthrift
10
11SOURCES += src/Errors_constants.cpp \
12 src/Errors_types.cpp \
13 src/Limits_constants.cpp \
14 src/Limits_types.cpp \
15 src/NoteStore_constants.cpp \
16 src/NoteStore.cpp \
17 src/NoteStore_types.cpp \
18 src/Types_constants.cpp \
19 src/Types_types.cpp \
20 src/UserStore_constants.cpp \
21 src/UserStore.cpp \
22 src/UserStore_types.cpp
23
24HEADERS += src/Errors_constants.h \
25 src/Errors_types.h \
26 src/Limits_constants.h \
27 src/Limits_types.h \
28 src/NoteStore_constants.h \
29 src/NoteStore.h \
30 src/NoteStore_types.h \
31 src/Types_constants.h \
32 src/Types_types.h \
33 src/UserStore_constants.h \
34 src/UserStore.h \
35 src/UserStore_types.h
360
=== added file '3rdParty/libthrift/CMakeLists.txt'
--- 3rdParty/libthrift/CMakeLists.txt 1970-01-01 00:00:00 +0000
+++ 3rdParty/libthrift/CMakeLists.txt 2014-01-10 12:07:36 +0000
@@ -0,0 +1,40 @@
1include_directories(
2 ${CMAKE_CURRENT_SOURCE_DIR}
3)
4
5add_definitions( -DHAVE_CONFIG_H )
6
7SET(libthrift_SRCS
8 Thrift.cpp
9 TApplicationException.cpp
10 async/TAsyncChannel.cpp
11 async/TAsyncProtocolProcessor.cpp
12 #async/TEvhttpClientChannel.cpp
13 #async/TEvhttpServer.cpp
14 transport/TBufferTransports.cpp
15 transport/TFDTransport.cpp
16 transport/TFileTransport.cpp
17 transport/THttpClient.cpp
18 transport/THttpServer.cpp
19 transport/THttpTransport.cpp
20 transport/TServerSocket.cpp
21 transport/TSimpleFileTransport.cpp
22 transport/TSocket.cpp
23 transport/TSocketPool.cpp
24 transport/TSSLServerSocket.cpp
25 transport/TSSLSocket.cpp
26 transport/TTransportException.cpp
27 transport/TTransportUtils.cpp
28 transport/TZlibTransport.cpp
29 #concurrency/BoostMonitor.cpp
30 #concurrency/BoostMutex.cpp
31 #concurrency/BoostThreadFactory.cpp
32 concurrency/Monitor.cpp
33 concurrency/Mutex.cpp
34 concurrency/PosixThreadFactory.cpp
35 concurrency/ThreadManager.cpp
36 concurrency/TimerManager.cpp
37 concurrency/Util.cpp
38)
39
40add_library(libthrift ${libthrift_SRCS})
041
=== removed file '3rdParty/libthrift/libthrift.pro'
--- 3rdParty/libthrift/libthrift.pro 2013-11-21 23:30:15 +0000
+++ 3rdParty/libthrift/libthrift.pro 1970-01-01 00:00:00 +0000
@@ -1,43 +0,0 @@
1TEMPLATE = lib
2
3CONFIG = staticlib
4
5QMAKE_CXXFLAGS += -std=c++0x -fPIC
6
7LIBS += -lssl -lcrypto
8
9DEFINES += HAVE_CONFIG_H
10
11SOURCES += Thrift.cpp \
12 TApplicationException.cpp \
13 async/TAsyncChannel.cpp \
14 async/TAsyncProtocolProcessor.cpp \
15 #async/TEvhttpClientChannel.cpp \
16 #async/TEvhttpServer.cpp \
17 transport/TBufferTransports.cpp \
18 transport/TFDTransport.cpp \
19 transport/TFileTransport.cpp \
20 transport/THttpClient.cpp \
21 transport/THttpServer.cpp \
22 transport/THttpTransport.cpp \
23 transport/TServerSocket.cpp \
24 transport/TSimpleFileTransport.cpp \
25 transport/TSocket.cpp \
26 transport/TSocketPool.cpp \
27 transport/TSSLServerSocket.cpp \
28 transport/TSSLSocket.cpp \
29 transport/TTransportException.cpp \
30 transport/TTransportUtils.cpp \
31 transport/TZlibTransport.cpp \
32 #concurrency/BoostMonitor.cpp \
33 #concurrency/BoostMutex.cpp \
34 #concurrency/BoostThreadFactory.cpp \
35 concurrency/Monitor.cpp \
36 concurrency/Mutex.cpp \
37 concurrency/PosixThreadFactory.cpp \
38 concurrency/ThreadManager.cpp \
39 concurrency/TimerManager.cpp \
40 concurrency/Util.cpp \
41
42HEADERS += config.h
43
440
=== added file 'CMakeLists.txt'
--- CMakeLists.txt 1970-01-01 00:00:00 +0000
+++ CMakeLists.txt 2014-01-10 12:07:36 +0000
@@ -0,0 +1,10 @@
1cmake_minimum_required(VERSION 2.8.9)
2
3project(reminders-app C CXX)
4
5set(CMAKE_AUTOMOC ON)
6
7set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -fno-permissive -pedantic -Wall -Wextra -fPIC")
8
9add_subdirectory(3rdParty)
10add_subdirectory(src)
011
=== modified file 'debian/control'
--- debian/control 2013-11-26 12:07:17 +0000
+++ debian/control 2014-01-10 12:07:36 +0000
@@ -1,7 +1,8 @@
1Source: reminders-app1Source: reminders-app
2Priority: extra2Priority: extra
3Maintainer: Ubuntu App Cats <ubuntu-touch-coreapps@lists.launchpad.net>3Maintainer: Ubuntu App Cats <ubuntu-touch-coreapps@lists.launchpad.net>
4Build-Depends: debhelper (>= 9),4Build-Depends: cmake,
5 debhelper (>= 9),
5 gettext,6 gettext,
6 libboost-dev,7 libboost-dev,
7 libssl-dev,8 libssl-dev,
89
=== removed file 'reminders-app.pro'
--- reminders-app.pro 2013-11-22 18:51:32 +0000
+++ reminders-app.pro 1970-01-01 00:00:00 +0000
@@ -1,8 +0,0 @@
1TEMPLATE = subdirs
2SUBDIRS = 3rdParty src
3
4src.depends = 3rdParty
5
6check.target = check
7check.commands = "echo No tests yet"
8QMAKE_EXTRA_TARGETS = check
90
=== modified file 'run_on_ubuntu_touch.sh'
--- run_on_ubuntu_touch.sh 2013-11-22 22:35:37 +0000
+++ run_on_ubuntu_touch.sh 2014-01-10 12:07:36 +0000
@@ -16,7 +16,7 @@
16SUDO="echo $PASSWORD | sudo -S"16SUDO="echo $PASSWORD | sudo -S"
17NUM_JOBS='$(( `grep -c ^processor /proc/cpuinfo` + 1 ))'17NUM_JOBS='$(( `grep -c ^processor /proc/cpuinfo` + 1 ))'
18FLIPPED=false18FLIPPED=false
19DEPS="qt5-default qtbase5-dev qtdeclarative5-dev libboost-dev libssl-dev"19DEPS="qt5-default qtbase5-dev qtdeclarative5-dev libboost-dev libssl-dev cmake"
2020
21exec_with_ssh() {21exec_with_ssh() {
22 ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -t $USER@$TARGET_IP -p $TARGET_SSH_PORT sudo -u $USER -i bash -ic \"$@\"22 ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -t $USER@$TARGET_IP -p $TARGET_SSH_PORT sudo -u $USER -i bash -ic \"$@\"
@@ -61,8 +61,7 @@
6161
62build() {62build() {
63 exec_with_ssh mkdir -p $CODE_DIR/$BUILD_DIR63 exec_with_ssh mkdir -p $CODE_DIR/$BUILD_DIR
64 exec_with_ssh PATH=/usr/lib/ccache:$PATH "cd $CODE_DIR/$BUILD_DIR && PATH=/usr/lib/ccache:$PATH qmake --version"64 exec_with_ssh PATH=/usr/lib/ccache:$PATH "cd $CODE_DIR/$BUILD_DIR && PATH=/usr/lib/ccache:$PATH QT_SELECT=qt5 cmake .."
65 exec_with_ssh PATH=/usr/lib/ccache:$PATH "cd $CODE_DIR/$BUILD_DIR && PATH=/usr/lib/ccache:$PATH QT_SELECT=qt5 qmake .."
66 exec_with_ssh PATH=/usr/lib/ccache:$PATH "cd $CODE_DIR/$BUILD_DIR && PATH=/usr/lib/ccache:$PATH make -j2"65 exec_with_ssh PATH=/usr/lib/ccache:$PATH "cd $CODE_DIR/$BUILD_DIR && PATH=/usr/lib/ccache:$PATH make -j2"
67}66}
6867
6968
=== added file 'src/CMakeLists.txt'
--- src/CMakeLists.txt 1970-01-01 00:00:00 +0000
+++ src/CMakeLists.txt 2014-01-10 12:07:36 +0000
@@ -0,0 +1,2 @@
1add_subdirectory(plugin)
2add_subdirectory(app)
03
=== added file 'src/app/CMakeLists.txt'
--- src/app/CMakeLists.txt 1970-01-01 00:00:00 +0000
+++ src/app/CMakeLists.txt 2014-01-10 12:07:36 +0000
@@ -0,0 +1,15 @@
1file(GLOB_RECURSE QML_SRCS *.qml *.js)
2
3set(reminders-app_SRCS
4 main.cpp
5 ${QML_SRCS}
6)
7
8add_executable(reminders-app ${reminders-app_SRCS})
9
10qt5_use_modules(reminders-app Gui Qml Quick)
11
12add_custom_target(reminders-app-qmlfiles ALL
13 COMMAND cp -r ${CMAKE_CURRENT_SOURCE_DIR}/qml ${CMAKE_CURRENT_BINARY_DIR}
14 DEPENDS ${QMLFILES}
15)
016
=== removed file 'src/app/app.pro'
--- src/app/app.pro 2013-12-15 01:57:25 +0000
+++ src/app/app.pro 1970-01-01 00:00:00 +0000
@@ -1,25 +0,0 @@
1TARGET = reminders-app
2TEMPLATE = app
3
4QT+= core qml quick
5
6SOURCES += main.cpp \
7
8OTHER_FILES = qml/reminders-app.qml \
9 qml/ui/NotebooksPage.qml \
10 qml/ui/RemindersPage.qml \
11 qml/ui/NotesPage.qml \
12 qml/ui/AccountSelectorPage.qml \
13 qml/ui/NotePage.qml \
14 qml/ui/SearchNotesPage.qml \
15 qml/components/ToolbarSpacer.qml \
16 qml/components/NotesDelegate.qml \
17 qml/components/NotebooksDelegate.qml \
18 qml/ui/EditNotePage.qml
19
20# Copy qml to build dir for running with qtcreator
21qmlfolder.source = src/app/qml
22qmlfolder.target = .
23DEPLOYMENTFOLDERS = qmlfolder
24
25include(../../deployment.pri)
260
=== added file 'src/plugin/CMakeLists.txt'
--- src/plugin/CMakeLists.txt 1970-01-01 00:00:00 +0000
+++ src/plugin/CMakeLists.txt 2014-01-10 12:07:36 +0000
@@ -0,0 +1,6 @@
1include(FindPkgConfig)
2find_package(Qt5Core)
3find_package(Qt5Qml)
4find_package(Qt5Quick)
5
6add_subdirectory(Evernote)
07
=== added file 'src/plugin/Evernote/CMakeLists.txt'
--- src/plugin/Evernote/CMakeLists.txt 1970-01-01 00:00:00 +0000
+++ src/plugin/Evernote/CMakeLists.txt 2014-01-10 12:07:36 +0000
@@ -0,0 +1,53 @@
1include_directories(
2 ${CMAKE_CURRENT_SOURCE_DIR}
3 ${CMAKE_SOURCE_DIR}/3rdParty/libthrift
4 ${CMAKE_SOURCE_DIR}/3rdParty/evernote-sdk-cpp/src/
5)
6
7set(evernoteplugin_SRCS
8 evernoteplugin.cpp
9 notesstore.cpp
10 userstore.cpp
11 notebooks.cpp
12 notes.cpp
13 note.cpp
14 notebook.cpp
15 jobs/fetchnotesjob.cpp
16 jobs/fetchnotebooksjob.cpp
17 jobs/fetchnotejob.cpp
18 jobs/createnotejob.cpp
19 jobs/evernotejob.cpp
20 jobs/savenotejob.cpp
21 jobs/deletenotejob.cpp
22 evernoteconnection.cpp
23 jobs/userstorejob.cpp
24 jobs/notesstorejob.cpp
25 jobs/fetchusernamejob.cpp
26 jobs/createnotebookjob.cpp
27 jobs/expungenotebookjob.cpp
28 resourceimageprovider.cpp
29 utils/enmldocument.cpp
30)
31
32add_library(evernoteplugin MODULE
33 ${evernoteplugin_SRCS}
34)
35
36target_link_libraries(evernoteplugin
37 -L${CMAKE_BINARY_DIR}/3rdParty/evernote-sdk-cpp/ -L${CMAKE_BINARY_DIR}/3rdParty/libthrift/ -levernote-sdk-cpp -llibthrift -lssl -lcrypto
38)
39
40qt5_use_modules(evernoteplugin Gui Qml Quick)
41
42
43# Copy qmldir file to build dir for running in QtCreator
44add_custom_target(evernoteplugin-qmldir ALL
45 COMMAND cp ${CMAKE_CURRENT_SOURCE_DIR}/qmldir ${CMAKE_CURRENT_BINARY_DIR}
46 DEPENDS ${QMLFILES}
47)
48
49# Install plugin file
50exec_program(qmake ARGS "-query QT_INSTALL_QML" OUTPUT_VARIABLE QT_IMPORTS_DIR)
51install(TARGETS evernoteplugin DESTINATION ${QT_IMPORTS_DIR}/Evernote/)
52install(FILES qmldir DESTINATION ${QT_IMPORTS_DIR}/Evernote/)
53
054
=== removed file 'src/plugin/Evernote/Evernote.pro'
--- src/plugin/Evernote/Evernote.pro 2013-12-14 22:38:57 +0000
+++ src/plugin/Evernote/Evernote.pro 1970-01-01 00:00:00 +0000
@@ -1,71 +0,0 @@
1TARGET=evernoteplugin
2TEMPLATE=lib
3CONFIG = qt plugin
4QT += qml gui xml quick
5QMAKE_CXXFLAGS += -std=c++0x -fPIC
6
7INCLUDEPATH += ../../../3rdParty/evernote-sdk-cpp/src/ ../../../3rdParty/libthrift
8
9TARGET = $$qtLibraryTarget($$TARGET)
10uri = Evernote
11
12SOURCES += evernoteplugin.cpp \
13 notesstore.cpp \
14 userstore.cpp \
15 notebooks.cpp \
16 notes.cpp \
17 note.cpp \
18 notebook.cpp \
19 jobs/fetchnotesjob.cpp \
20 jobs/fetchnotebooksjob.cpp \
21 jobs/fetchnotejob.cpp \
22 jobs/createnotejob.cpp \
23 jobs/evernotejob.cpp \
24 jobs/savenotejob.cpp \
25 jobs/deletenotejob.cpp \
26 evernoteconnection.cpp \
27 jobs/userstorejob.cpp \
28 jobs/notesstorejob.cpp \
29 jobs/fetchusernamejob.cpp \
30 jobs/createnotebookjob.cpp \
31 jobs/expungenotebookjob.cpp \
32 resourceimageprovider.cpp \
33 utils/enmldocument.cpp
34
35HEADERS += evernoteplugin.h \
36 notesstore.h \
37 userstore.h \
38 notebooks.h \
39 notes.h \
40 note.h \
41 notebook.h \
42 jobs/fetchnotesjob.h \
43 jobs/fetchnotebooksjob.h \
44 jobs/fetchnotejob.h \
45 jobs/createnotejob.h \
46 jobs/evernotejob.h \
47 jobs/savenotejob.h \
48 jobs/deletenotejob.h \
49 evernoteconnection.h \
50 jobs/userstorejob.h \
51 jobs/notesstorejob.h \
52 jobs/fetchusernamejob.h \
53 jobs/createnotebookjob.h \
54 jobs/expungenotebookjob.h \
55 resourceimageprovider.h \
56 utils/enmldocument.h
57
58message(building in $$OUT_PWD)
59LIBS += -L$$OUT_PWD/../../../3rdParty/evernote-sdk-cpp/ -L$$OUT_PWD/../../../3rdParty/libthrift/ -levernote-sdk-cpp -llibthrift -lssl -lcrypto
60
61installPath = $$[QT_INSTALL_QML]/$$replace(uri, \\., /)
62qmldir.files = qmldir
63qmldir.path = $$installPath
64target.path = $$installPath
65INSTALLS += target qmldir
66
67# Copy qml to build dir
68qmldir.source = src/plugin/Evernote/qmldir
69qmldir.target = .
70DEPLOYMENTFOLDERS = qmldir
71include(../../../deployment.pri)
720
=== removed file 'src/plugin/plugin.pro'
--- src/plugin/plugin.pro 2013-11-21 23:30:15 +0000
+++ src/plugin/plugin.pro 1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
1TEMPLATE = subdirs
2SUBDIRS = Evernote
30
=== removed file 'src/src.pro'
--- src/src.pro 2013-11-21 23:30:15 +0000
+++ src/src.pro 1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
1TEMPLATE = subdirs
2SUBDIRS += plugin app

Subscribers

People subscribed via source and target branches