diff options
Diffstat (limited to 'src/Release/Setup Files')
| -rw-r--r-- | src/Release/Setup Files/Product64.wxs | 4 | ||||
| -rw-r--r-- | src/Release/Setup Files/build_msi_x64.bat | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/Release/Setup Files/Product64.wxs b/src/Release/Setup Files/Product64.wxs index e524e810..23f89387 100644 --- a/src/Release/Setup Files/Product64.wxs +++ b/src/Release/Setup Files/Product64.wxs @@ -4,7 +4,7 @@ <!-- FullProductVersion's first 3 parts MUST BE incremented at each release in order for upgrades to work ; Windows Installer ignores the 4th part --> - <?define var.FullProductVersion = 1.25.3?> + <?define var.FullProductVersion = 1.25.4?> <?define var.ProductName = VeraCrypt $(var.FullProductVersion)?> <!-- Unique GUID identifying this family of product (32-bit and 64-bit have the same) --> @@ -12,7 +12,7 @@ <!-- Unique GUID identifying this product release (32-bit and 64-bit have different ones) --> <!-- MUST BE regenerated for each new release --> - <?define var.ProductGuid = {20CFEEFB-4DAC-4E7B-8298-885C2F8296D2}?> + <?define var.ProductGuid = {E98D0556-21EF-410C-BB53-35A4533B7126}?> <!-- Unique GUID identifying a particular Windows Installer package --> <!-- When compiling a product, it should not be set in order to allow it to be generated for each build --> diff --git a/src/Release/Setup Files/build_msi_x64.bat b/src/Release/Setup Files/build_msi_x64.bat index 476625b0..e610160a 100644 --- a/src/Release/Setup Files/build_msi_x64.bat +++ b/src/Release/Setup Files/build_msi_x64.bat @@ -118,7 +118,7 @@ cd %MSI_BUILDPATH% @if NOT "%ERRORLEVEL%" == "0" goto msi_failed "%VC_DIR_WIX%\candle.exe" -dLang=en -arch x64 -ext WixUIExtension -ext WiXUtilExtension Custom_InstallDirDlg.wxs -out out\64\en-us\Custom_InstallDirDlg.wixobj @if NOT "%ERRORLEVEL%" == "0" goto msi_failed -"%VC_DIR_WIX%\Light.exe" -ext WixUIExtension -ext WiXUtilExtension -cultures:en-us -loc Strings-en.wxl out\64\en-us\Product.wixobj out\64\en-us\Custom_InstallDirDlg.wixobj out\64\en-us\Custom_InstallDir.wixobj -out out\64\en-us\VeraCrypt_%1_Setup_en-us.msi -pdbout out\64\en-us\VeraCrypt_%1_Setup_en-us.wixpdb -sice:ICE09 +"%VC_DIR_WIX%\Light.exe" -ext WixUIExtension -ext WiXUtilExtension -cultures:en-us -loc Strings-en.wxl out\64\en-us\Product.wixobj out\64\en-us\Custom_InstallDirDlg.wixobj out\64\en-us\Custom_InstallDir.wixobj -out out\64\en-us\VeraCrypt_Setup_%1_en-us.msi -pdbout out\64\en-us\VeraCrypt_Setup_%1_en-us.wixpdb -sice:ICE09 @if NOT "%ERRORLEVEL%" == "0" goto msi_failed ::------------------------------------ @@ -129,8 +129,8 @@ cd %MSI_BUILDPATH% @set OUT_PATH=%cd%\out\64\ @echo [INFO] OUT_PATH=%OUT_PATH% -@set MSI_FILE_IN=VeraCrypt_%1_Setup -@set MSI_FILE_OUT=VeraCrypt_%1_Setup_x64 +@set MSI_FILE_IN=VeraCrypt_Setup_%1 +@set MSI_FILE_OUT=VeraCrypt_Setup_x64_%1 :: Check if all the MSI files were built @set LANG=en-us @@ -152,7 +152,7 @@ cd %MSI_BUILDPATH% mkdir bin @copy /Y "%OUT_PATH%\%MSI_FILE_OUT%.msi" "%cd%\bin\%MSI_FILE_OUT%.msi" @set LANG=en-us -@copy /Y "%OUT_PATH%\%LANG%\%MSI_FILE_IN%_%LANG%.msi" "%cd%\bin\%MSI_FILE_IN%_x64_%LANG%.msi" +@copy /Y "%OUT_PATH%\%LANG%\%MSI_FILE_IN%_%LANG%.msi" "%cd%\bin\%MSI_FILE_OUT%_%LANG%.msi" @rmdir /S /Q "%cd%\out" goto END |