ubports-cn/ubuntu-sdk-ide_orig
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix QtC source path

Browse Source
This commit is contained in:
Zoltán Balogh
2015-10-14 16:21:09 +03:00
parent 9559c8008c
commit eb33e158ce
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
CMakeLists.txt
View File

@@ -62,16 +62,15 @@ ExternalProject_Add(qtcreator_3.5.0
DEPENDS appmenu-qt5
PREFIX "${CMAKE_SOURCE_DIR}/qt"
DOWNLOAD_COMMAND sh -c "dget https://launchpad.net/ubuntu/+archive/primary/+files/qtcreator_3.5.0+dfsg-1ubuntu3.dsc"
COMMAND sh -c "mv qtcreator* qtcreator_3.5.0"
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/src/plugins/ubuntu && sed -i 's/\\(welcome\\)/\\1 \\\\ \\n ubuntu/g' ${CMAKE_SOURCE_DIR}/qt/src/qtcreator-3.5.0/src/plugins/plugins.pro"
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+dfsg/src/plugins/ubuntu && sed -i 's/\\(welcome\\)/\\1 \\\\ \\n ubuntu/g' ${CMAKE_SOURCE_DIR}/qt/src/qtcreator-3.5.0+dfsg/src/plugins/plugins.pro"
SUBDIRS += appmenu
CONFIGURE_COMMAND sh -c "echo $PWD && cd ${CMAKE_SOURCE_DIR}/qt/src/qtcreator-3.5.0 && echo $PWD && ${CMAKE_BINARY_DIR}/qt/bin/qmake -r"
BUILD_COMMAND sh -c "cd ${CMAKE_SOURCE_DIR}/qt/src/qtcreator-3.5.0 && QT_PRIVATE_HEADERS=${CMAKE_BINARY_DIR} LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/qt/lib make ${GENERATED_MAKE_FLAGS}"
INSTALL_COMMAND sh -c "QT_PRIVATE_HEADERS=${CMAKE_BINARY_DIR} && cd ${CMAKE_SOURCE_DIR}/qt/src/qtcreator-3.5.0 && echo $PWD && LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/qt/lib make INSTALL_ROOT=${CMAKE_BINARY_DIR}/ubuntu-sdk-ide -j1 docs deployqt"
CONFIGURE_COMMAND sh -c "echo $PWD && cd ${CMAKE_SOURCE_DIR}/qt/src/qtcreator-3.5.0+dfsg && echo $PWD && ${CMAKE_BINARY_DIR}/qt/bin/qmake -r"
BUILD_COMMAND sh -c "cd ${CMAKE_SOURCE_DIR}/qt/src/qtcreator-3.5.0+dfsg && QT_PRIVATE_HEADERS=${CMAKE_BINARY_DIR} LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/qt/lib make ${GENERATED_MAKE_FLAGS}"
INSTALL_COMMAND sh -c "QT_PRIVATE_HEADERS=${CMAKE_BINARY_DIR} && cd ${CMAKE_SOURCE_DIR}/qt/src/qtcreator-3.5.0+dfsg && echo $PWD && LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/qt/lib make INSTALL_ROOT=${CMAKE_BINARY_DIR}/ubuntu-sdk-ide -j1 docs deployqt"
)
set(QTC_BUILD "${CMAKE_BINARY_DIR}/ubuntu-sdk-ide")
set(QTC_SOURCE "${CMAKE_SOURCE_DIR}/qt/src/qtcreator-3.5.0")
set(QTC_SOURCE "${CMAKE_SOURCE_DIR}/qt/src/qtcreator-3.5.0+dfsg")
ExternalProject_Add(qtcreator_plugin_go
DEPENDS qtcreator_3.5.0

2
debian/changelog vendored
View File

@@ -1,4 +1,4 @@
ubuntu-sdk-ide (3.5.0+15.10.20151013-0ubuntu1~0vivid10) vivid; urgency=medium
ubuntu-sdk-ide (3.5.0+15.10.20151013-0ubuntu1~0vivid13) vivid; urgency=medium
* OTA7 update