From afba30ccf8953f255e0377bfd8b7405b03f9298c Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Mon, 18 Oct 2010 11:43:32 +0000 Subject: [PATCH] 2010-10-18 13:43 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * package/winuni/mpkg_win_uni.bat * package/winuni/mpkg_win_uni.nsi ! Added uic/rcc tools to install packages. * QT related runtime/build time files are now installed unconditionally and independently from HBIDE. --- harbour/ChangeLog | 9 ++++++++- harbour/package/winuni/mpkg_win_uni.bat | 2 ++ harbour/package/winuni/mpkg_win_uni.nsi | 18 +++++++++++------- 3 files changed, 21 insertions(+), 8 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 832a847b2a..de06c35307 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,13 @@ The license applies to all entries newer than 2009-04-28. */ +2010-10-18 13:43 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + * package/winuni/mpkg_win_uni.bat + * package/winuni/mpkg_win_uni.nsi + ! Added uic/rcc tools to install packages. + * QT related runtime/build time files are now installed + unconditionally and independently from HBIDE. + 2010-10-18 12:18 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/src/compiler/hbmain.c ! reset function and class declaration between compiling files included @@ -53,7 +60,7 @@ TODO: changing signal definitions to exactly that of Qt itself. It is a challenging job and needs a real concentration. - + 2010-10-18 00:57 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * contrib/hbqt/qtgui/hbqtgui.hbx + contrib/hbqt/qtgui/THbQtUI.prg diff --git a/harbour/package/winuni/mpkg_win_uni.bat b/harbour/package/winuni/mpkg_win_uni.bat index 35a022e63b..34ee701e91 100644 --- a/harbour/package/winuni/mpkg_win_uni.bat +++ b/harbour/package/winuni/mpkg_win_uni.bat @@ -78,6 +78,8 @@ xcopy /y "%HB_WITH_QT%\..\bin\mingwm10.dll" xcopy /y "%HB_WITH_QT%\..\bin\QtCore4.dll" %HB_ABSROOT%bin\ xcopy /y "%HB_WITH_QT%\..\bin\QtGui4.dll" %HB_ABSROOT%bin\ xcopy /y "%HB_WITH_QT%\..\bin\QtNetwork4.dll" %HB_ABSROOT%bin\ +xcopy /y "%HB_WITH_QT%\..\bin\uic.exe" %HB_ABSROOT%bin\ +xcopy /y "%HB_WITH_QT%\..\bin\rcc.exe" %HB_ABSROOT%bin\ xcopy /y "%HB_WITH_QT%\..\lib\libQtCore4.a" %HB_ABSROOT%lib\win\mingw\ xcopy /y "%HB_WITH_QT%\..\lib\libQtGui4.a" %HB_ABSROOT%lib\win\mingw\ xcopy /y "%HB_WITH_QT%\..\lib\libQtUiTools.a" %HB_ABSROOT%lib\win\mingw\ diff --git a/harbour/package/winuni/mpkg_win_uni.nsi b/harbour/package/winuni/mpkg_win_uni.nsi index 59aede7a7a..6651b65de9 100644 --- a/harbour/package/winuni/mpkg_win_uni.nsi +++ b/harbour/package/winuni/mpkg_win_uni.nsi @@ -105,6 +105,17 @@ Section "Main components" hb_main File /nonfatal "$%HB_ABSROOT%bin\hbmk.hbc" File "$%HB_ABSROOT%bin\upx*.*" + ; QT + File "$%HB_ABSROOT%bin\libgcc_s_dw2-1.dll" + File "$%HB_ABSROOT%bin\mingwm10.dll" + File "$%HB_ABSROOT%bin\QtCore4.dll" + File "$%HB_ABSROOT%bin\QtGui4.dll" + File "$%HB_ABSROOT%bin\QtNetwork4.dll" + File "$%HB_ABSROOT%bin\uic.exe" + File "$%HB_ABSROOT%bin\rcc.exe" + File "$%HB_ABSROOT%bin\Qt_LICENSE_LGPL.txt" + File "$%HB_ABSROOT%bin\Qt_LICENSE_LGPL_EXCEPTION.txt" + SetOutPath $INSTDIR\include File "$%HB_ABSROOT%include\*.*" @@ -145,13 +156,6 @@ SectionEnd Section /o "IDE" hb_ide SetOutPath $INSTDIR\bin File "$%HB_ABSROOT%bin\hbide.exe" - File "$%HB_ABSROOT%bin\libgcc_s_dw2-1.dll" - File "$%HB_ABSROOT%bin\mingwm10.dll" - File "$%HB_ABSROOT%bin\QtCore4.dll" - File "$%HB_ABSROOT%bin\QtGui4.dll" - File "$%HB_ABSROOT%bin\QtNetwork4.dll" - File "$%HB_ABSROOT%bin\Qt_LICENSE_LGPL.txt" - File "$%HB_ABSROOT%bin\Qt_LICENSE_LGPL_EXCEPTION.txt" SectionEnd !endif