From 7cb20eb21a587fdfa53366d0be8a1cd1a5f8d6c6 Mon Sep 17 00:00:00 2001
From: Joseph Lenox <lenox.joseph@gmail.com>
Date: Tue, 28 Jun 2016 19:34:56 -0500
Subject: [PATCH 01/18] batch files to aid in producing built zip files.

---
 utils/autorun.bat       |  1 +
 utils/package_win32.bat | 15 +++++++++++++++
 2 files changed, 16 insertions(+)
 create mode 100644 utils/autorun.bat
 create mode 100644 utils/package_win32.bat

diff --git a/utils/autorun.bat b/utils/autorun.bat
new file mode 100644
index 0000000000..9b42380cdb
--- /dev/null
+++ b/utils/autorun.bat
@@ -0,0 +1 @@
+@perl5.22.1.exe script/slic3r.pl
diff --git a/utils/package_win32.bat b/utils/package_win32.bat
new file mode 100644
index 0000000000..39d6f0fd6f
--- /dev/null
+++ b/utils/package_win32.bat
@@ -0,0 +1,15 @@
+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 -e -p -x slic3r.pl --xargs --gui -o ..\slic3r.par
+
+copy ..\slic3r.par ..\slic3r.zip

From 1f63e89d5bd1f24481114a97280766d6ebdcfc20 Mon Sep 17 00:00:00 2001
From: Joseph Lenox <lenox.joseph@gmail.com>
Date: Wed, 29 Jun 2016 07:22:18 -0500
Subject: [PATCH 02/18] added partial modules list added powershell script

---
 utils/package_win32.bat |  2 +-
 utils/package_win32.ps1 | 17 +++++++++++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)
 create mode 100644 utils/package_win32.ps1

diff --git a/utils/package_win32.bat b/utils/package_win32.bat
index 39d6f0fd6f..26184c86e4 100644
--- a/utils/package_win32.bat
+++ b/utils/package_win32.bat
@@ -10,6 +10,6 @@ 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 -e -p -x slic3r.pl --xargs --gui -o ..\slic3r.par
+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
diff --git a/utils/package_win32.ps1 b/utils/package_win32.ps1
new file mode 100644
index 0000000000..0a6cde4996
--- /dev/null
+++ b/utils/package_win32.ps1
@@ -0,0 +1,17 @@
+# Written by Joseph Lenox
+# Licensed under the same license as the rest of Slic3r.
+# ------------------------
+# 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."
+
+# Change this to where you have Strawberry Perl installed.
+#SET STRAWBERRY_PATH=C:\Strawberry
+$STRAWBERRY_PATH=C:\Strawberry
+# ([io.fileinfo](Get-Command "perl.exe").Path).basename
+
+cpanm "PAR::Packer"
+
+pp -a $STRAWBERRY_PATH\perl\bin\perl5.22.1.exe;perl5.22.1.exe -a $STRAWBERRY_PATH\perl\bin\freeglut.dll;freeglut.dll -a $STRAWBERRY_PATH\perl\bin\perl522.dll;perl522.dll -a $STRAWBERRY_PATH\perl\bin\libgcc_s_sjlj-1.dll;libgcc_s_sjlj-1.dll -a $STRAWBERRY_PATH\perl\bin\libstdc++-6.dll;libstdc++-6.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\wxbase30u_gcc_custom.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\site\lib\Alien\wxWidgets\msw_3_0_2_uni_gcc_3_4\lib\wxmsw30u_core_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 -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 -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
+
+cp ..\slic3r.par ..\slic3r-$(git rev-parse --abbrev-ref HEAD)-$(git rev-parse --short HEAD).zip

From a6353f3d90e94ede106272cca46698850b253608 Mon Sep 17 00:00:00 2001
From: Joseph Lenox <lordofhyphens@gmail.com>
Date: Thu, 7 Jul 2016 10:58:45 -0500
Subject: [PATCH 03/18] Update package_win32.ps1

added missing packages
---
 utils/package_win32.ps1 | 209 +++++++++++++++++++++++++++++++++++++++-
 1 file changed, 208 insertions(+), 1 deletion(-)

diff --git a/utils/package_win32.ps1 b/utils/package_win32.ps1
index 0a6cde4996..5f3a891429 100644
--- a/utils/package_win32.ps1
+++ b/utils/package_win32.ps1
@@ -12,6 +12,213 @@ $STRAWBERRY_PATH=C:\Strawberry
 
 cpanm "PAR::Packer"
 
-pp -a $STRAWBERRY_PATH\perl\bin\perl5.22.1.exe;perl5.22.1.exe -a $STRAWBERRY_PATH\perl\bin\freeglut.dll;freeglut.dll -a $STRAWBERRY_PATH\perl\bin\perl522.dll;perl522.dll -a $STRAWBERRY_PATH\perl\bin\libgcc_s_sjlj-1.dll;libgcc_s_sjlj-1.dll -a $STRAWBERRY_PATH\perl\bin\libstdc++-6.dll;libstdc++-6.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\wxbase30u_gcc_custom.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\site\lib\Alien\wxWidgets\msw_3_0_2_uni_gcc_3_4\lib\wxmsw30u_core_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 -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 -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
+pp -a $STRAWBERRY_PATH\perl\bin\perl5.22.1.exe;perl5.22.1.exe -a $STRAWBERRY_PATH\perl\bin\freeglut.dll;freeglut.dll -a $STRAWBERRY_PATH\perl\bin\perl522.dll;perl522.dll -a $STRAWBERRY_PATH\perl\bin\libgcc_s_sjlj-1.dll;libgcc_s_sjlj-1.dll -a $STRAWBERRY_PATH\perl\bin\libstdc++-6.dll;libstdc++-6.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\wxbase30u_gcc_custom.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\site\lib\Alien\wxWidgets\msw_3_0_2_uni_gcc_3_4\lib\wxmsw30u_core_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 -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 `
+-M AutoLoader `
+-M B `
+-M Carp `
+-M Class `
+-M Class::Accessor `
+-M Class::XSAccessor `
+-M Class::XSAccessor::Heavy `
+-M Config `
+-M Crypt `
+-M Crypt::CBC `
+-M Cwd `
+-M Data `
+-M Data::UUID `
+-M Devel `
+-M Devel::GlobalDestruction `
+-M Digest `
+-M Digest::MD5 `
+-M Digest::SHA `
+-M Digest::base `
+-M DynaLoader `
+-M Encode `
+-M Encode::Alias `
+-M Encode::Byte `
+-M Encode::Config `
+-M Encode::Encoding `
+-M Encode::Locale `
+-M Encode::MIME `
+-M Encode::MIME::Name `
+-M Errno `
+-M Exporter `
+-M Exporter::Heavy `
+-M Fcntl `
+-M File `
+-M File::Basename `
+-M File::Glob `
+-M File::Spec `
+-M File::Spec::Unix `
+-M File::Spec::Win32 `
+-M FindBin `
+-M Getopt `
+-M Getopt::Long `
+-M Growl `
+-M Growl::GNTP `
+-M HTTP `
+-M HTTP::Config `
+-M HTTP::Date `
+-M HTTP::Headers `
+-M HTTP::Headers::Util `
+-M HTTP::Message `
+-M HTTP::Request `
+-M HTTP::Request::Common `
+-M HTTP::Response `
+-M HTTP::Status `
+-M IO `
+-M IO::Handle `
+-M IO::Select `
+-M IO::Socket `
+-M IO::Socket::INET `
+-M IO::Socket::INET6 `
+-M IO::Socket::IP `
+-M IO::Socket::UNIX `
+-M LWP `
+-M LWP::MediaTypes `
+-M LWP::MemberMixin `
+-M LWP::Protocol `
+-M LWP::Protocol::http `
+-M LWP::UserAgent `
+-M List `
+-M List::Util `
+-M Math `
+-M Math::Libm `
+-M Math::PlanePath `
+-M Math::PlanePath::ArchimedeanChords `
+-M Math::PlanePath::Base `
+-M Math::PlanePath::Base::Digits `
+-M Math::PlanePath::Base::Generic `
+-M Math::PlanePath::Base::NSEW `
+-M Math::PlanePath::Flowsnake `
+-M Math::PlanePath::FlowsnakeCentres `
+-M Math::PlanePath::HilbertCurve `
+-M Math::PlanePath::OctagramSpiral `
+-M Math::PlanePath::SacksSpiral `
+-M Math::Trig `
+-M Method `
+-M Method::Generate `
+-M Method::Generate::Accessor `
+-M Method::Generate::BuildAll `
+-M Method::Generate::Constructor `
+-M Module `
+-M Module::Runtime `
+-M Moo `
+-M Moo::HandleMoose `
+-M Moo::Object `
+-M Moo::Role `
+-M Moo::sification `
+-M Net `
+-M Net::Bonjour `
+-M Net::Bonjour::Entry `
+-M Net::DNS `
+-M Net::DNS::Domain `
+-M Net::DNS::DomainName `
+-M Net::DNS::Header `
+-M Net::DNS::Packet `
+-M Net::DNS::Parameters `
+-M Net::DNS::Question `
+-M Net::DNS::RR `
+-M Net::DNS::RR::OPT `
+-M Net::DNS::RR::PTR `
+-M Net::DNS::Resolver `
+-M Net::DNS::Resolver `
+-M Net::DNS::Resolver::Base `
+-M Net::DNS::Resolver::MSWin32 `
+-M Net::DNS::Update `
+-M Net::HTTP `
+-M Net::HTTP::Methods `
+-M OpenGL `
+-M POSIX `
+-M Pod `
+-M Pod::Escapes `
+-M Pod::Text `
+-M Pod::Usage `
+-M Role `
+-M Role::Tiny `
+-M Scalar `
+-M Scalar::Util `
+-M SelectSaver `
+-M Slic3r `
+-M Slic3r::XS `
+-M Socket `
+-M Socket6 `
+-M Storable `
+-M Sub `
+-M Sub::Defer `
+-M Sub::Exporter `
+-M Sub::Exporter::Progressive `
+-M Sub::Name `
+-M Sub::Quote `
+-M Sub::Util `
+-M Symbol `
+-M Term `
+-M Term::Cap `
+-M Text `
+-M Text::ParseWords `
+-M Thread `
+-M Thread::Queue `
+-M Thread::Semaphore `
+-M Tie `
+-M Tie::Handle `
+-M Tie::Hash `
+-M Tie::StdHandle `
+-M Time `
+-M Time::HiRes `
+-M Time::Local `
+-M URI `
+-M URI::Escape `
+-M URI::http `
+-M Unicode `
+-M Unicode::Normalize `
+-M Win32 `
+-M Win32::API `
+-M Win32::API::Struct `
+-M Win32::API::Type `
+-M Win32::IPHelper `
+-M Win32::TieRegistry `
+-M Win32::WinError `
+-M Win32API `
+-M Win32API::Registry `
+-M Wx `
+-M Wx::App `
+-M Wx::DND `
+-M Wx::DropSource `
+-M Wx::Event `
+-M Wx::GLCanvas `
+-M Wx::Grid `
+-M Wx::Html `
+-M Wx::Locale `
+-M Wx::Menu `
+-M Wx::Mini `
+-M Wx::Print `
+-M Wx::RadioBox `
+-M Wx::Timer `
+-M XSLoader `
+-M attributes `
+-M base `
+-M bytes `
+-M constant `
+-M constant `
+-M constant::defer `
+-M enum `
+-M feature `
+-M integer `
+-a ../lib;lib `
+-M locale `
+-M mro `
+-M overload `
+-M overload::numbers `
+-M overloading `
+-M parent `
+-M re `
+-M strict `
+-M threads `
+-M threads::shared `
+-M utf8 `
+-M vars `
+-M warnings `
+-M warnings::register `
+-e -p -x slic3r.pl -o ..\slic3r.par
 
 cp ..\slic3r.par ..\slic3r-$(git rev-parse --abbrev-ref HEAD)-$(git rev-parse --short HEAD).zip

From 80336e7130a6c6f7e7dea52d8e3c2299e1038efe Mon Sep 17 00:00:00 2001
From: Joseph Lenox <lordofhyphens@gmail.com>
Date: Thu, 7 Jul 2016 12:07:58 -0500
Subject: [PATCH 04/18] Fix batch file.

---
 utils/autorun.bat | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/utils/autorun.bat b/utils/autorun.bat
index 9b42380cdb..ad658efd07 100644
--- a/utils/autorun.bat
+++ b/utils/autorun.bat
@@ -1 +1 @@
-@perl5.22.1.exe script/slic3r.pl
+@perl5.22.1.exe script/slic3r.pl %*

From 67b5d12c06b1fc09e6a5be11d99292d8145e82cd Mon Sep 17 00:00:00 2001
From: Joseph Lenox <lordofhyphens@gmail.com>
Date: Thu, 7 Jul 2016 12:40:07 -0500
Subject: [PATCH 05/18] Fix Powershell syntax

---
 utils/package_win32.ps1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/utils/package_win32.ps1 b/utils/package_win32.ps1
index 5f3a891429..551263782a 100644
--- a/utils/package_win32.ps1
+++ b/utils/package_win32.ps1
@@ -7,7 +7,7 @@ echo "Requires PAR."
 
 # Change this to where you have Strawberry Perl installed.
 #SET STRAWBERRY_PATH=C:\Strawberry
-$STRAWBERRY_PATH=C:\Strawberry
+New-Variable -Name "STRAWBERRY_PATH" -Visibility -Value "C:\Strawberry"
 # ([io.fileinfo](Get-Command "perl.exe").Path).basename
 
 cpanm "PAR::Packer"

From 405f7456c58a3085b59d77dbe917242d9c6694f1 Mon Sep 17 00:00:00 2001
From: Joseph Lenox <lordofhyphens@gmail.com>
Date: Thu, 7 Jul 2016 13:53:45 -0500
Subject: [PATCH 06/18] set names up properly in powershell script

---
 utils/package_win32.ps1 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/utils/package_win32.ps1 b/utils/package_win32.ps1
index 551263782a..663e621d26 100644
--- a/utils/package_win32.ps1
+++ b/utils/package_win32.ps1
@@ -12,7 +12,7 @@ New-Variable -Name "STRAWBERRY_PATH" -Visibility -Value "C:\Strawberry"
 
 cpanm "PAR::Packer"
 
-pp -a $STRAWBERRY_PATH\perl\bin\perl5.22.1.exe;perl5.22.1.exe -a $STRAWBERRY_PATH\perl\bin\freeglut.dll;freeglut.dll -a $STRAWBERRY_PATH\perl\bin\perl522.dll;perl522.dll -a $STRAWBERRY_PATH\perl\bin\libgcc_s_sjlj-1.dll;libgcc_s_sjlj-1.dll -a $STRAWBERRY_PATH\perl\bin\libstdc++-6.dll;libstdc++-6.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\wxbase30u_gcc_custom.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\site\lib\Alien\wxWidgets\msw_3_0_2_uni_gcc_3_4\lib\wxmsw30u_core_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 -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 `
+pp "-a $STRAWBERRY_PATH\perl\bin\perl5.22.1.exe;perl5.22.1.exe -a $STRAWBERRY_PATH\perl\bin\freeglut.dll;freeglut.dll -a $STRAWBERRY_PATH\perl\bin\perl522.dll;perl522.dll -a $STRAWBERRY_PATH\perl\bin\libgcc_s_sjlj-1.dll;libgcc_s_sjlj-1.dll -a $STRAWBERRY_PATH\perl\bin\libstdc++-6.dll;libstdc++-6.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\wxbase30u_gcc_custom.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\site\lib\Alien\wxWidgets\msw_3_0_2_uni_gcc_3_4\lib\wxmsw30u_core_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 -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 `
 -M AutoLoader `
 -M B `
 -M Carp `
@@ -221,4 +221,4 @@ pp -a $STRAWBERRY_PATH\perl\bin\perl5.22.1.exe;perl5.22.1.exe -a $STRAWBERRY_PAT
 -M warnings::register `
 -e -p -x slic3r.pl -o ..\slic3r.par
 
