diff options
| author | Miguel Costa <miguel.costa@qt.io> | 2023-12-12 16:26:28 +0100 |
|---|---|---|
| committer | Miguel Costa <miguel.costa@qt.io> | 2023-12-14 17:11:16 +0000 |
| commit | 1c8ba533bd88d935be3724667e0087fd0796102c (patch) | |
| tree | bee771c1434828c7794d65abc96f6b2ba9b56d74 | |
| parent | 2369314900628820c0739388ed3ee67d5e2574d9 (diff) | |
Add vcvars architecture to deployment name
This will allow deploying 'x64' and 'arm64' packages to the same dir.
Change-Id: Idf6d0dd4f48cb1308d5fe134d6359de367c20980
Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
| -rw-r--r-- | scripts/vstools/deploy.cmd | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/scripts/vstools/deploy.cmd b/scripts/vstools/deploy.cmd index 2c9de69b..44ce98de 100644 --- a/scripts/vstools/deploy.cmd +++ b/scripts/vstools/deploy.cmd @@ -12,16 +12,16 @@ ECHO. %##########################% %##% %BOLD%Deploying to %DEPLOY_DIR%\%VERSION%.%VERSION_REV%...%RESET% IF "%VERSION_REV%" == "" ( - %##% QtVsTools.vsix -^> qt-vsaddin-msvc%VS%-%VERSION%.vsix + %##% QtVsTools.vsix -^> qt-vsaddin-msvc%VS%-%VCVARS_ARCH%-%VERSION%.vsix MD "%DEPLOY_DIR%\%VERSION%.0" > NUL 2>&1 COPY /Y QtVsTools.Package\bin\Release\QtVsTools.vsix ^ - "%DEPLOY_DIR%\%VERSION%.0\qt-vsaddin-msvc%VS%-%VERSION%.vsix" > NUL ^ + "%DEPLOY_DIR%\%VERSION%.0\qt-vsaddin-msvc%VS%-%VCVARS_ARCH%-%VERSION%.vsix" > NUL ^ || (%##% %BOLD%%RED%Error copying package to deploy dir.%RESET%) ) ELSE ( - %##% QtVsTools.vsix -^> qt-vsaddin-msvc%VS%-%VERSION%-rev.%VERSION_REV%.vsix + %##% QtVsTools.vsix -^> qt-vsaddin-msvc%VS%-%VCVARS_ARCH%-%VERSION%-rev.%VERSION_REV%.vsix MD "%DEPLOY_DIR%\%VERSION%.%VERSION_REV%" > NUL 2>&1 COPY /Y QtVsTools.Package\bin\Release\QtVsTools.vsix ^ - "%DEPLOY_DIR%\%VERSION%.%VERSION_REV%\qt-vsaddin-msvc%VS%-%VERSION%-rev.%VERSION_REV%.vsix" > NUL ^ + "%DEPLOY_DIR%\%VERSION%.%VERSION_REV%\qt-vsaddin-msvc%VS%-%VCVARS_ARCH%-%VERSION%-rev.%VERSION_REV%.vsix" > NUL ^ || (%##% %BOLD%%RED%Error copying package to deploy dir.%RESET%) ) %##########################% |