Merge lp:~zeller-benjamin/ubuntu-sdk-ide/kitregister2 into lp:ubuntu-sdk-ide

[Benjamin Zeller]

- Fix build

- Fix build

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2015-10-23 04:20:56 +0000
+++ CMakeLists.txt	2015-10-23 07:35:16 +0000
@@ -5,9 +5,16 @@
 project(ubuntu-sdk-ide C CXX)
 
 include(ExternalProject)
-
 include(ProcessorCount)
 
+function(ConcatStrings targetVar )
+  set(loc_val ${${targetVar}})
+  foreach(curr_substr ${ARGN})
+      set(loc_val "${loc_val}${curr_substr}")
+  endforeach()
+  set(${targetVar} ${loc_val} PARENT_SCOPE)
+endfunction()
+
 ProcessorCount(JOBS)
 if(NOT JOBS EQUAL 0)
   set(GENERATED_MAKE_FLAGS -j${JOBS})
@@ -38,8 +45,13 @@
 )
 
 SET (DBUSMENU_PREFIX "${CMAKE_BINARY_DIR}/libdbusmenu-qt-build")
-SET (DBUSMENU_BUILD_SCRIPT
-  "${CMAKE_COMMAND} -DCMAKE_INSTALL_PREFIX=${QT_INSTALL_DIR} -DCMAKE_PREFIX_PATH=${QT_INSTALL_DIR} -DUSE_QT5=true -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_INSTALL_LIBDIR=lib ${DBUSMENU_PREFIX}/libdbusmenu-qt"
+ConcatStrings (DBUSMENU_BUILD_SCRIPT
+  "${CMAKE_COMMAND} "
+  "-DCMAKE_INSTALL_PREFIX=${QT_INSTALL_DIR} "
+  "-DCMAKE_PREFIX_PATH=${QT_INSTALL_DIR} "
+  "-DUSE_QT5=true "
+  "-DCMAKE_BUILD_TYPE=RelWithDebInfo "
+  "-DCMAKE_INSTALL_LIBDIR=lib ${DBUSMENU_PREFIX}/libdbusmenu-qt "
 )
 
 ExternalProject_Add(libdbusmenu-qt
@@ -68,7 +80,15 @@
 )
 
 SET (QTCREATOR_PREFIX "${CMAKE_BINARY_DIR}/qtcreator-build")
-SET (QTC_PATCH_SCRIPT "bzr branch lp:qtcreator-plugin-ubuntu ${QTCREATOR_PREFIX}/qtcreator/src/plugins/ubuntu -Ossl.cert_reqs=none && sed -i 's/\\(welcome\\)/\\1 \\\\ \\n   ubuntu/g' ${QTCREATOR_PREFIX}/qtcreator/src/plugins/plugins.pro"
+ConcatStrings(QTC_DOWNLOAD_SCRIPT
+  "dget https://launchpad.net/ubuntu/+archive/primary/+files/qtcreator_3.5.0+dfsg-1ubuntu3.dsc "
+  "&& rsync -auvr --delete-after qtcreator-3.5.0+dfsg/ ${QTCREATOR_PREFIX}/qtcreator"
+)
+ConcatStrings(QTC_PATCH_SCRIPT
+  "cd ${QTCREATOR_PREFIX}/qtcreator "
+  "&& patch -p1 < ${CMAKE_SOURCE_DIR}/patches/qtc.patch "
+  "&& bzr branch lp:qtcreator-plugin-ubuntu ${QTCREATOR_PREFIX}/qtcreator/src/plugins/ubuntu -Ossl.cert_reqs=none "
+  "&& sed -i 's/\\(welcome\\)/\\1 \\\\ \\n   ubuntu/g' ${QTCREATOR_PREFIX}/qtcreator/src/plugins/plugins.pro"
 )
 
 ExternalProject_Add(qtcreator_3.5.0
@@ -77,7 +97,7 @@
   SOURCE_DIR  "${QTCREATOR_PREFIX}/qtcreator"
   BINARY_DIR  "${QTCREATOR_PREFIX}/build"
   INSTALL_DIR "${CMAKE_BINARY_DIR}/ubuntu-sdk-ide"
-  DOWNLOAD_COMMAND  sh -c "dget https://launchpad.net/ubuntu/+archive/primary/+files/qtcreator_3.5.0+dfsg-1ubuntu3.dsc && rsync -auvr --delete-after qtcreator-3.5.0+dfsg/ ${QTCREATOR_PREFIX}/qtcreator"
+  DOWNLOAD_COMMAND  sh -c "${QTC_DOWNLOAD_SCRIPT}"
   PATCH_COMMAND     sh -c "${QTC_PATCH_SCRIPT}"
   CONFIGURE_COMMAND sh -c "${QT_INSTALL_DIR}/bin/qmake -r USE_SYSTEM_BOTAN=1 ${QTCREATOR_PREFIX}/qtcreator"
   BUILD_COMMAND     sh -c "QT_PRIVATE_HEADERS=${QT_INSTALL_DIR} LD_LIBRARY_PATH=${QT_INSTALL_DIR}/lib make ${GENERATED_MAKE_FLAGS}"
@@ -123,7 +143,7 @@
   INSTALL_DIR "${QT_KIT_PREFIX}/qt"
   DOWNLOAD_COMMAND  sh -c "cd ${QT_KIT_SOURCE_DIR} && ${CMAKE_SOURCE_DIR}/get_qt_sources.py"
   UPDATE_COMMAND    sh -c "exit 0" #nothing to update
-  PATCH_COMMAND     sh -c "cp ${CMAKE_SOURCE_DIR}/desktop_kit_qt.pro ${QT_KIT_SOURCE_DIR}/qt.pro && cp ${CMAKE_SOURCE_DIR}/desktop_kit_configure ${QT_KIT_SOURCE_DIR}/configure" 
+  PATCH_COMMAND     sh -c "cp ${CMAKE_SOURCE_DIR}/desktop_kit_qt.pro ${QT_KIT_SOURCE_DIR}/qt.pro && cp ${CMAKE_SOURCE_DIR}/desktop_kit_configure ${QT_KIT_SOURCE_DIR}/configure"
   CONFIGURE_COMMAND sh -c "${QT_KIT_SOURCE_DIR}/configure -prefix /usr/ubuntu-sdk-dev `cat ${CMAKE_SOURCE_DIR}/kit_config`"
   BUILD_COMMAND     sh -c "make ${GENERATED_MAKE_FLAGS}"
   INSTALL_COMMAND   sh -c "make INSTALL_ROOT=${QT_KIT_PREFIX}/qt install"
@@ -132,12 +152,12 @@
 
 SET (EXTRAS_PREFIX "${CMAKE_BINARY_DIR}/qt-extras")
 ExternalProject_Add(${QT_VERSION}-extras
-  DEPENDS ${QT_VERSION}-api
+  DEPENDS ${QT_VERSION}-api qtcreator_3.5.0
   PREFIX      "${EXTRAS_PREFIX}"
   SOURCE_DIR  "${EXTRAS_PREFIX}/ubuntu-sdk-qmake-extras"
   DOWNLOAD_COMMAND  sh -c "bzr branch lp:ubuntu-sdk-qmake-extras ${EXTRAS_PREFIX}/ubuntu-sdk-qmake-extras -Ossl.cert_reqs=none --use-existing-dir"
   UPDATE_COMMAND    sh -c "exit 0" #nothing to update
   CONFIGURE_COMMAND sh -c "exit 0"
   BUILD_COMMAND     sh -c "cp ${EXTRAS_PREFIX}/ubuntu-sdk-qmake-extras/*.prf ${QT_KIT_PREFIX}/qt/usr/ubuntu-sdk-dev/mkspecs/features"
-  INSTALL_COMMAND   sh -c "exit 0"
+  INSTALL_COMMAND   sh -c "cd ${CMAKE_BINARY_DIR} && ${CMAKE_SOURCE_DIR}/create_sdk.sh"
 )