Katana_mirror/katie
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/katie.git synced 2025-02-23 18:32:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

support suffixed tools and package them as such

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
This commit is contained in:
Ivailo Monev 2017-04-27 01:57:57 +00:00
parent 5ffb903ad9
commit 15be073317
18 changed files with 106 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CMakeLists.txt
View file

@ -86,6 +86,7 @@ set(KATIE_MAN_FULL "${CMAKE_INSTALL_FULL_MANDIR}" CACHE PATH "Manual pages path
set(KATIE_APPLICATIONS_FULL "${KATIE_DATA_FULL}/applications" CACHE PATH "Desktop applications register path (UNIX)")
set(KATIE_PIXMAPS_FULL "${KATIE_DATA_FULL}/pixmaps" CACHE PATH "Desktop applications icon path (UNIX)")
set(KATIE_PKGCONFIG_FULL "${KATIE_DATA_FULL}/pkgconfig" CACHE PATH "Desktop applications icon path (UNIX)")
set(KATIE_TOOLS_SUFFIX "" CACHE PATH "Tools (moc, uic, rcc, etc.) suffix")
katie_setup_paths()
# optional package

7
cmake/KatieConfig.cmake
View file

@ -41,7 +41,7 @@ endforeach()
foreach(tool ${KATIE_TOOLS})
string(TOUPPER ${tool} uppertool)
set(KATIE_${uppertool} Katie::${tool})
set(KATIE_${uppertool} Katie::${tool}@KATIE_TOOLS_SUFFIX@)
endforeach()
# Include macros, tools variables must be set before that
@ -66,6 +66,7 @@ set(KATIE_MAN_PATH "@KATIE_MAN_FULL@")
set(KATIE_CMAKE_PATH "@KATIE_CMAKE_FULL@")
set(KATIE_APPLICATIONS_PATH "@KATIE_APPLICATIONS_FULL@")
set(KATIE_PIXMAPS_PATH "@KATIE_PIXMAPS_FULL@")
set(KATIE_TOOLS_SUFFIX "@KATIE_TOOLS_SUFFIX@")
if(NOT "${KATIE_FIND_QUIETLY}")
message(STATUS "Found Katie version: ${KATIE_VERSION}")
@ -91,8 +92,8 @@ if(NOT KATIE_COMPAT EQUAL FALSE AND NOT KATIE_COMPAT EQUAL OFF)
set(QT_MKSPECS_DIR ${KATIE_MKSPECS_DIR})
# those are exceptions because they have "q" prefix which the macros from Qt4Macros do not expect
set(QT_DBUSXML2CPP_EXECUTABLE "${KATIE_BINARIES_PATH}/qdbusxml2cpp${CMAKE_EXECUTABLE_SUFFIX}")
set(QT_DBUSCPP2XML_EXECUTABLE "${KATIE_BINARIES_PATH}/qdbuscpp2xml${CMAKE_EXECUTABLE_SUFFIX}")
set(QT_DBUSXML2CPP_EXECUTABLE "${KATIE_BINARIES_PATH}/qdbusxml2cpp@KATIE_TOOLS_SUFFIX@${CMAKE_EXECUTABLE_SUFFIX}")
set(QT_DBUSCPP2XML_EXECUTABLE "${KATIE_BINARIES_PATH}/qdbuscpp2xml@KATIE_TOOLS_SUFFIX@${CMAKE_EXECUTABLE_SUFFIX}")
if(NOT KATIE_COMPAT_ISSET)
set(KATIE_COMPAT_ISSET CACHE BOOL TRUE "")

8
package/archlinux/PKGBUILD
View file

@ -2,7 +2,7 @@
# Maintainer: Ivailo Monev <xakepa10@gmail.com>
pkgname=katie-git
pkgver=4.9.0.3ce697c
pkgver=4.9.0.5ffb903a
pkgrel=1
pkgdesc='C++ toolkit derived from the Qt 4.8 framework'
arch=('i686' 'x86_64')
@ -11,8 +11,7 @@ license=('LGPL' 'FDL' 'custom')
depends=('openssl' 'zlib' 'cups' 'libice' 'icu' 'libsm' 'pcre' 'libxcursor'
'libxext' 'libxfixes' 'libxi' 'libxinerama' 'libxrandr' 'libxrender'
'libx11' 'fontconfig' 'freetype2' 'glib2' 'libmng')
makedepends=('cmake' 'git' 'python' 'postgresql' 'mariadb' 'unixodbc'
'unifdef')
makedepends=('cmake' 'git' 'python' 'postgresql' 'mariadb' 'unixodbc' 'unifdef')
optdepends=('postgresql-libs: PostgreSQL driver'
'libmariadbclient: MariaDB driver'
'unixodbc: ODBC driver')
@ -39,7 +38,8 @@ build() {
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=/usr \
-DKATIE_LDCONF_FULL=/etc/ld.so.conf.d \
-DKATIE_PROFILE_FULL=/etc/profile.d
-DKATIE_PROFILE_FULL=/etc/profile.d \
-DKATIE_TOOLS_SUFFIX="-katie"
make
}

3
package/debian/rules
View file

@ -12,7 +12,8 @@ override_dh_auto_configure:
dh_auto_configure -- -DMYSQL_LIBRARIES:STRING="-lmysqld -lcrypt -laio" \
-Wno-dev \
-DKATIE_LDCONF_FULL=/etc/ld.so.conf.d \
-DKATIE_PROFILE_FULL=/etc/profile.d
-DKATIE_PROFILE_FULL=/etc/profile.d \
-DKATIE_TOOLS_SUFFIX="-katie"
override_dh_auto_build:
dh_auto_build

6
src/tools/designer/CMakeLists.txt
View file

@ -80,6 +80,11 @@ katie_setup_target(designer ${DESIGNERBIN_SOURCES} ${DESIGNERBIN_HEADERS})
add_executable(designer ${designer_SOURCES})
target_link_libraries(designer ${EXTRA_DESIGNERBIN_LIBS})
set_target_properties(designer PROPERTIES
EXPORT_NAME designer
OUTPUT_NAME designer${KATIE_TOOLS_SUFFIX}
)
install(
TARGETS designer
RUNTIME DESTINATION ${KATIE_BINARIES_RELATIVE}
@ -89,6 +94,7 @@ install(
install(
PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/designer.desktop
DESTINATION ${KATIE_APPLICATIONS_RELATIVE}
RENAME designer${KATIE_TOOLS_SUFFIX}.desktop
COMPONENT Devel
)
install(

2
src/tools/designer/designer.desktop.cmake
View file

@ -1,7 +1,7 @@
[Desktop Entry]
Name=Katie Designer
Comment=Design GUIs for Katie applications
Exec=@KATIE_BINARIES_FULL@/designer@CMAKE_EXECUTABLE_SUFFIX@
Exec=@KATIE_BINARIES_FULL@/designer@KATIE_TOOLS_SUFFIX@@CMAKE_EXECUTABLE_SUFFIX@
Icon=@KATIE_PIXMAPS_FULL@/designer.png
MimeType=application/x-designer;
Terminal=false

6
src/tools/lconvert/CMakeLists.txt
View file

@ -32,6 +32,11 @@ add_executable(lconvert ${lconvert_SOURCES}
)
target_link_libraries(lconvert ${EXTRA_LCONVERT_LIBS})
set_target_properties(lconvert PROPERTIES
EXPORT_NAME lconvert
OUTPUT_NAME lconvert${KATIE_TOOLS_SUFFIX}
)
install(
TARGETS lconvert
EXPORT KatieBinaryTargets ${INSTALL_TARGETS_DEFAULT_ARGS}
@ -42,4 +47,5 @@ install(
install(
FILES ${CMAKE_CURRENT_SOURCE_DIR}/lconvert.1
DESTINATION ${KATIE_MAN_RELATIVE}/man1
RENAME lconvert${KATIE_TOOLS_SUFFIX}.1
)

6
src/tools/lrelease/CMakeLists.txt
View file

@ -32,6 +32,11 @@ add_executable(lrelease ${lrelease_SOURCES}
)
target_link_libraries(lrelease ${EXTRA_LRELEASE_LIBS})
set_target_properties(lrelease PROPERTIES
EXPORT_NAME lrelease
OUTPUT_NAME lrelease${KATIE_TOOLS_SUFFIX}
)
install(
TARGETS lrelease
EXPORT KatieBinaryTargets ${INSTALL_TARGETS_DEFAULT_ARGS}
@ -42,4 +47,5 @@ install(
install(
FILES ${CMAKE_CURRENT_SOURCE_DIR}/lrelease.1
DESTINATION ${KATIE_MAN_RELATIVE}/man1
RENAME lrelease${KATIE_TOOLS_SUFFIX}.1
)

6
src/tools/lupdate/CMakeLists.txt
View file

@ -33,6 +33,11 @@ add_executable(lupdate ${lupdate_SOURCES}
)
target_link_libraries(lupdate ${EXTRA_LUPDATE_LIBS})
set_target_properties(lupdate PROPERTIES
EXPORT_NAME lupdate
OUTPUT_NAME lupdate${KATIE_TOOLS_SUFFIX}
)
install(
TARGETS lupdate
EXPORT KatieBinaryTargets ${INSTALL_TARGETS_DEFAULT_ARGS}
@ -43,4 +48,5 @@ install(
install(
FILES ${CMAKE_CURRENT_SOURCE_DIR}/lupdate.1
DESTINATION ${KATIE_MAN_RELATIVE}/man1
RENAME lupdate${KATIE_TOOLS_SUFFIX}.1
)

6
src/tools/moc/CMakeLists.txt
View file

@ -25,6 +25,11 @@ target_compile_definitions(bootstrap_moc PRIVATE ${BOOTSTRAP_DEFINITIONS})
add_executable(moc ${MOC_SOURCES})
target_link_libraries(moc ${EXTRA_MOC_LIBS})
set_target_properties(moc PROPERTIES
EXPORT_NAME moc
OUTPUT_NAME moc${KATIE_TOOLS_SUFFIX}
)
install(
TARGETS moc
EXPORT KatieBinaryTargets ${INSTALL_TARGETS_DEFAULT_ARGS}
@ -35,4 +40,5 @@ install(
install(
FILES ${CMAKE_CURRENT_SOURCE_DIR}/moc.1
DESTINATION ${KATIE_MAN_RELATIVE}/man1
RENAME moc${KATIE_TOOLS_SUFFIX}.1
)

33
src/tools/qdbus/CMakeLists.txt
View file

@ -15,12 +15,27 @@ include_directories(
add_executable(qdbus ${CMAKE_CURRENT_SOURCE_DIR}/qdbus.cpp)
target_link_libraries(qdbus ${EXTRA_QDBUS_LIBS})
set_target_properties(qdbus PROPERTIES
EXPORT_NAME qdbus
OUTPUT_NAME qdbus${KATIE_TOOLS_SUFFIX}
)
add_executable(qdbuscpp2xml ${CMAKE_CURRENT_SOURCE_DIR}/qdbuscpp2xml.cpp)
target_link_libraries(qdbuscpp2xml ${EXTRA_QDBUS_LIBS})
set_target_properties(qdbuscpp2xml PROPERTIES
EXPORT_NAME qdbuscpp2xml
OUTPUT_NAME qdbuscpp2xml${KATIE_TOOLS_SUFFIX}
)
add_executable(qdbusxml2cpp ${CMAKE_CURRENT_SOURCE_DIR}/qdbusxml2cpp.cpp)
target_link_libraries(qdbusxml2cpp ${EXTRA_QDBUS_LIBS})
set_target_properties(qdbusxml2cpp PROPERTIES
EXPORT_NAME qdbusxml2cpp
OUTPUT_NAME qdbusxml2cpp${KATIE_TOOLS_SUFFIX}
)
install(
TARGETS qdbus qdbuscpp2xml qdbusxml2cpp
EXPORT KatieBinaryTargets ${INSTALL_TARGETS_DEFAULT_ARGS}
@ -29,9 +44,19 @@ install(
)
install(
FILES
${CMAKE_CURRENT_SOURCE_DIR}/qdbus.1
${CMAKE_CURRENT_SOURCE_DIR}/qdbuscpp2xml.1
${CMAKE_CURRENT_SOURCE_DIR}/qdbusxml2cpp.1
FILES ${CMAKE_CURRENT_SOURCE_DIR}/qdbus.1
DESTINATION ${KATIE_MAN_RELATIVE}/man1
RENAME qdbus${KATIE_TOOLS_SUFFIX}.1
)
install(
FILES ${CMAKE_CURRENT_SOURCE_DIR}/qdbuscpp2xml.1
DESTINATION ${KATIE_MAN_RELATIVE}/man1
RENAME qdbuscpp2xml${KATIE_TOOLS_SUFFIX}.1
)
install(
FILES ${CMAKE_CURRENT_SOURCE_DIR}/qdbusxml2cpp.1
DESTINATION ${KATIE_MAN_RELATIVE}/man1
RENAME qdbusxml2cpp${KATIE_TOOLS_SUFFIX}.1
)

11
src/tools/qdbusviewer/CMakeLists.txt
View file

@ -39,11 +39,14 @@ configure_file(
katie_setup_target(qdbusviewer ${QDBUSVIEWER_SOURCES} ${QDBUSVIEWER_HEADERS})
add_executable(qdbusviewer
${qdbusviewer_SOURCES}
)
add_executable(qdbusviewer ${qdbusviewer_SOURCES})
target_link_libraries(qdbusviewer ${EXTRA_QDBUSVIEWER_LIBS})
set_target_properties(qdbusviewer PROPERTIES
EXPORT_NAME qdbusviewer
OUTPUT_NAME qdbusviewer${KATIE_TOOLS_SUFFIX}
)
install(
TARGETS qdbusviewer
EXPORT KatieBinaryTargets ${INSTALL_TARGETS_DEFAULT_ARGS}
@ -54,8 +57,10 @@ install(
install(
PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/qdbusviewer.desktop
DESTINATION ${KATIE_APPLICATIONS_RELATIVE}
RENAME qdbusviewer${KATIE_TOOLS_SUFFIX}.desktop
COMPONENT Devel
)
install(
FILES ${CMAKE_CURRENT_SOURCE_DIR}/images/qdbusviewer.png
DESTINATION ${KATIE_PIXMAPS_RELATIVE}

2
src/tools/qdbusviewer/qdbusviewer.desktop.cmake
View file

@ -1,7 +1,7 @@
[Desktop Entry]
Name=Katie D-Bus Viewer
Comment=Debug D-Bus applications
Exec=@KATIE_BINARIES_FULL@/qdbusviewer@CMAKE_EXECUTABLE_SUFFIX@
Exec=@KATIE_BINARIES_FULL@/qdbusviewer@KATIE_TOOLS_SUFFIX@@CMAKE_EXECUTABLE_SUFFIX@
Icon=@KATIE_PIXMAPS_FULL@/qdbusviewer.png
Terminal=false
Encoding=UTF-8

6
src/tools/qscript/CMakeLists.txt
View file

@ -30,6 +30,11 @@ katie_setup_target(qscript ${QSCRIPT_SOURCES} ${QSCRIPT_HEADERS})
add_executable(qscript ${qscript_SOURCES})
target_link_libraries(qscript ${EXTRA_QTSCRIPT_LIBS})
set_target_properties(qscript PROPERTIES
EXPORT_NAME qscript
OUTPUT_NAME qscript${KATIE_TOOLS_SUFFIX}
)
install(
TARGETS qscript
EXPORT KatieBinaryTargets ${INSTALL_TARGETS_DEFAULT_ARGS}
@ -41,4 +46,5 @@ install(
FILES
${CMAKE_CURRENT_SOURCE_DIR}/qscript.1
DESTINATION ${KATIE_MAN_RELATIVE}/man1
RENAME qscript${KATIE_TOOLS_SUFFIX}.1
)

10
src/tools/qtconfig/CMakeLists.txt
View file

@ -39,11 +39,14 @@ configure_file(
katie_setup_target(qtconfig ${QTCONFIG_SOURCES} ${QTCONFIG_HEADERS})
add_executable(qtconfig
${qtconfig_SOURCES}
)
add_executable(qtconfig ${qtconfig_SOURCES})
target_link_libraries(qtconfig ${EXTRA_QTCONFIG_LIBS})
set_target_properties(qtconfig PROPERTIES
EXPORT_NAME qtconfig
OUTPUT_NAME qtconfig${KATIE_TOOLS_SUFFIX}
)
install(
TARGETS qtconfig
EXPORT KatieBinaryTargets ${INSTALL_TARGETS_DEFAULT_ARGS}
@ -54,6 +57,7 @@ install(
install(
PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/qtconfig.desktop
DESTINATION ${KATIE_APPLICATIONS_RELATIVE}
RENAME qtconfig${KATIE_TOOLS_SUFFIX}.desktop
COMPONENT Devel
)
install(

2
src/tools/qtconfig/qtconfig.desktop.cmake
View file

@ -1,7 +1,7 @@
[Desktop Entry]
Name=Katie Config
Comment=Configure Katie behavior, styles, fonts
Exec=@KATIE_BINARIES_FULL@/qtconfig@CMAKE_EXECUTABLE_SUFFIX@
Exec=@KATIE_BINARIES_FULL@/qtconfig@KATIE_TOOLS_SUFFIX@@CMAKE_EXECUTABLE_SUFFIX@
Icon=@KATIE_PIXMAPS_FULL@/qtconfig.png
Terminal=false
Encoding=UTF-8

6
src/tools/rcc/CMakeLists.txt
View file

@ -26,6 +26,11 @@ katie_setup_target(rcc ${RCC_SOURCES} ${RCC_HEADERS})
add_executable(rcc ${rcc_SOURCES})
target_link_libraries(rcc ${EXTRA_RCC_LIBS})
set_target_properties(rcc PROPERTIES
EXPORT_NAME rcc
OUTPUT_NAME rcc${KATIE_TOOLS_SUFFIX}
)
install(
TARGETS rcc
EXPORT KatieBinaryTargets ${INSTALL_TARGETS_DEFAULT_ARGS}
@ -36,4 +41,5 @@ install(
install(
FILES ${CMAKE_CURRENT_SOURCE_DIR}/rcc.1
DESTINATION ${KATIE_MAN_RELATIVE}/man1
RENAME rcc${KATIE_TOOLS_SUFFIX}.1
)

6
src/tools/uic/CMakeLists.txt
View file

@ -32,6 +32,11 @@ katie_setup_target(uic ${UIC_SOURCES})
add_executable(uic ${uic_SOURCES})
target_link_libraries(uic ${EXTRA_UIC_LIBS})
set_target_properties(uic PROPERTIES
EXPORT_NAME uic
OUTPUT_NAME uic${KATIE_TOOLS_SUFFIX}
)
install(
TARGETS uic
EXPORT KatieBinaryTargets ${INSTALL_TARGETS_DEFAULT_ARGS}
@ -42,4 +47,5 @@ install(
install(
FILES ${CMAKE_CURRENT_SOURCE_DIR}/uic.1
DESTINATION ${KATIE_MAN_RELATIVE}/man1
RENAME uic${KATIE_TOOLS_SUFFIX}.1
)