Merge lp:~zeller-benjamin/ubuntu-sdk-ide/missing_plugins into lp:~bzoltan/ubuntu-sdk-ide/trunk

Proposed by Benjamin Zeller
Status: Merged
Merged at revision: 53
Proposed branch: lp:~zeller-benjamin/ubuntu-sdk-ide/missing_plugins
Merge into: lp:~bzoltan/ubuntu-sdk-ide/trunk
Diff against target: 39 lines (+24/-1)
1 file modified
CMakeLists.txt (+24/-1)
To merge this branch: bzr merge lp:~zeller-benjamin/ubuntu-sdk-ide/missing_plugins
Reviewer Review Type Date Requested Status
Zoltan Balogh Pending
Review via email: mp+274360@code.launchpad.net

Commit message

Add GoLang and Autopilot plugins

Description of the change

Add GoLang and Autopilot plugins

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CMakeLists.txt'
2--- CMakeLists.txt 2015-09-11 11:36:39 +0000
3+++ CMakeLists.txt 2015-10-14 08:20:15 +0000
4@@ -59,7 +59,7 @@
5 )
6
7 ExternalProject_Add(qtcreator_3.5.0
8- DEPENDS appmenu-qt5
9+ DEPENDS appmenu-qt5
10 PREFIX "${CMAKE_SOURCE_DIR}/qt"
11 DOWNLOAD_COMMAND sh -c "dget https://launchpad.net/ubuntu/+archive/primary/+files/qtcreator_3.5.0~rc1-0ubuntu1.dsc"
12 PATCH_COMMAND sh -c "bzr branch lp:qtcreator-plugin-ubuntu sdk-refactor2 -Ossl.cert_reqs=none && mv sdk-refactor2 ${CMAKE_SOURCE_DIR}/qt/src/qtcreator-3.5.0~rc1/src/plugins/ubuntu && sed -i 's/\\(welcome\\)/\\1 \\\\ \\n ubuntu/g' ${CMAKE_SOURCE_DIR}/qt/src/qtcreator-3.5.0~rc1/src/plugins/plugins.pro"
13@@ -68,3 +68,26 @@
14 BUILD_COMMAND sh -c "cd ${CMAKE_SOURCE_DIR}/qt/src/qtcreator-3.5.0~rc1 && QT_PRIVATE_HEADERS=${CMAKE_BINARY_DIR} LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/qt/lib make ${GENERATED_MAKE_FLAGS}"
15 INSTALL_COMMAND sh -c "QT_PRIVATE_HEADERS=${CMAKE_BINARY_DIR} && cd ${CMAKE_SOURCE_DIR}/qt/src/qtcreator-3.5.0~rc1 && echo $PWD && LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/qt/lib make INSTALL_ROOT=${CMAKE_BINARY_DIR}/ubuntu-sdk-ide -j1 docs deployqt"
16 )
17+
18+set(QTC_BUILD "${CMAKE_BINARY_DIR}/ubuntu-sdk-ide")
19+set(QTC_SOURCE "${CMAKE_SOURCE_DIR}/qt/src/qtcreator-3.5.0~rc1")
20+
21+ExternalProject_Add(qtcreator_plugin_go
22+ DEPENDS qtcreator_3.5.0
23+ PREFIX "${CMAKE_SOURCE_DIR}/qt"
24+ DOWNLOAD_COMMAND sh -c "bzr branch lp:qtcreator-plugin-go"
25+ CONFIGURE_COMMAND sh -c "cd ${CMAKE_SOURCE_DIR}/qt/src/qtcreator-plugin-go && env QTC_BUILD=\"${QTC_BUILD}\" QTC_SOURCE=\"${QTC_SOURCE}\" ${CMAKE_BINARY_DIR}/qt/bin/qmake -r"
26+ BUILD_COMMAND sh -c "cd ${CMAKE_SOURCE_DIR}/qt/src/qtcreator-plugin-go && env QTC_BUILD=\"${QTC_BUILD}\" QTC_SOURCE=\"${QTC_SOURCE}\" QT_PRIVATE_HEADERS=${CMAKE_BINARY_DIR} LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/qt/lib make ${GENERATED_MAKE_FLAGS}"
27+ #there is no install step required, the plugin is built directly into the installed plugins dir
28+ INSTALL_COMMAND sh -c "exit 0"
29+)
30+
31+ExternalProject_Add(qtcreator_plugin_autopilot
32+ DEPENDS qtcreator_3.5.0
33+ PREFIX "${CMAKE_SOURCE_DIR}/qt"
34+ DOWNLOAD_COMMAND sh -c "bzr branch lp:~zeller-benjamin/qtcreator-plugin-autopilot/qtc35x qtcreator-plugin-autopilot"
35+ CONFIGURE_COMMAND sh -c "cd ${CMAKE_SOURCE_DIR}/qt/src/qtcreator-plugin-autopilot && env QTC_BUILD=\"${QTC_BUILD}\" QTC_SOURCE=\"${QTC_SOURCE}\" ${CMAKE_BINARY_DIR}/qt/bin/qmake -r"
36+ BUILD_COMMAND sh -c "cd ${CMAKE_SOURCE_DIR}/qt/src/qtcreator-plugin-autopilot && env QTC_BUILD=\"${QTC_BUILD}\" QTC_SOURCE=\"${QTC_SOURCE}\" QT_PRIVATE_HEADERS=${CMAKE_BINARY_DIR} LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/qt/lib make ${GENERATED_MAKE_FLAGS}"
37+ #there is no install step required, the plugin is built directly into the installed plugins dir
38+ INSTALL_COMMAND sh -c "exit 0"
39+)

Subscribers

People subscribed via source and target branches

to all changes: