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

2011-05-05 19:15 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)

Browse Source 
* package/winuni/mpkg_win_uni.bat
  * package/winuni/mpkg_win_uni.nsi
    + added qtsql related files. ought to fix regression causing
      broken hbqt in nightly binary since this commit:
        2011-03-25 18:24 UTC-0800 Pritpal Bedi
      NOTE: since my SVN changes don't seem to affect nightly creation 
            on Francesco's server anymore, I'm not sure when this fix 
            will go "live".
This commit is contained in:
Viktor Szakats
2011-05-05 17:17:18 +00:00
parent 853daceb2e
commit ee5e801e78
3 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
harbour/ChangeLog
View File

@@ -16,6 +16,16 @@
The license applies to all entries newer than 2009-04-28.
*/
2011-05-05 19:15 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* package/winuni/mpkg_win_uni.bat
* package/winuni/mpkg_win_uni.nsi
+ added qtsql related files. ought to fix regression causing
broken hbqt in nightly binary since this commit:
2011-03-25 18:24 UTC-0800 Pritpal Bedi
NOTE: since my SVN changes don't seem to affect nightly creation
on Francesco's server anymore, I'm not sure when this fix
will go "live".
2011-05-05 08:01 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com)
* contrib/hbxbp/xbpdialog.prg
! Fixed: a RTE on some ocassions. Thanks Shum for reporting.
@@ -23,9 +33,9 @@
2011-05-05 16:53 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* include/harbour.hbx
* src/rtl/libnamec.c
+ added HB_LIBPOSTFIX(). not finalized. it returns
+ added HB_LIBPOSTFIX(). not finalized. it returns
the dynamic lib postfix used by Harbour convention
(f.e. '-21', or '-21-wce-arm') by harbour core dll
(f.e. '-21', or '-21-wce-arm') by harbour core dll
and contrib dlls
* src/vm/maindllp/dllpcode.c
@@ -50,7 +60,7 @@
! Rationalized: event loop, now no delays in processing.
With this commit, you can experiment with real applications.
Angel, can you re-visit the application you had sent to the
Angel, can you re-visit the application you had sent to the
list almost an year back ?
2011-05-04 12:39 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com)

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

@@ -79,11 +79,13 @@ 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\QtSql4.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\libQtNetwork4.a" %HB_ABSROOT%lib\win\mingw\
xcopy /y "%HB_WITH_QT%\..\lib\libQtSql4.a" %HB_ABSROOT%lib\win\mingw\
copy /y "%HB_WITH_QT%\..\LICENSE.LGPL" %HB_ABSROOT%bin\Qt_LICENSE_LGPL.txt
copy /y "%HB_WITH_QT%\..\LGPL_EXCEPTION.txt" %HB_ABSROOT%bin\Qt_LICENSE_LGPL_EXCEPTION.txt
@@ -139,6 +141,7 @@ if exist "%HB_DR%bin\mingwm10.dll" echo "%HB_DR%bin\mingwm10.dl
if exist "%HB_DR%bin\QtCore4.dll" echo "%HB_DR%bin\QtCore4.dll" >> _hbfiles
if exist "%HB_DR%bin\QtGui4.dll" echo "%HB_DR%bin\QtGui4.dll" >> _hbfiles
if exist "%HB_DR%bin\QtNetwork4.dll" echo "%HB_DR%bin\QtNetwork4.dll" >> _hbfiles
if exist "%HB_DR%bin\QtSql4.dll" echo "%HB_DR%bin\QtSql4.dll" >> _hbfiles
if exist "%HB_DR%bin\uic.exe" echo "%HB_DR%bin\uic.exe" >> _hbfiles
if exist "%HB_DR%bin\rcc.exe" echo "%HB_DR%bin\rcc.exe" >> _hbfiles
if exist "%HB_DR%bin\Qt_LICENSE_LGPL.txt" echo "%HB_DR%bin\Qt_LICENSE_LGPL.txt" >> _hbfiles

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

@@ -111,6 +111,7 @@ Section "Main components" hb_main
File "$%HB_ABSROOT%bin\QtCore4.dll"
File "$%HB_ABSROOT%bin\QtGui4.dll"
File "$%HB_ABSROOT%bin\QtNetwork4.dll"
File "$%HB_ABSROOT%bin\QtSql4.dll"
File "$%HB_ABSROOT%bin\uic.exe"
File "$%HB_ABSROOT%bin\rcc.exe"
File "$%HB_ABSROOT%bin\Qt_LICENSE_LGPL.txt"