fix default isntall path of windows
All checks were successful
buildbot/DocsGenerator Build finished.
buildbot/AndroidBuilder_v7 Build finished.
buildbot/AndroidBuilder_v8 Build finished.
buildbot/AndroidBuilder_v8Qt6 Build finished.
buildbot/IOSCMakeBuilder Build finished.
buildbot/LinuxCMakeBuilder Build finished.
buildbot/WindowsCMakeBuilder Build finished.
buildbot/LinuxCMakeBuilderQt6 Build finished.

This commit is contained in:
Andrei Yankovich 2022-10-23 12:02:57 +03:00
parent 6c2b014894
commit ed38d8d62a
14 changed files with 15 additions and 59 deletions

View File

@ -85,19 +85,22 @@ add_custom_target(${name}Templates ALL
)
# sets qifw variable
set(HomeDir "@HomeDir@")
configure_file_in(${CURRENT_PROJECT} "${CMAKE_CURRENT_SOURCE_DIR}/Deploy/QIFWTemplate/config/config.xml")
addDeployFromCustomFile(${CURRENT_PROJECT} "${CMAKE_CURRENT_SOURCE_DIR}/Deploy/CQtDeployer.json")
set(ApplicationsDir "@HomeDir@")
set(QIFW_PLATFORM linux)
set(INSTALLER_SUFIX run)
if (WIN32)
set(QIFW_PLATFORM windows)
set(INSTALLER_SUFIX exe)
set(ApplicationsDir "@ApplicationsDir@")
endif()
configure_file_in(${CURRENT_PROJECT} "${CMAKE_CURRENT_SOURCE_DIR}/Deploy/QIFWTemplate/config/config.xml")
addDeployFromCustomFile(${CURRENT_PROJECT} "${CMAKE_CURRENT_SOURCE_DIR}/Deploy/CQtDeployer.json")
ADD_CUSTOM_TARGET(
downloadQIFW
SOURCES ${${name}files}

View File

@ -2,16 +2,16 @@
<Installer>
<WizardDefaultWidth>980px</WizardDefaultWidth>
<WizardDefaultHeight>540px</WizardDefaultHeight>
<Name>CQtDeployer</Name>
<Name>@PROJECT_NAME@</Name>
<Version>@CQT_DEPLOYER_VERSION@</Version>
<Title>CQtDeployer</Title>
<Title>@PROJECT_NAME@</Title>
<Publisher>QuasarApp</Publisher>
<StartMenuDir>CQtDeployer</StartMenuDir>
<TargetDir>@HomeDir@/CQtDeployer</TargetDir>
<StartMenuDir>@PROJECT_NAME@</StartMenuDir>
<TargetDir>@ApplicationsDir@/@PROJECT_NAME@</TargetDir>
<InstallActionColumnVisible>true</InstallActionColumnVisible>
<RemoveTargetDir>true</RemoveTargetDir>
<ControlScript>controlScript.js</ControlScript>
<MaintenanceToolName>CQtDeployerTool</MaintenanceToolName>
<MaintenanceToolName>@PROJECT_NAME@Tool</MaintenanceToolName>
<WizardStyle>Modern</WizardStyle>
<StyleSheet>style.css</StyleSheet>
<Logo>logo.png</Logo>

View File

@ -44,7 +44,7 @@ Controller.prototype.installationFinished = function()
} else {
QMessageBox["information"](qsTr("install in system"), qsTr("Installer"),
qsTr("CQtDeployer successfully installed on your computer to use the call \"cqtdeployer\", cqt or cqtdeployer.cqt."),
qsTr("CQtDeployer successfully installed on your computer to use the call \"cqtdeployer\"."),
QMessageBox.Ok);
}

View File

@ -137,13 +137,6 @@ function systemIntegration() {
homeDir + "/.local/bin/cqtdeployer"],
"UNDOEXECUTE", ["rm", "-f", homeDir + "/.local/bin/cqtdeployer"] )
component.addOperation('Execute', ["ln", "-sf", targetDir + "/" + VERSION + "/bin/cqt.sh",
homeDir + "/.local/bin/cqt"],
"UNDOEXECUTE", ["rm", "-f", homeDir + "/.local/bin/cqt"] )
component.addOperation('Execute', ["ln", "-sf", targetDir + "/" + VERSION + "/bin/cqt.sh",
homeDir + "/.local/bin/cqtdeployer.cqt"],
"UNDOEXECUTE", ["rm", "-f", homeDir + "/.local/bin/cqtdeployer.cqt"] )
generateShortCutCmd(VERSION + "/cqtdeployer", VERSION + "/icon.png");

View File

@ -23,10 +23,6 @@
<source>CQtDeployer successfully installed on your computer to use the call &quot;cqtdeployer&quot;.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>CQtDeployer successfully installed on your computer to use the call &quot;cqtdeployer&quot;, cqt or cqtdeployer.cqt.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>installscript</name>

View File

@ -23,10 +23,6 @@
<source>CQtDeployer successfully installed on your computer to use the call &quot;cqtdeployer&quot;.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>CQtDeployer successfully installed on your computer to use the call &quot;cqtdeployer&quot;, cqt or cqtdeployer.cqt.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>installscript</name>

View File

@ -23,10 +23,6 @@
<source>CQtDeployer successfully installed on your computer to use the call &quot;cqtdeployer&quot;.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>CQtDeployer successfully installed on your computer to use the call &quot;cqtdeployer&quot;, cqt or cqtdeployer.cqt.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>installscript</name>

View File

@ -23,10 +23,6 @@
<source>CQtDeployer successfully installed on your computer to use the call &quot;cqtdeployer&quot;.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>CQtDeployer successfully installed on your computer to use the call &quot;cqtdeployer&quot;, cqt or cqtdeployer.cqt.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>installscript</name>

View File

@ -23,10 +23,6 @@
<source>CQtDeployer successfully installed on your computer to use the call &quot;cqtdeployer&quot;.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>CQtDeployer successfully installed on your computer to use the call &quot;cqtdeployer&quot;, cqt or cqtdeployer.cqt.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>installscript</name>

View File

@ -23,10 +23,6 @@
<source>CQtDeployer successfully installed on your computer to use the call &quot;cqtdeployer&quot;.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>CQtDeployer successfully installed on your computer to use the call &quot;cqtdeployer&quot;, cqt or cqtdeployer.cqt.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>installscript</name>

View File

@ -23,10 +23,6 @@
<source>CQtDeployer successfully installed on your computer to use the call &quot;cqtdeployer&quot;.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>CQtDeployer successfully installed on your computer to use the call &quot;cqtdeployer&quot;, cqt or cqtdeployer.cqt.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>installscript</name>

View File

@ -23,10 +23,6 @@
<source>CQtDeployer successfully installed on your computer to use the call &quot;cqtdeployer&quot;.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>CQtDeployer successfully installed on your computer to use the call &quot;cqtdeployer&quot;, cqt or cqtdeployer.cqt.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>installscript</name>

View File

@ -23,10 +23,6 @@
<source>CQtDeployer successfully installed on your computer to use the call &quot;cqtdeployer&quot;.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>CQtDeployer successfully installed on your computer to use the call &quot;cqtdeployer&quot;, cqt or cqtdeployer.cqt.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>installscript</name>

View File

@ -23,10 +23,6 @@
<source>CQtDeployer successfully installed on your computer to use the call &quot;cqtdeployer&quot;.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>CQtDeployer successfully installed on your computer to use the call &quot;cqtdeployer&quot;, cqt or cqtdeployer.cqt.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>installscript</name>