Skip to content
Snippets Groups Projects
Commit 07de8ed6 authored by Burak Hançerli's avatar Burak Hançerli :headphones:
Browse files

Subrepo bump and version info onto the main page

parent 8e2ab623
No related branches found
No related tags found
1 merge request!9Subrepo bump and version info onto the main page
Pipeline #64047 passed
...@@ -60,10 +60,16 @@ install( ...@@ -60,10 +60,16 @@ install(
DESTINATION ${CMAKE_INSTALL_PREFIX} DESTINATION ${CMAKE_INSTALL_PREFIX}
) )
execute_process(COMMAND git describe --always --tags OUTPUT_VARIABLE GIT_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE) execute_process(COMMAND git describe --always --tags OUTPUT_VARIABLE GIT_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE)
execute_process(COMMAND git -C ${CMAKE_SOURCE_DIR}/qtquickdesigner-components describe --always --tags OUTPUT_VARIABLE QT_QUICK_COMPONENTS_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE)
execute_process(COMMAND git -C ${CMAKE_SOURCE_DIR}/emsdk describe --always --tags OUTPUT_VARIABLE EMSDK_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE)
configure_file(${CMAKE_SOURCE_DIR}/resources/version.json ${CMAKE_INSTALL_PREFIX}/resources/meta-data/version.json) configure_file(${CMAKE_SOURCE_DIR}/resources/version.json ${CMAKE_INSTALL_PREFIX}/resources/meta-data/version.json)
message(STATUS "GIT_VERSION: ${GIT_VERSION}") message(STATUS "GIT_VERSION: ${GIT_VERSION}")
message(STATUS "QT_QUICK_COMPONENTS_VERSION: ${QT_QUICK_COMPONENTS_VERSION}")
message(STATUS "EMSDK_VERSION: ${EMSDK_VERSION}")
message(STATUS "QT_VERSION: ${QT_VERSION}") message(STATUS "QT_VERSION: ${QT_VERSION}")
set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES ${CMAKE_INSTALL_PREFIX}) set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES ${CMAKE_INSTALL_PREFIX})
......
Subproject commit b3f1dcf0d1b46af04aafd59ceecdc9257fca0e71 Subproject commit 0e457477d54b068abc89cf124daedefe0436dd89
{ {
"appVersion": "@GIT_VERSION@", "appVersion": "@GIT_VERSION@",
"qtVersion": "@QT_VERSION@" "qtVersion": "@QT_VERSION@",
"qtQuickComponentsVersion": "@QT_QUICK_COMPONENTS_VERSION@",
"emsdkVersion": "@EMSDK_VERSION@"
} }
...@@ -148,9 +148,13 @@ function showVersionInfo() { ...@@ -148,9 +148,13 @@ function showVersionInfo() {
versionInfo = request.response; versionInfo = request.response;
var appVersion = json.appVersion; var appVersion = json.appVersion;
var qtVersion = json.qtVersion; var qtVersion = json.qtVersion;
var qtQuickComponentsVersion = json.qtQuickComponentsVersion;
var emsdkVersion = json.emsdkVersion;
var webServiceVersion = json.webServiceVersion; var webServiceVersion = json.webServiceVersion;
var versionText = var versionText =
"Design Viewer " + appVersion + "Design Viewer " + appVersion +
"<br>Qt Quick Components " + qtQuickComponentsVersion +
"<br>Emscripten SDK " + emsdkVersion +
"<br>Built with Qt " + qtVersion "<br>Built with Qt " + qtVersion
document.querySelector("#versioninfo_main").innerHTML = versionText; document.querySelector("#versioninfo_main").innerHTML = versionText;
}; };
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment