From 3954103b9aba5d7dcdeeb11a8d61badeb14b006a Mon Sep 17 00:00:00 2001 From: Joseph Lenox Date: Fri, 8 Jul 2016 14:18:15 -0500 Subject: [PATCH] Update package_win32.ps1 Use appveyor variables --- utils/package_win32.ps1 | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/utils/package_win32.ps1 b/utils/package_win32.ps1 index 773f3169e..d67b285a4 100644 --- a/utils/package_win32.ps1 +++ b/utils/package_win32.ps1 @@ -5,13 +5,13 @@ echo "Make this is run from the perl command window." echo "Requires PAR." -New-Variable -Name "current_branch" -Value "" +New-Variable -Name "current_branch" -Value "${APPVEYOR_REPO_BRANCH}" -git branch | foreach { - if ($_ -match "` (.*)"){ - $current_branch += $matches[1] - } -} +#git branch | foreach { +# if ($_ -match "` (.*)"){ +# $current_branch += $matches[1] +# } +#} # Change this to where you have Strawberry Perl installed. New-Variable -Name "STRAWBERRY_PATH" -Value "C:\Strawberry" @@ -219,4 +219,4 @@ pp ` -M warnings::register ` -e -p ..\slic3r.pl -o ..\slic3r.par -copy ..\slic3r.par "..\slic3r-${current_branch}-$(git rev-parse --short HEAD).zip" +copy ..\slic3r.par "..\slic3r-${current_branch}-${APPVEYOR_BUILD_NUMBER}-$(git rev-parse --short HEAD).zip"