-cp ..\slic3r.par ..\slic3r-$(git rev-parse --abbrev-ref HEAD)-$(git rev-parse --short HEAD).zip
+copy ..\slic3r.par "..\slic3r-$(git rev-parse --abbrev-ref HEAD)-$(git rev-parse --short HEAD).zip"

From a8a21d18ef5beb4269e310644652de731f094d0c Mon Sep 17 00:00:00 2001
From: Joseph Lenox <lordofhyphens@gmail.com>
Date: Thu, 7 Jul 2016 14:36:43 -0500
Subject: [PATCH 07/18] typo in script

---
 utils/package_win32.ps1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/utils/package_win32.ps1 b/utils/package_win32.ps1
index 663e621d26..13fab13fba 100644
--- a/utils/package_win32.ps1
+++ b/utils/package_win32.ps1
@@ -7,7 +7,7 @@ echo "Requires PAR."
 
 # Change this to where you have Strawberry Perl installed.
 #SET STRAWBERRY_PATH=C:\Strawberry
-New-Variable -Name "STRAWBERRY_PATH" -Visibility -Value "C:\Strawberry"
+New-Variable -Name "STRAWBERRY_PATH" -Value "C:\Strawberry"
 # ([io.fileinfo](Get-Command "perl.exe").Path).basename
 
 cpanm "PAR::Packer"

