From cfe571a6e3e401f666838e2bf4acc165f1344fff Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Sat, 20 Mar 2010 17:53:29 +0000 Subject: [PATCH] 2010-03-20 18:51 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) * bin/postinst.bat ! Fixed/cleaned latest modification, removed redundancy. --- harbour/ChangeLog | 14 +++++++++----- harbour/bin/postinst.bat | 11 +++++------ 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index d46a03e5e2..9eefc5d1a2 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,15 +17,19 @@ past entries belonging to author(s): Viktor Szakats. */ +2010-03-20 18:51 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) + * bin/postinst.bat + ! Fixed/cleaned latest modification, removed redundancy. + 2010-03-20 10:12 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com) * contrib/hbide/ideprojmanager.prg * contrib/hbide/idesources.prg - + Implemented: auto-save the project's source(s) at "build" time, + + Implemented: auto-save the project's source(s) at "build" time, if some are modified. This is implemented by default, no options. Regression is possible, please report. - + 2010-03-20 18:30 UTC+0200 Petr Chornyj (myorg63 at mail.ru) * harbour/ChangeLog ! fixed typo my previous commit. Sorry.. @@ -47,9 +51,9 @@ always producing GPF on OS2, to take care of by Qt itself. * contrib/hbide/idedocks.prg - ! Fix to *nixs warning - QWidget::setLayout: Attempting to set QLayout "" on QDockWidget - "dockHelp", which already has a layout + ! Fix to *nixs warning + QWidget::setLayout: Attempting to set QLayout "" on QDockWidget + "dockHelp", which already has a layout and family. + contrib/hbide/idewizard.prg diff --git a/harbour/bin/postinst.bat b/harbour/bin/postinst.bat index 17b46f8cb2..aceab2bec7 100644 --- a/harbour/bin/postinst.bat +++ b/harbour/bin/postinst.bat @@ -70,12 +70,11 @@ if "%HB_SHELL%" == "nt" goto _SH_NT rem ; We build this here, because GNU Make wouldn't add the icon. echo ! Making hbrun with application icon... - if "%HB_BUILD_DLL%" == "no" ( - "%HB_HOST_BIN_DIR%\hbmk2" -quiet -q0 -lang=en "-o%HB_BIN_INSTALL%\hbrun" "%~dp0..\utils\hbrun\hbrun.hbp" - ) ELSE ( - if not "%HB_BUILD_SHARED%" == "yes" "%HB_HOST_BIN_DIR%\hbmk2" -quiet -q0 -lang=en "-o%HB_BIN_INSTALL%\hbrun" "%~dp0..\utils\hbrun\hbrun.hbp" - rem if "%HB_BUILD_SHARED%" == "yes" "%HB_HOST_BIN_DIR%\hbmk2" -quiet -q0 -lang=en -shared "-o%HB_BIN_INSTALL%\hbrun" "%~dp0..\utils\hbrun\hbrun.hbp" - ) + + if "%HB_BUILD_SHARED%" == "yes" set _SHARED_=-shared + if "%HB_BUILD_DLL%" == "no" set _SHARED_= + + "%HB_HOST_BIN_DIR%\hbmk2" -quiet -q0 -lang=en %_SHARED_% "-o%HB_BIN_INSTALL%\hbrun" "%~dp0..\utils\hbrun\hbrun.hbp" :_NO_ICON_BIN