diff options
| author | Karsten Heimrich <karsten.heimrich@qt.io> | 2024-04-16 11:56:29 +0200 |
|---|---|---|
| committer | Karsten Heimrich <karsten.heimrich@qt.io> | 2024-04-17 08:24:11 +0000 |
| commit | c7dc741dfc5a7ba3080b45d40a657a804a343b13 (patch) | |
| tree | 9b48f164eb610b1ac4f5390b7ec0a24ef771afc2 | |
| parent | 3f709f5632321e8de05e25389600a5580fb254ed (diff) | |
Update vstools install command
* Do not hardcode the build configuration
* Add option to pass an argument, like /rootSuffix:Exp
Change-Id: I9e05249abc66ae984a06d802d12c5cec8fbefde0
Reviewed-by: Miguel Costa <miguel.costa@qt.io>
Reviewed-by: Ali Can Demiralp <ali.demiralp@qt.io>
| -rw-r--r-- | scripts/vstools/args.cmd | 4 | ||||
| -rw-r--r-- | scripts/vstools/globals.cmd | 1 | ||||
| -rw-r--r-- | scripts/vstools/install.cmd | 6 |
3 files changed, 8 insertions, 3 deletions
diff --git a/scripts/vstools/args.cmd b/scripts/vstools/args.cmd index 0e9c99ab..b46a4f22 100644 --- a/scripts/vstools/args.cmd +++ b/scripts/vstools/args.cmd @@ -94,6 +94,10 @@ IF "%ARG%" == "-init" ( SHIFT ) ELSE IF "%ARG%" == "-install" ( SET DO_INSTALL=%TRUE% + IF NOT "%~2" == "" ( + SET VSIX_INSTALLER_ARG=%~2 + SHIFT + ) ) ELSE IF "%ARG%" == "-all" ( SET QUERY=%QUERY_ALL% ) ELSE IF "%ARG%" == "-verbose" ( diff --git a/scripts/vstools/globals.cmd b/scripts/vstools/globals.cmd index 90999de0..9278adcb 100644 --- a/scripts/vstools/globals.cmd +++ b/scripts/vstools/globals.cmd @@ -40,6 +40,7 @@ SET CLEAN=%FALSE% SET BINARYLOG=%FALSE% SET BUILD_CONFIGURATION=Release SET DO_INSTALL=%FALSE% +SET VSIX_INSTALLER_ARG= SET DEPLOY=%FALSE% SET AUTOTEST=%FALSE% SET TRANSFORM_INCREMENTAL=true diff --git a/scripts/vstools/install.cmd b/scripts/vstools/install.cmd index 2727a6f5..64f5d486 100644 --- a/scripts/vstools/install.cmd +++ b/scripts/vstools/install.cmd @@ -16,11 +16,11 @@ ECHO. ECHO Removing previous installation... IF "%VS%" == "2022" ( - start "Uninstalling 2022" /WAIT VSIXInstaller /force /quiet /shutdownprocesses /uninstall:QtVsTools.8e827d74-6fc4-40a6-a3aa-faf19652b3b8 + start "Uninstalling 2022" /WAIT VSIXInstaller %VSIX_INSTALLER_ARG% /force /quiet /shutdownprocesses /uninstall:QtVsTools.8e827d74-6fc4-40a6-a3aa-faf19652b3b8 ) ELSE IF "%VS%" == "2019" ( - start "Uninstalling 2019" /WAIT VSIXInstaller /force /quiet /shutdownprocesses /uninstall:QtVsTools.bf3c71c0-ab41-4427-ada9-9b3813d89ff5 + start "Uninstalling 2019" /WAIT VSIXInstaller %VSIX_INSTALLER_ARG% /force /quiet /shutdownprocesses /uninstall:QtVsTools.bf3c71c0-ab41-4427-ada9-9b3813d89ff5 ) ECHO Installing... -start "Installing" /WAIT VSIXInstaller /force /quiet /shutdownprocesses QtVsTools.Package\bin\Release\QtVsTools.vsix +start "Installing" /WAIT VSIXInstaller %VSIX_INSTALLER_ARG% /force /quiet /shutdownprocesses QtVsTools.Package\bin\%BUILD_CONFIGURATION%\QtVsTools.vsix EXIT /B %ERRORLEVEL% |