From ea0c8bced320c2af9b88f6eaf85210b267a6a55d Mon Sep 17 00:00:00 2001
From: Joseph Lenox <lordofhyphens@gmail.com>
Date: Thu, 7 Jul 2016 16:09:00 -0500
Subject: [PATCH 08/18] quoted paths.

---
 utils/package_win32.ps1 | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/utils/package_win32.ps1 b/utils/package_win32.ps1
index 13fab13fba..cf6fa6c9ff 100644
--- a/utils/package_win32.ps1
+++ b/utils/package_win32.ps1
@@ -12,7 +12,18 @@ New-Variable -Name "STRAWBERRY_PATH" -Value "C:\Strawberry"
 
 cpanm "PAR::Packer"
 
-pp "-a $STRAWBERRY_PATH\perl\bin\perl5.22.1.exe;perl5.22.1.exe -a $STRAWBERRY_PATH\perl\bin\freeglut.dll;freeglut.dll -a $STRAWBERRY_PATH\perl\bin\perl522.dll;perl522.dll -a $STRAWBERRY_PATH\perl\bin\libgcc_s_sjlj-1.dll;libgcc_s_sjlj-1.dll -a $STRAWBERRY_PATH\perl\bin\libstdc++-6.dll;libstdc++-6.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\wxbase30u_gcc_custom.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\site\lib\Alien\wxWidgets\msw_3_0_2_uni_gcc_3_4\lib\wxmsw30u_core_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 -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 `
+pp -a "$STRAWBERRY_PATH\perl\bin\perl5.22.1.exe;perl5.22.1.exe" ^
+-a "$STRAWBERRY_PATH\perl\bin\freeglut.dll;freeglut.dll" ^
+-a "$STRAWBERRY_PATH\perl\bin\perl522.dll;perl522.dll" ^
+-a "$STRAWBERRY_PATH\perl\bin\libgcc_s_sjlj-1.dll;libgcc_s_sjlj-1.dll" ^
+-a "$STRAWBERRY_PATH\perl\bin\libstdc++-6.dll;libstdc++-6.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\wxbase30u_gcc_custom.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\site\lib\Alien\wxWidgets\msw_3_0_2_uni_gcc_3_4\lib\wxmsw30u_core_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" ^
+-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 `
 -M AutoLoader `
 -M B `
 -M Carp `

