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

2010-10-19 23:00 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)

Browse Source 
* package/winuni/mpkg_win_uni.bat
    ! Added .hbs files in contrib roots to unified windows
      package. In practice this means that the hbmk2 qt plugin 
      will now be shipped with standard distro.

  * utils/hbmk2/hbmk2.prg
    ! Typo in comment.
This commit is contained in:
Viktor Szakats
2010-10-19 21:01:46 +00:00
parent 6d79ec0911
commit 76292a7b44
3 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
harbour/ChangeLog
View File

@@ -16,6 +16,15 @@
The license applies to all entries newer than 2009-04-28.
*/
2010-10-19 23:00 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* package/winuni/mpkg_win_uni.bat
! Added .hbs files in contrib roots to unified windows
package. In practice this means that the hbmk2 qt plugin
will now be shipped with standard distro.
* utils/hbmk2/hbmk2.prg
! Typo in comment.
2010-10-19 09:19 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com)
* contrib/hbqt/qtgui/hbqtgui.ch
+ Added: more constants.
@@ -46,7 +55,7 @@
2010-10-18 14:10 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com)
* contrib/hbide/idemisc.prg
+ Applied: patch from Viktor. Now .hbm files are available inside
list of project files and it also become part of the .hbp if that
list of project files and it also become part of the .hbp if that
is written back on disk plus for editing purposes.
2010-10-18 21:35 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)

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

@@ -95,6 +95,7 @@ for /F %%a in ( 'dir /b /ad' ) do (
echo %%a
xcopy /y /s %%a\*.hbc %HB_ABSROOT%contrib\%%a\
xcopy /y /s %%a\*.def %HB_ABSROOT%contrib\%%a\
xcopy /y /s %%a\*.hbs %HB_ABSROOT%contrib\%%a\
xcopy /y /s %%a\tests\*.* %HB_ABSROOT%contrib\%%a\tests\
)

2
harbour/utils/hbmk2/hbmk2.prg
View File

@@ -7475,7 +7475,7 @@ STATIC FUNCTION LibExists( hbmk, cDir, cLib, cLibPrefix, cLibExt )
DO CASE
CASE hbmk[ _HBMK_cCOMP ] $ "gcc|mingw|mingw64|mingwarm|cygwin" .AND. hbmk[ _HBMK_cPLAT ] $ "win|wce"
/* NOTE: ld/gcc option -dll-search-prefix isn't taken into account here,
So, '<prefix>xxx.dll' format libs won't be found by hbmk. */
So, '<prefix>xxx.dll' format libs won't be found by hbmk2. */
DO CASE
CASE hb_FileExists( tmp := cDir + "lib" + FNameExtSet( cLib, ".dll.a" ) ) ; RETURN tmp
CASE hb_FileExists( tmp := cDir + FNameExtSet( cLib, ".dll.a" ) ) ; RETURN tmp