From 6ef55aa63a563864774f4777dcd1a69933b62a72 Mon Sep 17 00:00:00 2001 From: Giovanni <561184+wargio@users.noreply.github.com> Date: Wed, 17 Nov 2021 11:51:04 +0100 Subject: [PATCH] Fix #1881 - Fix windows build (#1984) --- dist/windows/build_windows_installer.ps1 | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/dist/windows/build_windows_installer.ps1 b/dist/windows/build_windows_installer.ps1 index 38e681bc04b..f6288044dbd 100644 --- a/dist/windows/build_windows_installer.ps1 +++ b/dist/windows/build_windows_installer.ps1 @@ -3,13 +3,15 @@ $bits=$args[1] $end=$args.Length $meson_options=$args[2..$end] $scriptpath=$PSScriptRoot -$builddir=$(Join-Path -Path $env:TEMP -ChildPath "build-win-installer") -$installdir=$(Join-Path -Path $env:TEMP -ChildPath "rizin-win-installer") +$builddir=$(Join-Path -Path $env:TEMP -ChildPath "build-win-installer-$name-$bits") +$installdir=$(Join-Path -Path $env:TEMP -ChildPath "rizin-win-installer-$name-$bits") pushd $PSScriptRoot\..\.. $version=$(python sys\version.py) echo $version +echo $builddir +echo $installdir $env:Path += ";$env:ProgramFiles (x86)\Microsoft Visual Studio\Installer" $env:Path += ";$env:ProgramFiles\7-Zip" @@ -18,7 +20,7 @@ $env:Path += ";$env:ProgramFiles (x86)\Inno Setup 6" dist\windows\vsdevenv.ps1 $bits meson --buildtype=release --prefix=$installdir $builddir $meson_options -ninja -C $builddir +ninja -C $builddir -j1 ninja -C $builddir install 7z a dist\windows\Output\rizin-$name-$version.zip $installdir iscc dist\windows\rizin.iss /DRizinLocation=$installdir\* /DLicenseLocation=$PWD\COPYING.LESSER /DMyAppVersion=$version @@ -26,4 +28,4 @@ iscc dist\windows\rizin.iss /DRizinLocation=$installdir\* /DLicenseLocation=$PWD rm -r $builddir rm -r $installdir -popd \ No newline at end of file +popd