From d6ce966e17fbe92e8024d11133b1475853034c10 Mon Sep 17 00:00:00 2001 From: emkael Date: Tue, 15 Nov 2016 02:27:08 +0100 Subject: * separate dist paths for both builds --- MAKE.ps1 | 10 +++++----- MAKE_GUI.ps1 | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/MAKE.ps1 b/MAKE.ps1 index d0ddd47..b87ac7a 100644 --- a/MAKE.ps1 +++ b/MAKE.ps1 @@ -1,9 +1,9 @@ -& pyinstaller bidding_data.spec -Copy-Item '*.md' -Destination 'dist' -Force -Copy-Item 'res\*' -Destination 'dist' -Force -Recurse -Set-Variable -Name VersionInfo -Value (Get-Item 'dist\bidding_data.exe').VersionInfo +& pyinstaller bidding_data.spec --distpath dist\console +Copy-Item '*.md' -Destination 'dist\console' -Force +Copy-Item 'res\*' -Destination 'dist\console' -Force -Recurse +Set-Variable -Name VersionInfo -Value (Get-Item 'dist\console\bidding_data.exe').VersionInfo Set-Variable -Name FileVersion -Value $VersionInfo.FileVersion.Split(',') Set-Variable -Name BundleName -Value ('bundle\\' + $VersionInfo.InternalName + '-' + $FileVersion[0].Trim() + '.' + $FileVersion[1].Trim() + '.zip') Remove-Item $BundleName -ErrorAction SilentlyContinue Add-Type -Assembly 'System.IO.Compression.FileSystem' -[System.IO.Compression.ZipFile]::CreateFromDirectory('dist', $BundleName) +[System.IO.Compression.ZipFile]::CreateFromDirectory('dist\console', $BundleName) diff --git a/MAKE_GUI.ps1 b/MAKE_GUI.ps1 index 17b5ce9..79c5cb8 100644 --- a/MAKE_GUI.ps1 +++ b/MAKE_GUI.ps1 @@ -1,9 +1,9 @@ -& pyinstaller bidding_data_gui.spec -Copy-Item '*.md' -Destination 'dist' -Force -Copy-Item 'res\*' -Destination 'dist' -Force -Recurse -Set-Variable -Name VersionInfo -Value (Get-Item 'dist\bidding_data.exe').VersionInfo +& pyinstaller bidding_data_gui.spec --distpath dist\gui +Copy-Item '*.md' -Destination 'dist\gui' -Force +Copy-Item 'res\*' -Destination 'dist\gui' -Force -Recurse +Set-Variable -Name VersionInfo -Value (Get-Item 'dist\gui\bidding_data.exe').VersionInfo Set-Variable -Name FileVersion -Value $VersionInfo.FileVersion.Split(',') Set-Variable -Name BundleName -Value ('bundle\\' + $VersionInfo.InternalName + '-' + $FileVersion[0].Trim() + '.' + $FileVersion[1].Trim() + '-gui.zip') Remove-Item $BundleName -ErrorAction SilentlyContinue Add-Type -Assembly 'System.IO.Compression.FileSystem' -[System.IO.Compression.ZipFile]::CreateFromDirectory('dist', $BundleName) +[System.IO.Compression.ZipFile]::CreateFromDirectory('dist\gui', $BundleName) -- cgit v1.2.3