From 166d199fc48f8b62b4d3b2185ce80a7a5a74b407 Mon Sep 17 00:00:00 2001
From: Joseph Lenox <lenox.joseph@gmail.com>
Date: Thu, 7 Jul 2016 18:25:40 -0500
Subject: [PATCH 09/18] Finished cleaning up module and include list.

---
 utils/package_win32.ps1 | 31 ++++---------------------------
 1 file changed, 4 insertions(+), 27 deletions(-)

diff --git a/utils/package_win32.ps1 b/utils/package_win32.ps1
index cf6fa6c9ff..1ae0ffb3be 100644
--- a/utils/package_win32.ps1
+++ b/utils/package_win32.ps1
@@ -23,21 +23,19 @@ 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_core_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" ^
 -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 "..\utils;script\utils" -a "..\var;script\var" -a "autorun.bat;slic3r.bat" `
+-a "../lib;lib" `
 -M AutoLoader `
 -M B `
 -M Carp `
--M Class `
 -M Class::Accessor `
 -M Class::XSAccessor `
 -M Class::XSAccessor::Heavy `
 -M Config `
--M Crypt `
 -M Crypt::CBC `
 -M Cwd `
 -M Data `
 -M Data::UUID `
--M Devel `
 -M Devel::GlobalDestruction `
 -M Digest `
 -M Digest::MD5 `
@@ -50,24 +48,19 @@ pp -a "$STRAWBERRY_PATH\perl\bin\perl5.22.1.exe;perl5.22.1.exe" ^
 -M Encode::Config `
 -M Encode::Encoding `
 -M Encode::Locale `
--M Encode::MIME `
 -M Encode::MIME::Name `
 -M Errno `
 -M Exporter `
 -M Exporter::Heavy `
 -M Fcntl `
--M File `
 -M File::Basename `
 -M File::Glob `
 -M File::Spec `
 -M File::Spec::Unix `
 -M File::Spec::Win32 `
 -M FindBin `
--M Getopt `
 -M Getopt::Long `
--M Growl `
 -M Growl::GNTP `
--M HTTP `
 -M HTTP::Config `
 -M HTTP::Date `
 -M HTTP::Headers `
@@ -91,13 +84,10 @@ pp -a "$STRAWBERRY_PATH\perl\bin\perl5.22.1.exe;perl5.22.1.exe" ^
 -M LWP::Protocol `
 -M LWP::Protocol::http `
 -M LWP::UserAgent `
--M List `
 -M List::Util `
--M Math `
 -M Math::Libm `
 -M Math::PlanePath `
 -M Math::PlanePath::ArchimedeanChords `
--M Math::PlanePath::Base `
 -M Math::PlanePath::Base::Digits `
 -M Math::PlanePath::Base::Generic `
 -M Math::PlanePath::Base::NSEW `
@@ -107,19 +97,15 @@ pp -a "$STRAWBERRY_PATH\perl\bin\perl5.22.1.exe;perl5.22.1.exe" ^
 -M Math::PlanePath::OctagramSpiral `
 -M Math::PlanePath::SacksSpiral `
 -M Math::Trig `
--M Method `
--M Method::Generate `
 -M Method::Generate::Accessor `
 -M Method::Generate::BuildAll `
 -M Method::Generate::Constructor `
--M Module `
 -M Module::Runtime `
 -M Moo `
 -M Moo::HandleMoose `
 -M Moo::Object `
 -M Moo::Role `
 -M Moo::sification `
--M Net `
 -M Net::Bonjour `
 -M Net::Bonjour::Entry `
 -M Net::DNS `
@@ -141,16 +127,13 @@ pp -a "$STRAWBERRY_PATH\perl\bin\perl5.22.1.exe;perl5.22.1.exe" ^
 -M Net::HTTP::Methods `
 -M OpenGL `
 -M POSIX `
--M Pod `
 -M Pod::Escapes `
 -M Pod::Text `
 -M Pod::Usage `
--M Role `
 -M Role::Tiny `
--M Scalar `
 -M Scalar::Util `
 -M SelectSaver `
--M Slic3r `
+-M Slic3r::* `
 -M Slic3r::XS `
 -M Socket `
 -M Socket6 `
