fivedev/harbour-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2010-10-18 13:43 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)

Browse Source 
* 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.
This commit is contained in:
Viktor Szakats
2010-10-18 11:43:32 +00:00
parent bd381db5d2
commit afba30ccf8
3 changed files with 21 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
harbour/ChangeLog
View File

@@ -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

2
harbour/package/winuni/mpkg_win_uni.bat
View File

@@ -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\

18
harbour/package/winuni/mpkg_win_uni.nsi
View File

@@ -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