From 04425a2112d5645036b568870182fe3284d98564 Mon Sep 17 00:00:00 2001 From: Bastian Kleineidam Date: Wed, 27 Apr 2011 19:52:04 +0200 Subject: [PATCH] Do not compress DLLs in portable installer. --- windows/compress.bat | 27 --------------------------- windows/dist.bat | 6 ++++-- 2 files changed, 4 insertions(+), 29 deletions(-) delete mode 100644 windows/compress.bat diff --git a/windows/compress.bat b/windows/compress.bat deleted file mode 100644 index fe022542..00000000 --- a/windows/compress.bat +++ /dev/null @@ -1,27 +0,0 @@ -:: Compressing executables and libraries -:: Copyright (C) 2011 Bastian Kleineidam -:: This program is free software; you can redistribute it and/or modify -:: it under the terms of the GNU General Public License as published by -:: the Free Software Foundation; either version 2 of the License, or -:: (at your option) any later version. -:: -:: This program is distributed in the hope that it will be useful, -:: but WITHOUT ANY WARRANTY; without even the implied warranty of -:: MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -:: GNU General Public License for more details. -:: -:: You should have received a copy of the GNU General Public License along -:: with this program; if not, write to the Free Software Foundation, Inc., -:: 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -set UPX_EXE="C:\Software\upx307w\upx.exe" - -:: Do not compress the MS Visual C++ runtime files. Otherwise the -:: program won't run. -if "%1" == "msvcm90.dll" goto :finish -if "%1" == "msvcp90.dll" goto :finish -if "%1" == "msvcr90.dll" goto :finish - -%UPX_EXE% "%1" --best - -:finish diff --git a/windows/dist.bat b/windows/dist.bat index 61284891..25445fa4 100644 --- a/windows/dist.bat +++ b/windows/dist.bat @@ -15,6 +15,7 @@ :: 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. @echo off set PYDIR=C:\Python27 +set UPX_EXE="C:\Software\upx307w\upx.exe" set SZ_EXE="C:\Programme\7-Zip\7z.exe" for /f "usebackq tokens=*" %%a in (`%PYDIR%\python.exe setup.py --version`) do set VERSION="%%a" set PORTDIR=LinkChecker-%VERSION% @@ -27,8 +28,9 @@ echo Building portable distribution rd /s /q %PORTDIR% > nul xcopy /e /i dist %PORTDIR% del %PORTDIR%\omt.iss -echo Compressing libraries and executables -for /r %PORTDIR% %%f in (*.pyd,*.dll,*.exe) do call windows\compress.bat "%%f" +echo Compressing Python libraries and executables +:: skip DLL compression as it causes the GUI not to start +for /r %PORTDIR% %%f in (*.pyd,*.exe) do %UPX_EXE% "%%f" --best echo Generating portable distribution file %SZ_EXE% a -mx=9 -md=32m LinkChecker-%VERSION%-portable.zip %PORTDIR% rd /s /q %PORTDIR%