@@ -163,14 +146,11 @@ pp -a "$STRAWBERRY_PATH\perl\bin\perl5.22.1.exe;perl5.22.1.exe" ^
 -M Sub::Quote `
 -M Sub::Util `
 -M Symbol `
--M Term `
 -M Term::Cap `
--M Text `
 -M Text::ParseWords `
 -M Thread `
 -M Thread::Queue `
 -M Thread::Semaphore `
--M Tie `
 -M Tie::Handle `
 -M Tie::Hash `
 -M Tie::StdHandle `
@@ -180,7 +160,6 @@ pp -a "$STRAWBERRY_PATH\perl\bin\perl5.22.1.exe;perl5.22.1.exe" ^
 -M URI `
 -M URI::Escape `
 -M URI::http `
--M Unicode `
 -M Unicode::Normalize `
 -M Win32 `
 -M Win32::API `
@@ -189,7 +168,6 @@ pp -a "$STRAWBERRY_PATH\perl\bin\perl5.22.1.exe;perl5.22.1.exe" ^
 -M Win32::IPHelper `
 -M Win32::TieRegistry `
 -M Win32::WinError `
--M Win32API `
 -M Win32API::Registry `
 -M Wx `
 -M Wx::App `
@@ -215,7 +193,6 @@ pp -a "$STRAWBERRY_PATH\perl\bin\perl5.22.1.exe;perl5.22.1.exe" ^
 -M enum `
 -M feature `
 -M integer `
--a ../lib;lib `
 -M locale `
 -M mro `
 -M overload `
@@ -230,6 +207,6 @@ pp -a "$STRAWBERRY_PATH\perl\bin\perl5.22.1.exe;perl5.22.1.exe" ^
 -M vars `
 -M warnings `
 -M warnings::register `
--e -p -x slic3r.pl -o ..\slic3r.par
+-e -p slic3r.pl -o ..\slic3r.par
 
 copy ..\slic3r.par "..\slic3r-$(git rev-parse --abbrev-ref HEAD)-$(git rev-parse --short HEAD).zip"

From ec4c14afe95817089df908f1bcb9b936ac7083fe Mon Sep 17 00:00:00 2001
From: Joseph Lenox <lenox.joseph@gmail.com>
Date: Thu, 7 Jul 2016 18:39:01 -0500
Subject: [PATCH 10/18] changed to correctly indicate which branch it belongs
 to, in addition to the commit.

---
 utils/autorun.bat       |  2 +-
 utils/package_win32.bat | 15 ---------------
 utils/package_win32.ps1 | 13 ++++++++++---
 3 files changed, 11 insertions(+), 19 deletions(-)
 delete mode 100644 utils/package_win32.bat

diff --git a/utils/autorun.bat b/utils/autorun.bat
index ad658efd07..5a5d376423 100644
--- a/utils/autorun.bat
+++ b/utils/autorun.bat
@@ -1 +1 @@
-@perl5.22.1.exe script/slic3r.pl %*
+@perl5.22.1.exe slic3r.pl %*
diff --git a/utils/package_win32.bat b/utils/package_win32.bat
deleted file mode 100644
index 26184c86e4..0000000000
--- a/utils/package_win32.bat
+++ /dev/null
@@ -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
diff --git a/utils/package_win32.ps1 b/utils/package_win32.ps1
index 1ae0ffb3be..d31682e036 100644
--- a/utils/package_win32.ps1
+++ b/utils/package_win32.ps1
@@ -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"

From 61fc0ec281dd1b34e0e2cd32b3ecad4ed6801ea9 Mon Sep 17 00:00:00 2001
From: Joseph Lenox <lenox.joseph@gmail.com>
Date: Thu, 7 Jul 2016 19:26:27 -0500
Subject: [PATCH 11/18] changing paths

---
 utils/package_win32.ps1 | 34 ++++++++++++++++++++--------------
 1 file changed, 20 insertions(+), 14 deletions(-)

