t-head/meta-qt5
1
0
Fork 0
mirror of https://github.com/thead-yocto-mirror/meta-qt5 synced 2026-06-21 08:52:35 +02:00
Code Issues Packages Projects Releases Wiki Activity

qt5: make populate_sdk_qt5 reusable

Browse Source 
Split the populate_sdk_qt5 bbclass into two parts, where the generation
of qt.conf is moved to a new base bbclass. It is reusable in toolchain
meta recipes that use different tasks than meta-toolchain-qt5.

Signed-off-by: Samuli Piippo <samuli.piippo@theqtcompany.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
Samuli Piippo
2015-09-02 12:28:55 +03:00
committed by Martin Jansa
parent 3f5430de74
commit 9c1ac990f2
2 changed files with 33 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
classes/populate_sdk_qt5.bbclass
View File

@@ -1,38 +1,8 @@
# Copyright (C) 2014 O.S. Systems Software LTDA.
inherit populate_sdk_qt5_base
TOOLCHAIN_HOST_TASK += "nativesdk-packagegroup-qt5-toolchain-host"
TOOLCHAIN_TARGET_TASK += "packagegroup-qt5-toolchain-target"
# This allow reuse of Qt paths
inherit qmake5_paths
create_sdk_files_prepend () {
# make a symbolic link to mkspecs for compatibility with QTCreator
(cd ${SDK_OUTPUT}/${SDKPATHNATIVE}; \
ln -sf ${SDKTARGETSYSROOT}${libdir}/${QT_DIR_NAME}/mkspecs mkspecs;)
# Generate a qt.conf file to be deployed with the SDK
qtconf=${SDK_OUTPUT}/${SDKPATHNATIVE}${OE_QMAKE_PATH_HOST_BINS}/qt.conf
touch $qtconf
echo '[Paths]' >> $qtconf
echo 'Prefix = ${OE_QMAKE_PATH_PREFIX}' >> $qtconf
echo 'Headers = ${OE_QMAKE_PATH_QT_HEADERS}' >> $qtconf
echo 'Libraries = ${OE_QMAKE_PATH_LIBS}' >> $qtconf
echo 'ArchData = ${OE_QMAKE_PATH_QT_ARCHDATA}' >> $qtconf
echo 'Data = ${OE_QMAKE_PATH_QT_DATA}' >> $qtconf
echo 'Binaries = ${OE_QMAKE_PATH_QT_BINS}' >> $qtconf
echo 'LibraryExecutables = ${OE_QMAKE_PATH_LIBEXECS}' >> $qtconf
echo 'Plugins = ${OE_QMAKE_PATH_PLUGINS}' >> $qtconf
echo 'Imports = ${OE_QMAKE_PATH_IMPORTS}' >> $qtconf
echo 'Qml2Imports = ${OE_QMAKE_PATH_QML}' >> $qtconf
echo 'Translations = ${OE_QMAKE_PATH_QT_TRANSLATIONS}' >> $qtconf
echo 'Documentation = ${OE_QMAKE_PATH_QT_DOCS}' >> $qtconf
echo 'Settings = ${OE_QMAKE_PATH_QT_SETTINGS}' >> $qtconf
echo 'Examples = ${OE_QMAKE_PATH_QT_EXAMPLES}' >> $qtconf
echo 'Tests = ${OE_QMAKE_PATH_QT_TESTS}' >> $qtconf
echo 'HostPrefix = ${SDKPATHNATIVE}' >> $qtconf
echo 'HostBinaries = ${SDKPATHNATIVE}${OE_QMAKE_PATH_HOST_BINS}' >> $qtconf
echo 'Sysroot = ${SDKTARGETSYSROOT}' >> $qtconf
}
FEATURE_PACKAGES_qtcreator-debug = "packagegroup-qt5-qtcreator-debug"

31
classes/populate_sdk_qt5_base.bbclass Normal file
View File

@@ -0,0 +1,31 @@
# This allow reuse of Qt paths
inherit qmake5_paths
create_sdk_files_prepend () {
# make a symbolic link to mkspecs for compatibility with QTCreator
(cd ${SDK_OUTPUT}/${SDKPATHNATIVE}; \
ln -sf ${SDKTARGETSYSROOT}${libdir}/${QT_DIR_NAME}/mkspecs mkspecs;)
# Generate a qt.conf file to be deployed with the SDK
qtconf=${SDK_OUTPUT}/${SDKPATHNATIVE}${OE_QMAKE_PATH_HOST_BINS}/qt.conf
touch $qtconf
echo '[Paths]' >> $qtconf
echo 'Prefix = ${OE_QMAKE_PATH_PREFIX}' >> $qtconf
echo 'Headers = ${OE_QMAKE_PATH_QT_HEADERS}' >> $qtconf
echo 'Libraries = ${OE_QMAKE_PATH_LIBS}' >> $qtconf
echo 'ArchData = ${OE_QMAKE_PATH_QT_ARCHDATA}' >> $qtconf
echo 'Data = ${OE_QMAKE_PATH_QT_DATA}' >> $qtconf
echo 'Binaries = ${OE_QMAKE_PATH_QT_BINS}' >> $qtconf
echo 'LibraryExecutables = ${OE_QMAKE_PATH_LIBEXECS}' >> $qtconf
echo 'Plugins = ${OE_QMAKE_PATH_PLUGINS}' >> $qtconf
echo 'Imports = ${OE_QMAKE_PATH_IMPORTS}' >> $qtconf
echo 'Qml2Imports = ${OE_QMAKE_PATH_QML}' >> $qtconf
echo 'Translations = ${OE_QMAKE_PATH_QT_TRANSLATIONS}' >> $qtconf
echo 'Documentation = ${OE_QMAKE_PATH_QT_DOCS}' >> $qtconf
echo 'Settings = ${OE_QMAKE_PATH_QT_SETTINGS}' >> $qtconf
echo 'Examples = ${OE_QMAKE_PATH_QT_EXAMPLES}' >> $qtconf
echo 'Tests = ${OE_QMAKE_PATH_QT_TESTS}' >> $qtconf
echo 'HostPrefix = ${SDKPATHNATIVE}' >> $qtconf
echo 'HostBinaries = ${SDKPATHNATIVE}${OE_QMAKE_PATH_HOST_BINS}' >> $qtconf
echo 'Sysroot = ${SDKTARGETSYSROOT}' >> $qtconf
}