diff options
author | Rechi <Rechi@users.noreply.github.com> | 2017-05-17 23:14:32 +0200 |
---|---|---|
committer | Rechi <Rechi@users.noreply.github.com> | 2017-05-17 23:14:32 +0200 |
commit | 4695394681390697b70b8aac0109c47b730bf0ae (patch) | |
tree | dfcdab07113f040ed3088cb164db0918c73941d4 | |
parent | bfae7ccf915bea79832f246a76e99926a97bc70a (diff) |
[buildsteps][windows] postfix setup filename with architecture
-rw-r--r-- | project/Win32BuildSetup/genNsisInstaller.nsi | 2 | ||||
-rw-r--r-- | tools/buildsteps/windows/BuildSetup.bat | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/project/Win32BuildSetup/genNsisInstaller.nsi b/project/Win32BuildSetup/genNsisInstaller.nsi index b1ef34e419..1be3043b0c 100644 --- a/project/Win32BuildSetup/genNsisInstaller.nsi +++ b/project/Win32BuildSetup/genNsisInstaller.nsi @@ -16,7 +16,7 @@ ;Name and file Name "${APP_NAME}" - OutFile "${APP_NAME}Setup-${app_revision}-${app_branch}.exe" + OutFile "${APP_NAME}Setup-${app_revision}-${app_branch}-${TARGET_ARCHITECTURE}.exe" ;Default installation folder !ifdef x64 diff --git a/tools/buildsteps/windows/BuildSetup.bat b/tools/buildsteps/windows/BuildSetup.bat index 8ccbc2c819..5adea24e21 100644 --- a/tools/buildsteps/windows/BuildSetup.bat +++ b/tools/buildsteps/windows/BuildSetup.bat @@ -197,8 +197,8 @@ set WORKSPACE=%base_dir%\kodi-build ECHO ------------------------------------------------------------ call getdeploydependencies.bat CALL extract_git_rev.bat > NUL - SET APP_SETUPFILE=%APP_NAME%Setup-%GIT_REV%-%BRANCH%.exe - SET APP_PDBFILE=%APP_NAME%Setup-%GIT_REV%-%BRANCH%.pdb + SET APP_SETUPFILE=%APP_NAME%Setup-%GIT_REV%-%BRANCH%-%TARGET_ARCHITECTURE%.exe + SET APP_PDBFILE=%APP_NAME%Setup-%GIT_REV%-%BRANCH%-%TARGET_ARCHITECTURE%.pdb ECHO Creating installer %APP_SETUPFILE%... IF EXIST %APP_SETUPFILE% del %APP_SETUPFILE% > NUL rem get path to makensis.exe from registry, first try tab delim |