diff --git a/utils/package_win32.ps1 b/utils/package_win32.ps1
index d31682e036..52b6cc30a8 100644
--- a/utils/package_win32.ps1
+++ b/utils/package_win32.ps1
@@ -8,28 +8,34 @@ echo "Requires PAR."
 New-Variable -Name "current_branch" -Value ""
 
 git branch | foreach {
-   if ($_ -match "^\*(.*)"){
+   if ($_ -match "`\*(.*)"){
          $current_branch += $matches[1] + "> "
    }
 }
 
 # Change this to where you have Strawberry Perl installed.
-New-Variable -Name "STRAWBERRY_PATH" -Value "C:\Strawberry"
+New-Variable -Name "STRAWBERRY_PATH" -Value "$STRAWBERRY_PATH"
 
 cpanm "PAR::Packer"
 
-pp -a "$STRAWBERRY_PATH\perl\bin\perl5.22.1.exe;perl5.22.1.exe" ^
--a "$STRAWBERRY_PATH\perl\bin\freeglut.dll;freeglut.dll" ^
--a "$STRAWBERRY_PATH\perl\bin\perl522.dll;perl522.dll" ^
--a "$STRAWBERRY_PATH\perl\bin\libgcc_s_sjlj-1.dll;libgcc_s_sjlj-1.dll" ^
--a "$STRAWBERRY_PATH\perl\bin\libstdc++-6.dll;libstdc++-6.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\wxbase30u_gcc_custom.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\site\lib\Alien\wxWidgets\msw_3_0_2_uni_gcc_3_4\lib\wxmsw30u_core_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" ^
--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" `
+pp `
+-a "../utils;utils"  `
+-a "autorun.bat;slic3r.bat"  `
+-a "../var;var"  `
+-a "../slic3r.pl;slic3r.pl" `
+-a "$STRAWBERRY_PATH\perl\bin\perl5.22.2.exe;perl5.22.2.exe"  `
+-a "$STRAWBERRY_PATH\perl\bin\perl522.dll;perl522.dll"  `
+-a "$STRAWBERRY_PATH\perl\bin\libgcc_s_sjlj-1.dll;libgcc_s_sjlj-1.dll"  `
+-a "$STRAWBERRY_PATH\perl\bin\libstdc++-6.dll;libstdc++-6.dll"  `
+-a "$STRAWBERRY_PATH\perl\bin\libwinpthread-1.dll;libwinpthread-1.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\wxbase30u_gcc_custom.dll;wxbase30u_gcc_custom.dll"  `
+-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 "../slic3r.pl;slic3r.pl"
 -M AutoLoader `

From 84a2de5bfa6591f99dc2f12f57450bdf2fd8e23b Mon Sep 17 00:00:00 2001
From: Joseph Lenox <lenox.joseph@gmail.com>
Date: Thu, 7 Jul 2016 20:04:52 -0500
Subject: [PATCH 12/18] oops, forgot a backtick

---
 utils/package_win32.ps1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/utils/package_win32.ps1 b/utils/package_win32.ps1
index 52b6cc30a8..56ebaa3222 100644
--- a/utils/package_win32.ps1
+++ b/utils/package_win32.ps1
@@ -37,7 +37,7 @@ pp `
 -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 "../slic3r.pl;slic3r.pl"
+-a "../slic3r.pl;slic3r.pl" `
 -M AutoLoader `
 -M B `
 -M Carp `

From 7e0767b0f1b9eb6c827cf7aed760f12859425ff7 Mon Sep 17 00:00:00 2001
From: Joseph Lenox <lenox.joseph@gmail.com>
Date: Thu, 7 Jul 2016 20:42:41 -0500
Subject: [PATCH 13/18] fixing location of slic3r script

---
 utils/package_win32.ps1 | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/utils/package_win32.ps1 b/utils/package_win32.ps1
index 56ebaa3222..a7f98f60b9 100644
--- a/utils/package_win32.ps1
+++ b/utils/package_win32.ps1
@@ -22,7 +22,6 @@ pp `
 -a "../utils;utils"  `
 -a "autorun.bat;slic3r.bat"  `
 -a "../var;var"  `
--a "../slic3r.pl;slic3r.pl" `
 -a "$STRAWBERRY_PATH\perl\bin\perl5.22.2.exe;perl5.22.2.exe"  `
 -a "$STRAWBERRY_PATH\perl\bin\perl522.dll;perl522.dll"  `
 -a "$STRAWBERRY_PATH\perl\bin\libgcc_s_sjlj-1.dll;libgcc_s_sjlj-1.dll"  `
@@ -220,6 +219,6 @@ pp `
 -M vars `
 -M warnings `
 -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"

From d504a624be758d68aaa1d7de718cbadd3560c722 Mon Sep 17 00:00:00 2001
From: Joseph Lenox <lenox.joseph@gmail.com>
Date: Thu, 7 Jul 2016 21:41:00 -0500
Subject: [PATCH 14/18] minor fixes to packaging script

---
 utils/package_win32.ps1 | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/utils/package_win32.ps1 b/utils/package_win32.ps1
index a7f98f60b9..fb605b196c 100644
--- a/utils/package_win32.ps1
+++ b/utils/package_win32.ps1
@@ -8,8 +8,8 @@ echo "Requires PAR."
 New-Variable -Name "current_branch" -Value ""
 
 git branch | foreach {
-   if ($_ -match "`\*(.*)"){
-         $current_branch += $matches[1] + "> "
+   if ($_ -match "`  (.*)"){
+         $current_branch += $matches[1]
    }
 }
 
@@ -46,7 +46,6 @@ pp `
 -M Config `
 -M Crypt::CBC `
 -M Cwd `
--M Data `
 -M Data::UUID `
 -M Devel::GlobalDestruction `
 -M Digest `
@@ -150,7 +149,6 @@ pp `
 -M Socket `
 -M Socket6 `
 -M Storable `
--M Sub `
 -M Sub::Defer `
 -M Sub::Exporter `
 -M Sub::Exporter::Progressive `
