From 402035732b2f3e0bbcae98d740ef97be8d2edbfd Mon Sep 17 00:00:00 2001 From: Joseph Lenox Date: Tue, 7 Feb 2017 19:50:12 -0600 Subject: [PATCH] moved win and linux packaging scripts to package/ tree (#3699) --- package/linux/package_linux.sh | 6 ++++++ {utils => package/win}/autorun.bat | 0 {utils => package/win}/package_win32.ps1 | 24 ++++++++++++------------ 3 files changed, 18 insertions(+), 12 deletions(-) create mode 100755 package/linux/package_linux.sh rename {utils => package/win}/autorun.bat (100%) rename {utils => package/win}/package_win32.ps1 (81%) diff --git a/package/linux/package_linux.sh b/package/linux/package_linux.sh new file mode 100755 index 000000000..9133f23b2 --- /dev/null +++ b/package/linux/package_linux.sh @@ -0,0 +1,6 @@ +#!/bin/bash +# Written by Joseph Lenox +# Licensed under the same license as the rest of Slic3r. +# ------------------------ + +pp -a "../../utils;utils" -a "../../var;var" -a "../../lib;lib" -a "../../local-lib;local-lib" -a "../../slic3r.pl;slic3r.pl" -M AutoLoader -M B -M Carp -M Class::Accessor -M Class::XSAccessor -M Class::XSAccessor::Heavy -M Config -M Cwd -M Devel::GlobalDestruction -M Digest -M Digest::MD5 -M Digest::SHA -M Digest::base -M DynaLoader -M Errno -M Exporter -M Exporter::Heavy -M Fcntl -M File::Basename -M File::Glob -M File::Spec -M File::Spec::Unix -M File::Spec::Win32 -M FindBin -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 LWP -M LWP::MediaTypes -M LWP::MemberMixin -M LWP::Protocol -M LWP::Protocol::http -M LWP::UserAgent -M List::Util -M Math::Trig -M Method::Generate::Accessor -M Method::Generate::BuildAll -M Method::Generate::Constructor -M Module::Runtime -M POSIX -M Pod::Escapes -M Pod::Text -M Pod::Usage -M SelectSaver -M Socket -M Socket6 -M Storable -M Sub::Defer -M Sub::Exporter -M Sub::Exporter::Progressive -M Sub::Name -M Symbol -M Term::Cap -M Text::ParseWords -M Thread -M Thread::Queue -M Thread::Semaphore -M Tie::Handle -M Tie::Hash -M Tie::StdHandle -M Time::Local -M URI -M URI::Escape -M URI::http -M Unicode::Normalize -M XSLoader -B -M lib -p ../../slic3r.pl -o ../../slic3r.par diff --git a/utils/autorun.bat b/package/win/autorun.bat similarity index 100% rename from utils/autorun.bat rename to package/win/autorun.bat diff --git a/utils/package_win32.ps1 b/package/win/package_win32.ps1 similarity index 81% rename from utils/package_win32.ps1 rename to package/win/package_win32.ps1 index 1311c4a48..0f1f73e01 100644 --- a/utils/package_win32.ps1 +++ b/package/win/package_win32.ps1 @@ -35,9 +35,9 @@ New-Variable -Name "STRAWBERRY_PATH" -Value "C:\Strawberry" cpanm "PAR::Packer" pp ` --a "../utils;utils" ` +-a "../../utils;utils" ` -a "autorun.bat;slic3r.bat" ` --a "../var;var" ` +-a "../../var;var" ` -a "${STRAWBERRY_PATH}\perl\bin\perl5.24.0.exe;perl5.24.0.exe" ` -a "${STRAWBERRY_PATH}\perl\bin\perl524.dll;perl524.dll" ` -a "${STRAWBERRY_PATH}\perl\bin\libgcc_s_sjlj-1.dll;libgcc_s_sjlj-1.dll" ` @@ -45,9 +45,9 @@ pp ` -a "${STRAWBERRY_PATH}\perl\bin\libwinpthread-1.dll;libwinpthread-1.dll" ` -a "${STRAWBERRY_PATH}\perl\bin\freeglut.dll;freeglut.dll" ` -a "${STRAWBERRY_PATH}\c\bin\libglut-0_.dll;libglut-0_.dll" ` --a "../lib;lib" ` --a "../local-lib;local-lib" ` --a "../slic3r.pl;slic3r.pl" ` +-a "../../lib;lib" ` +-a "../../local-lib;local-lib" ` +-a "../../slic3r.pl;slic3r.pl" ` -M AutoLoader ` -M B ` -M Carp ` @@ -131,23 +131,23 @@ pp ` -M XSLoader ` -B ` -M lib ` --p ..\slic3r.pl -o ..\${output_file} +-p ..\..\slic3r.pl -o ..\..\${output_file} # switch renaming based on whether or not using packaged exe or zip if ($exe) { if ($env:APPVEYOR) { - copy ..\slic3r.exe "..\slic3r-${current_branch}.${current_date}.${env:APPVEYOR_BUILD_NUMBER}.$(git rev-parse --short HEAD).exe" + copy ..\..\slic3r.exe "..\..\slic3r-${current_branch}.${current_date}.${env:APPVEYOR_BUILD_NUMBER}.$(git rev-parse --short HEAD).exe" del ..\slic3r.exe } else { - copy ..\slic3r.exe "..\slic3r-${current_branch}.${current_date}.$(git rev-parse --short HEAD).exe" - del ..\slic3r.exe + copy ..\..\slic3r.exe "..\..\slic3r-${current_branch}.${current_date}.$(git rev-parse --short HEAD).exe" + del ..\..\slic3r.exe } } else { # make this more useful for not being on the appveyor server if ($env:APPVEYOR) { - copy ..\slic3r.par "..\slic3r-${current_branch}.${current_date}.${env:APPVEYOR_BUILD_NUMBER}.$(git rev-parse --short HEAD).zip" + copy ..\..\slic3r.par "..\..\slic3r-${current_branch}.${current_date}.${env:APPVEYOR_BUILD_NUMBER}.$(git rev-parse --short HEAD).zip" } else { - copy ..\slic3r.par "..\slic3r-${current_branch}.${current_date}.$(git rev-parse --short HEAD).zip" - del ../slic3r.par + copy ..\..\slic3r.par "..\..\slic3r-${current_branch}.${current_date}.$(git rev-parse --short HEAD).zip" + del ..\..\slic3r.par } }