Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
J
jami-client-windows
Manage
Activity
Members
Plan
Wiki
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Analyze
Contributor analytics
Repository analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
savoirfairelinux
jami-client-windows
Commits
a00e9d6c
Commit
a00e9d6c
authored
5 years ago
by
Ming Rui Zhang
Browse files
Options
Downloads
Patches
Plain Diff
processes: close Jami and QWebEngineProcess using WiX Quiet Execution Custom Action
Change-Id: I64cb7e86e2ff418c03ea374e05e14d43c8597acc
parent
c4a086ae
Branches
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
JamiInstaller/Product.wxs
+8
-0
8 additions, 0 deletions
JamiInstaller/Product.wxs
src/utils.cpp
+8
-6
8 additions, 6 deletions
src/utils.cpp
with
16 additions
and
6 deletions
JamiInstaller/Product.wxs
+
8
−
0
View file @
a00e9d6c
...
...
@@ -40,6 +40,12 @@
<CustomAction
Id=
"removeOldJamiFiles"
Directory=
"APPLICATIONFOLDER"
ExeCommand=
"cmd /c "del vc_redist.x64.exe; del uninstall.exe; del WinSparkle.dll;""
Execute=
"deferred"
Return=
"ignore"
HideTarget=
"no"
Impersonate=
"no"
/>
<Property
Id=
"QtExecCmdLine"
Value=
'"[WindowsFolder]\System32\taskkill.exe" /F /IM QtWebEngineProcess.exe /IM Jami.exe'
/>
<CustomAction
Id=
"JamiProcesses.TaskKill"
BinaryKey=
"WixCA"
DllEntry=
"CAQuietExec"
Execute=
"immediate"
Return=
"ignore"
/>
</Product>
<Fragment
Id=
"DirectoryStructure"
>
...
...
@@ -51,6 +57,7 @@
<Directory
Id=
"ProgramMenuFolder"
>
<Directory
Id=
"ApplicationProgramsFolder"
/>
</Directory>
<Directory
Id=
"WindowsFolder"
Name=
"WINDOWS"
/>
</Directory>
</Fragment>
...
...
@@ -104,6 +111,7 @@
</InstallUISequence>
</UI>
<InstallExecuteSequence>
<Custom
Action=
'JamiProcesses.TaskKill'
Before=
'InstallValidate'
/>
<Custom
Action=
"removeOldJamiFiles"
After=
"RemoveFiles"
/>
<Custom
Action=
"LaunchApplication_nonUI"
After=
"InstallFinalize"
>
WIXNONUILAUNCH
</Custom>
<Custom
Action=
"Overwrite_WixSetDefaultPerMachineFolder"
After=
"WixSetDefaultPerMachineFolder"
/>
...
...
This diff is collapsed.
Click to expand it.
src/utils.cpp
+
8
−
6
View file @
a00e9d6c
...
...
@@ -35,6 +35,7 @@
#include
"networkmanager.h"
#include
"updateconfirmdialog.h"
#include
"version.h"
#include
"mainwindow.h"
#include
<globalinstances.h>
#include
<qrencode.h>
...
...
@@ -439,12 +440,13 @@ Utils::applyUpdates(bool updateToBeta, QWidget* parent)
}
auto
args
=
QString
(
" /passive /norestart WIXNONUILAUNCH=1"
);
auto
dir
=
Utils
::
WinGetEnv
(
"TEMP"
);
auto
cmd
=
"powershell "
+
QString
(
dir
)
+
"
\\
"
+
downloadPath
.
fileName
()
auto
cmd
StartInstaller
=
"powershell "
+
QString
(
dir
)
+
"
\\
"
+
downloadPath
.
fileName
()
+
" /L*V "
+
QString
(
dir
)
+
"
\\
jami_x64_install.log"
+
args
;
auto
retq
=
QProcess
::
startDetached
(
cmd
);
if
(
retq
)
{
QCoreApplication
::
exit
();
}
MainWindow
::
instance
().
close
();
LRCInstance
::
instance
().
reset
();
QProcess
::
startDetached
(
cmdStartInstaller
);
});
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment