Commit 94420a7b authored by Konstantin Podsvirov's avatar Konstantin Podsvirov

QtIFW: Improved packaging as part of the QtSDK

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").
parent 1a6e47aa
......@@ -13,7 +13,7 @@ set(CMake_IFW_ROOT_COMPONENT_NAME
"qt.tools.cmake.${CMake_VERSION_MAJOR}${CMake_VERSION_MINOR}"
CACHE STRING "QtSDK CMake tools component 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")
set(CMake_IFW_ROOT_COMPONENT_DESCRIPTION
"CMake Build Tools ${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR}.${CMake_VERSION_PATH}"
......
......@@ -25,24 +25,22 @@ Component.prototype.createOperations = function()
{
component.createOperations();
if (installer.value("os") == "win") {
try {
if (installer.value("SDKToolBinary") == "")
return;
try {
if (installer.value("SDKToolBinary") == "")
return;
var cmId = component.name;
installer.setValue("CMAKE%CMake_VERSION_MAJOR%%CMake_VERSION_MINOR%_ID", cmId);
var cmId = component.name;
installer.setValue("CMAKE%CMake_VERSION_MAJOR%%CMake_VERSION_MINOR%_ID", cmId);
component.addOperation("Execute",
["{0,2}", "@SDKToolBinary@", "addCMake",
"--id", cmId,
"--name", "%CMake_IFW_ROOT_COMPONENT_DISPLAY_NAME%",
"--path", "@CMAKE%CMake_VERSION_MAJOR%%CMake_VERSION_MINOR%_BIN_DIR@/cmake.exe",
"UNDOEXECUTE",
"@SDKToolBinary@", "rmCMake", "--id", cmId]);
component.addOperation("Execute",
["{0,2}", "@SDKToolBinary@", "addCMake",
"--id", cmId,
"--name", "%CMake_IFW_ROOT_COMPONENT_DISPLAY_NAME%",
"--path", "@CMAKE%CMake_VERSION_MAJOR%%CMake_VERSION_MINOR%_BIN_DIR@/cmake%CMAKE_EXECUTABLE_SUFFIX%",
"UNDOEXECUTE",
"@SDKToolBinary@", "rmCMake", "--id", cmId]);
} catch( e ) {
print( e );
}
} catch( e ) {
print( e );
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment