diff --git a/harbour/ChangeLog b/harbour/ChangeLog index b5e2aa2177..fe1bbf81aa 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,11 @@ past entries belonging to author(s): Viktor Szakats. */ +2009-07-02 09:53 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + * INSTALL + * mpkg_gnu.bat + + Added HB_DIR_ZIP envvar to spec location of zip.exe. + 2009-07-02 09:47 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * utils/hbmk2/hbmk2.hbp ! Updated after recent hbmk2 change. diff --git a/harbour/INSTALL b/harbour/INSTALL index ab13359488..b140c394c2 100644 --- a/harbour/INSTALL +++ b/harbour/INSTALL @@ -518,6 +518,7 @@ EXAMPLES rem ; To create installation packages (.exe + .zip), rem replace last line (calling make_gnu.bat) with these two: set HB_DIR_NSIS=%ProgramFiles%\NSIS\ + set HB_DIR_ZIP=C:\info-zip\ call mpkg_gnu.bat -->8-- @@ -560,6 +561,7 @@ EXAMPLES rem ; To create installation packages (.zip), rem replace last line (calling make_gnu.bat) with this one: rem (this will only work when using Windows NT or upper host) + set HB_DIR_ZIP=C:\info-zip\ call mpkg_gnu.bat -->8-- diff --git a/harbour/mpkg_gnu.bat b/harbour/mpkg_gnu.bat index 93f2b0556e..e34f455846 100644 --- a/harbour/mpkg_gnu.bat +++ b/harbour/mpkg_gnu.bat @@ -12,14 +12,15 @@ rem Harbour Project installer creator script (for Windows/DOS) rem rem This script requires: rem - Windows NT or upper +rem - Info-ZIP zip.exe in PATH +rem or HB_DIR_ZIP envvar set to its dir with an ending backslash. +rem https://sourceforge.net/project/showfiles.php?group_id=118012 rem - NullSoft Installer installed (NSIS) rem https://sourceforge.net/project/showfiles.php?group_id=22049&package_id=15374 rem (only for Windows builds) rem - makensis.exe (part of NSIS) in PATH rem or HB_DIR_NSIS envvar set to its dir with an ending backslash. rem (only for Windows builds) -rem - Info-ZIP zip.exe in PATH -rem https://sourceforge.net/project/showfiles.php?group_id=118012 rem - C compiler configured (see INSTALL doc) rem rem Please read INSTALL for further information. @@ -77,7 +78,7 @@ echo Harbour .zip install package creation: '%HB_PKGNAME%.zip' if exist "%HB_PKGNAME%.zip" del "%HB_PKGNAME%.zip" pushd cd "%HB_INSTALL_BASE%" -zip -q -9 -X -r -o "%~dp0%HB_PKGNAME%.zip" . -i "%HB_DIRNAME%\*" +"%HB_DIR_ZIP%zip.exe" -q -9 -X -r -o "%~dp0%HB_PKGNAME%.zip" . -i "%HB_DIRNAME%\*" popd rem ; Build installer package