changed to correctly indicate which branch it belongs to, in addition to the commit.

This commit is contained in:
Joseph Lenox 2016-07-07 18:39:01 -05:00
parent 166d199fc4
commit ec4c14afe9
3 changed files with 11 additions and 19 deletions

View File

@ -1 +1 @@
@perl5.22.1.exe script/slic3r.pl %*
@perl5.22.1.exe slic3r.pl %*

View File

@ -1,15 +0,0 @@
REM Written by Joseph Lenox
REM Licensed under the same license as the rest of Slic3r.
REM ------------------------
REM You need to have Strawberry Perl 5.22 installed for this to work,
echo "Make this is run from the perl command window."
echo "Requires PAR."
REM Change this to where you have Strawberry Perl installed.
SET STRAWBERRY_PATH=C:\Strawberry
cpanm "PAR::Packer"
pp -a %STRAWBERRY_PATH%\perl\bin\perl5.22.1.exe;perl5.22.1.exe -a %STRAWBERRY%\perl\bin\freeglut.dll;freeglut.dll -a %STRAWBERRY%\perl\bin\perl522.dll;perl522.dll -a %STRAWBERRY%\perl\bin\libgcc_s_sjlj-1.dll;libgcc_s_sjlj-1.dll -a %STRAWBERRY%\perl\bin\libstdc++-6.dll;libstdc++-6.dll -a %STRAWBERRY%\perl\bin\libwinpthread-1.dll;libwinpthread-1.dll -a %STRAWBERRY%\perl\site\lib\Alien\wxWidgets\msw_3_0_2_uni_gcc_3_4\lib\wxbase30u_gcc_custom.dll -a %STRAWBERRY%\perl\site\lib\Alien\wxWidgets\msw_3_0_2_uni_gcc_3_4\lib\wxmsw30u_adv_gcc_custom.dll -a %STRAWBERRY%\perl\site\lib\Alien\wxWidgets\msw_3_0_2_uni_gcc_3_4\lib\wxmsw30u_core_gcc_custom.dll -a %STRAWBERRY%\perl\site\lib\Alien\wxWidgets\msw_3_0_2_uni_gcc_3_4\lib\wxmsw30u_gl_gcc_custom.dll -a %STRAWBERRY%\perl\site\lib\Alien\wxWidgets\msw_3_0_2_uni_gcc_3_4\lib\wxmsw30u_html_gcc_custom.dll -a ..\utils;script\utils -a var;script\var -a autorun.bat;slic3r.bat -M Encode::Locale -M Moo -M Thread::Semaphore -M OpenGL -M Slic3r::XS -M Unicode::Normalize -M Wx -M Class::Accessor -M Wx::DND -M Wx::Grid -M Wx::Print -M Wx::Html -M Wx::GLCanvas -M Math::Trig -M threads -M threads::shared -M Thread::Queue -e -p -x slic3r.pl -o ..\slic3r.par
copy ..\slic3r.par ..\slic3r.zip

View File

@ -5,10 +5,16 @@
echo "Make this is run from the perl command window."
echo "Requires PAR."
New-Variable -Name "current_branch" -Value ""
git branch | foreach {
if ($_ -match "^\*(.*)"){
$current_branch += $matches[1] + "> "
}
}
# Change this to where you have Strawberry Perl installed.
#SET STRAWBERRY_PATH=C:\Strawberry
New-Variable -Name "STRAWBERRY_PATH" -Value "C:\Strawberry"
# ([io.fileinfo](Get-Command "perl.exe").Path).basename
cpanm "PAR::Packer"
@ -25,6 +31,7 @@ pp -a "$STRAWBERRY_PATH\perl\bin\perl5.22.1.exe;perl5.22.1.exe" ^
-a "$STRAWBERRY_PATH\perl\site\lib\Alien\wxWidgets\msw_3_0_2_uni_gcc_3_4\lib\wxmsw30u_html_gcc_custom.dll" ^
-a "..\utils;script\utils" -a "..\var;script\var" -a "autorun.bat;slic3r.bat" `
-a "../lib;lib" `
-a "../slic3r.pl;slic3r.pl"
-M AutoLoader `
-M B `
-M Carp `
@ -209,4 +216,4 @@ pp -a "$STRAWBERRY_PATH\perl\bin\perl5.22.1.exe;perl5.22.1.exe" ^
-M warnings::register `
-e -p slic3r.pl -o ..\slic3r.par
copy ..\slic3r.par "..\slic3r-$(git rev-parse --abbrev-ref HEAD)-$(git rev-parse --short HEAD).zip"
copy ..\slic3r.par "..\slic3r-${current_branch}-$(git rev-parse --short HEAD).zip"