@@ -166,7 +164,6 @@ pp `
 -M Tie::Handle `
 -M Tie::Hash `
 -M Tie::StdHandle `
--M Time `
 -M Time::HiRes `
 -M Time::Local `
 -M URI `

From 94b71f1aa9aeba42b58d3d82eeae4710f8f71039 Mon Sep 17 00:00:00 2001
From: Joseph Lenox <lenox.joseph@gmail.com>
Date: Thu, 7 Jul 2016 22:22:35 -0500
Subject: [PATCH 15/18] fixed perl path for batch file and added lib module

---
 utils/autorun.bat       | 2 +-
 utils/package_win32.ps1 | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/utils/autorun.bat b/utils/autorun.bat
index 5a5d376423..b952b87e59 100644
--- a/utils/autorun.bat
+++ b/utils/autorun.bat
@@ -1 +1 @@
-@perl5.22.1.exe slic3r.pl %*
+@perl5.22.2.exe slic3r.pl %*
diff --git a/utils/package_win32.ps1 b/utils/package_win32.ps1
index fb605b196c..fddabd2795 100644
--- a/utils/package_win32.ps1
+++ b/utils/package_win32.ps1
@@ -203,6 +203,7 @@ pp `
 -M feature `
 -M integer `
 -M locale `
+-M lib `
 -M mro `
 -M overload `
 -M overload::numbers `

From 1dd60cc295dff5dacdc3b55e2626ebaddb89370f Mon Sep 17 00:00:00 2001
From: Joseph Lenox <lenox.joseph@gmail.com>
Date: Thu, 7 Jul 2016 22:41:51 -0500
Subject: [PATCH 16/18] fixed variable references.

---
 utils/package_win32.ps1 | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/utils/package_win32.ps1 b/utils/package_win32.ps1
index fddabd2795..773f3169eb 100644
--- a/utils/package_win32.ps1
+++ b/utils/package_win32.ps1
@@ -14,7 +14,7 @@ git branch | foreach {
 }
 
 # Change this to where you have Strawberry Perl installed.
-New-Variable -Name "STRAWBERRY_PATH" -Value "$STRAWBERRY_PATH"
+New-Variable -Name "STRAWBERRY_PATH" -Value "C:\Strawberry"
 
 cpanm "PAR::Packer"
 
@@ -22,19 +22,19 @@ pp `
 -a "../utils;utils"  `
 -a "autorun.bat;slic3r.bat"  `
 -a "../var;var"  `
--a "$STRAWBERRY_PATH\perl\bin\perl5.22.2.exe;perl5.22.2.exe"  `
--a "$STRAWBERRY_PATH\perl\bin\perl522.dll;perl522.dll"  `
--a "$STRAWBERRY_PATH\perl\bin\libgcc_s_sjlj-1.dll;libgcc_s_sjlj-1.dll"  `
--a "$STRAWBERRY_PATH\perl\bin\libstdc++-6.dll;libstdc++-6.dll"  `
--a "$STRAWBERRY_PATH\perl\bin\libwinpthread-1.dll;libwinpthread-1.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\wxbase30u_gcc_custom.dll;wxbase30u_gcc_custom.dll"  `
--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 "${STRAWBERRY_PATH}\perl\bin\perl5.22.2.exe;perl5.22.2.exe"  `
+-a "${STRAWBERRY_PATH}\perl\bin\perl522.dll;perl522.dll"  `
+-a "${STRAWBERRY_PATH}\perl\bin\libgcc_s_sjlj-1.dll;libgcc_s_sjlj-1.dll"  `
+-a "${STRAWBERRY_PATH}\perl\bin\libstdc++-6.dll;libstdc++-6.dll"  `
+-a "${STRAWBERRY_PATH}\perl\bin\libwinpthread-1.dll;libwinpthread-1.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\wxbase30u_gcc_custom.dll;wxbase30u_gcc_custom.dll"  `
+-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 "../slic3r.pl;slic3r.pl" `
 -M AutoLoader `

From 3954103b9aba5d7dcdeeb11a8d61badeb14b006a Mon Sep 17 00:00:00 2001
From: Joseph Lenox <lordofhyphens@gmail.com>
Date: Fri, 8 Jul 2016 14:18:15 -0500
Subject: [PATCH 17/18] 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 773f3169eb..d67b285a48 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"

From 8e5ff98c8d430f2c1bbd587869b011d32524fe55 Mon Sep 17 00:00:00 2001
From: Joseph Lenox <lordofhyphens@gmail.com>
Date: Sat, 9 Jul 2016 19:41:26 -0500
Subject: [PATCH 18/18] Update package_win32.ps1

---
 utils/package_win32.ps1 | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/utils/package_win32.ps1 b/utils/package_win32.ps1
index d67b285a48..114076586a 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 "${APPVEYOR_REPO_BRANCH}"
+New-Variable -Name "current_branch" -Value ""
 
-#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"