echo/CMake
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QtIFW: Improved packaging as part of the QtSDK

Browse Source 
Changes:
- Fix install script template (*.qs.in) to register on all platforms;
- Add patch version numter to display name ("CMake X.Y" -> "CMake X.Y.Z").
This commit is contained in:
Konstantin Podsvirov 2017-04-08 07:13:50 +03:00
parent 1a6e47aa3d
commit 94420a7b61
2 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Packaging/QtSDK/ToolsCMakeXX.cmake
View File

@ -13,7 +13,7 @@ set(CMake_IFW_ROOT_COMPONENT_NAME
"qt.tools.cmake.${CMake_VERSION_MAJOR}${CMake_VERSION_MINOR}" "qt.tools.cmake.${CMake_VERSION_MAJOR}${CMake_VERSION_MINOR}"
CACHE STRING "QtSDK CMake tools component name") CACHE STRING "QtSDK CMake tools component name")
set(CMake_IFW_ROOT_COMPONENT_DISPLAY_NAME set(CMake_IFW_ROOT_COMPONENT_DISPLAY_NAME
"CMake ${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR}" "CMake ${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR}.${CMake_VERSION_PATCH}"
CACHE STRING "QtSDK CMake tools component display name") CACHE STRING "QtSDK CMake tools component display name")
set(CMake_IFW_ROOT_COMPONENT_DESCRIPTION set(CMake_IFW_ROOT_COMPONENT_DESCRIPTION
"CMake Build Tools ${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR}.${CMake_VERSION_PATH}" "CMake Build Tools ${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR}.${CMake_VERSION_PATH}"

30
Packaging/QtSDK/qt.tools.cmake.xx.qs.in
View File

@ -25,24 +25,22 @@ Component.prototype.createOperations = function()
{ {
component.createOperations(); component.createOperations();
if (installer.value("os") == "win") { try {
try { if (installer.value("SDKToolBinary") == "")
if (installer.value("SDKToolBinary") == "") return;
return;
var cmId = component.name; var cmId = component.name;
installer.setValue("CMAKE%CMake_VERSION_MAJOR%%CMake_VERSION_MINOR%_ID", cmId); installer.setValue("CMAKE%CMake_VERSION_MAJOR%%CMake_VERSION_MINOR%_ID", cmId);
component.addOperation("Execute", component.addOperation("Execute",
["{0,2}", "@SDKToolBinary@", "addCMake", ["{0,2}", "@SDKToolBinary@", "addCMake",
"--id", cmId, "--id", cmId,
"--name", "%CMake_IFW_ROOT_COMPONENT_DISPLAY_NAME%", "--name", "%CMake_IFW_ROOT_COMPONENT_DISPLAY_NAME%",
"--path", "@CMAKE%CMake_VERSION_MAJOR%%CMake_VERSION_MINOR%_BIN_DIR@/cmake.exe", "--path", "@CMAKE%CMake_VERSION_MAJOR%%CMake_VERSION_MINOR%_BIN_DIR@/cmake%CMAKE_EXECUTABLE_SUFFIX%",
"UNDOEXECUTE", "UNDOEXECUTE",
"@SDKToolBinary@", "rmCMake", "--id", cmId]); "@SDKToolBinary@", "rmCMake", "--id", cmId]);
} catch( e ) { } catch( e ) {
print( e ); print( e );
}
} }
} }