GitHub-Proxy/Slic3r
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/slic3r/Slic3r.git synced 2025-07-31 20:31:59 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "Clean up windows directory; move most files into libexec (another approach)"

Browse Source 
This reverts commit d27219e84b0997baf237004ca3e6929abd81eb25.

# Conflicts:
#	package/win/package_win32.ps1
This commit is contained in:
Alessandro Ranellucci 2017-05-21 19:59:14 +02:00 committed by Joseph Lenox
parent 6fb8a91522
commit d6605aa1a7
2 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
package/common/shell.cpp
View File

@ -15,7 +15,6 @@
#ifdef WIN32 #ifdef WIN32
int main(int argc, char **argv, char **env) int main(int argc, char **argv, char **env)
{ {
SetCurrentDirectory("libexec");
// If the Slic3r is installed in a localized directory (containing non-iso // If the Slic3r is installed in a localized directory (containing non-iso
// characters), spaces or semicolons, use short file names. // characters), spaces or semicolons, use short file names.

26
package/win/package_win32.ps1
View File

@ -30,16 +30,12 @@ git branch | foreach {
} }
if ($env:APPVEYOR) { if ($env:APPVEYOR) {
$output_dir = "${pwd}\..\..\Slic3r-${current_branch}.${current_date}.${env:APPVEYOR_BUILD_NUMBER}.$(git rev-parse --short HEAD).${env:ARCH}" $output_dir = "${pwd}\..\..\Slic3r-${current_branch}.${current_date}.${env:APPVEYOR_BUILD_NUMBER}.$(git rev-parse --short HEAD).${env:ARCH}.zip"
} else { } else {
$output_dir = "${pwd}\..\..\Slic3r-${current_branch}.${current_date}.$(git rev-parse --short HEAD)" $output_dir = "${pwd}\..\..\Slic3r-${current_branch}.${current_date}.$(git rev-parse --short HEAD).zip"
} }
mkdir $output_dir mkdir $output_dir
copy slic3r.exe $output_dir\Slic3r.exe
copy slic3r-console.exe $output_dir\Slic3r-console.exe
copy slic3r-debug-console.exe $output_dir\Slic3r-debug-console.exe
# Change this to where you have Strawberry Perl installed. # Change this to where you have Strawberry Perl installed.
New-Variable -Name "STRAWBERRY_PATH" -Value "C:\Strawberry" New-Variable -Name "STRAWBERRY_PATH" -Value "C:\Strawberry"
@ -54,7 +50,11 @@ if ($env:ARCH -eq "32bit") {
$pthread= "pthreadGC2-w64.dll" $pthread= "pthreadGC2-w64.dll"
} }
pp ` pp `
-a "slic3r.exe;Slic3r.exe" `
-a "slic3r-console.exe;Slic3r-console.exe" `
-a "slic3r-debug-console.exe;Slic3r-debug-console.exe" `
-a "../../lib;lib" ` -a "../../lib;lib" `
-a "../../local-lib;local-lib" ` -a "../../local-lib;local-lib" `
-a "../../slic3r.pl;slic3r.pl" ` -a "../../slic3r.pl;slic3r.pl" `
@ -146,10 +146,14 @@ pp `
-M XSLoader ` -M XSLoader `
-B ` -B `
-M lib ` -M lib `
-p ..\..\slic3r.pl -o "${output_dir}\libexec.par" -p ..\..\slic3r.pl -o ..\..\slic3r.par
Add-Type -Assembly "System.IO.Compression.FileSystem"
[System.IO.Compression.ZipFile]::ExtractToDirectory("${output_dir}\libexec.par", "${output_dir}\libexec")
del "${output_dir}\libexec.par"
[System.IO.Compression.ZipFile]::CreateFromDirectory(${output_dir}, "${output_dir}.zip") # switch renaming based on whether or not using packaged exe or zip
# make this more useful for not being on the appveyor server
if ($env:APPVEYOR) {
copy ..\..\slic3r.par ${output_file}
} else {
copy ..\..\slic3r.par ${output_file}
}
del ..\..\slic3r.par