GitHub-Proxy/PrusaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git synced 2025-07-13 19:21:50 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'win32-testing'

Browse Source 
Conflicts:
	utils/autorun.bat
	utils/package_win32.ps1
This commit is contained in:
Joseph Lenox 2016-07-09 22:07:07 -05:00
commit 4b46482d42
2 changed files with 24 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
utils/autorun.bat
View File

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

43
utils/package_win32.ps1
View File

@ -8,8 +8,8 @@ echo "Requires PAR."
New-Variable -Name "current_branch" -Value "" New-Variable -Name "current_branch" -Value ""
git branch | foreach { git branch | foreach {
if ($_ -match "^\*(.*)"){ if ($_ -match "` (.*)"){
$current_branch += $matches[1] + "> " $current_branch += $matches[1]
} }
} }
@ -18,20 +18,25 @@ New-Variable -Name "STRAWBERRY_PATH" -Value "C:\Strawberry"
cpanm "PAR::Packer" cpanm "PAR::Packer"
pp -a "$STRAWBERRY_PATH\perl\bin\perl5.22.1.exe;perl5.22.1.exe" ^ pp `
-a "$STRAWBERRY_PATH\perl\bin\freeglut.dll;freeglut.dll" ^ -a "../utils;utils" `
-a "$STRAWBERRY_PATH\perl\bin\perl522.dll;perl522.dll" ^ -a "autorun.bat;slic3r.bat" `
-a "$STRAWBERRY_PATH\perl\bin\libgcc_s_sjlj-1.dll;libgcc_s_sjlj-1.dll" ^ -a "../var;var" `
-a "$STRAWBERRY_PATH\perl\bin\libstdc++-6.dll;libstdc++-6.dll" ^ -a "${STRAWBERRY_PATH}\perl\bin\perl5.22.2.exe;perl5.22.2.exe" `
-a "$STRAWBERRY_PATH\perl\bin\libwinpthread-1.dll;libwinpthread-1.dll" ^ -a "${STRAWBERRY_PATH}\perl\bin\perl522.dll;perl522.dll" `
-a "$STRAWBERRY_PATH\perl\site\lib\Alien\wxWidgets\msw_3_0_2_uni_gcc_3_4\lib\wxbase30u_gcc_custom.dll" ^ -a "${STRAWBERRY_PATH}\perl\bin\libgcc_s_sjlj-1.dll;libgcc_s_sjlj-1.dll" `
-a "$STRAWBERRY_PATH\perl\site\lib\Alien\wxWidgets\msw_3_0_2_uni_gcc_3_4\lib\wxmsw30u_adv_gcc_custom.dll" ^ -a "${STRAWBERRY_PATH}\perl\bin\libstdc++-6.dll;libstdc++-6.dll" `
-a "$STRAWBERRY_PATH\perl\site\lib\Alien\wxWidgets\msw_3_0_2_uni_gcc_3_4\lib\wxmsw30u_core_gcc_custom.dll" ^ -a "${STRAWBERRY_PATH}\perl\bin\libwinpthread-1.dll;libwinpthread-1.dll" `
-a "$STRAWBERRY_PATH\perl\site\lib\Alien\wxWidgets\msw_3_0_2_uni_gcc_3_4\lib\wxmsw30u_gl_gcc_custom.dll" ^ -a "${STRAWBERRY_PATH}\perl\bin\freeglut.dll;freeglut.dll" `
-a "$STRAWBERRY_PATH\perl\site\lib\Alien\wxWidgets\msw_3_0_2_uni_gcc_3_4\lib\wxmsw30u_html_gcc_custom.dll" ^ -a "${STRAWBERRY_PATH}\perl\site\lib\Alien\wxWidgets\msw_3_0_2_uni_gcc_3_4\lib\wxbase30u_gcc_custom.dll;wxbase30u_gcc_custom.dll" `
-a "..\utils;script\utils" -a "..\var;script\var" -a "autorun.bat;slic3r.bat" ` -a "${STRAWBERRY_PATH}\perl\site\lib\Alien\wxWidgets\msw_3_0_2_uni_gcc_3_4\lib\wxmsw30u_adv_gcc_custom.dll;wxmsw30u_adv_gcc_custom.dll" `
-a "${STRAWBERRY_PATH}\perl\site\lib\Alien\wxWidgets\msw_3_0_2_uni_gcc_3_4\lib\wxmsw30u_gl_gcc_custom.dll;wxmsw30u_gl_gcc_custom.dll" `
-a "${STRAWBERRY_PATH}\perl\site\lib\Alien\wxWidgets\msw_3_0_2_uni_gcc_3_4\lib\wxmsw30u_core_gcc_custom.dll;wxmsw30u_core_gcc_custom.dll" `
-a "${STRAWBERRY_PATH}\perl\site\lib\Alien\wxWidgets\msw_3_0_2_uni_gcc_3_4\lib\wxmsw30u_html_gcc_custom.dll;wxmsw30u_html_gcc_custom.dll" `
-a "${STRAWBERRY_PATH}\perl\site\lib\Alien\wxWidgets\msw_3_0_2_uni_gcc_3_4\lib\wxbase30u_xml_gcc_custom.dll;wxbase30u_xml_gcc_custom.dll" `
-a "${STRAWBERRY_PATH}\perl\site\lib\Alien\wxWidgets\msw_3_0_2_uni_gcc_3_4\lib\wxbase30u_net_gcc_custom.dll;wxbase30u_net_gcc_custom.dll" `
-a "../lib;lib" ` -a "../lib;lib" `
-a "../slic3r.pl;slic3r.pl" -a "../slic3r.pl;slic3r.pl" `
-M AutoLoader ` -M AutoLoader `
-M B ` -M B `
-M Carp ` -M Carp `
@ -41,7 +46,6 @@ pp -a "$STRAWBERRY_PATH\perl\bin\perl5.22.1.exe;perl5.22.1.exe" ^
-M Config ` -M Config `
-M Crypt::CBC ` -M Crypt::CBC `
-M Cwd ` -M Cwd `
-M Data `
-M Data::UUID ` -M Data::UUID `
-M Devel::GlobalDestruction ` -M Devel::GlobalDestruction `
-M Digest ` -M Digest `
@ -145,7 +149,6 @@ pp -a "$STRAWBERRY_PATH\perl\bin\perl5.22.1.exe;perl5.22.1.exe" ^
-M Socket ` -M Socket `
-M Socket6 ` -M Socket6 `
-M Storable ` -M Storable `
-M Sub `
-M Sub::Defer ` -M Sub::Defer `
-M Sub::Exporter ` -M Sub::Exporter `
-M Sub::Exporter::Progressive ` -M Sub::Exporter::Progressive `
@ -161,7 +164,6 @@ pp -a "$STRAWBERRY_PATH\perl\bin\perl5.22.1.exe;perl5.22.1.exe" ^
-M Tie::Handle ` -M Tie::Handle `
-M Tie::Hash ` -M Tie::Hash `
-M Tie::StdHandle ` -M Tie::StdHandle `
-M Time `
-M Time::HiRes ` -M Time::HiRes `
-M Time::Local ` -M Time::Local `
-M URI ` -M URI `
@ -201,6 +203,7 @@ pp -a "$STRAWBERRY_PATH\perl\bin\perl5.22.1.exe;perl5.22.1.exe" ^
-M feature ` -M feature `
-M integer ` -M integer `
-M locale ` -M locale `
-M lib `
-M mro ` -M mro `
-M overload ` -M overload `
-M overload::numbers ` -M overload::numbers `
@ -214,6 +217,6 @@ pp -a "$STRAWBERRY_PATH\perl\bin\perl5.22.1.exe;perl5.22.1.exe" ^
-M vars ` -M vars `
-M warnings ` -M warnings `
-M warnings::register ` -M warnings::register `
-e -p slic3r.pl -o ..\slic3r.par -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"