From e3934dfecadf1b47cf08fb36471f4e3636c18769 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Fri, 12 Nov 2010 00:59:49 +0000 Subject: [PATCH] 2010-11-12 01:57 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) * package/winuni/mpkg_win_uni.bat ! Fixed to install all .hbc files inside the contrib dir structure. This is needed because now they exist also under '3rd' dirs, referenced from contrib .hbc files. (lightly tested, will find out with next nightly) * contrib/hbzebra/hbzebra.hbc ! Deleted no more needed reference to hbcairo.hbc --- harbour/ChangeLog | 10 ++++++++++ harbour/contrib/hbzebra/hbzebra.hbc | 2 -- harbour/package/winuni/mpkg_win_uni.bat | 3 ++- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 16f28ed645..4b99a00112 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,16 @@ The license applies to all entries newer than 2009-04-28. */ +2010-11-12 01:57 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) + * package/winuni/mpkg_win_uni.bat + ! Fixed to install all .hbc files inside the contrib + dir structure. This is needed because now they exist + also under '3rd' dirs, referenced from contrib .hbc files. + (lightly tested, will find out with next nightly) + + * contrib/hbzebra/hbzebra.hbc + ! Deleted no more needed reference to hbcairo.hbc + 2010-11-11 23:44 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) * contrib/hbzebra/tests/testwin.prg * Trying to figure what's best way to round off coordinates diff --git a/harbour/contrib/hbzebra/hbzebra.hbc b/harbour/contrib/hbzebra/hbzebra.hbc index 5202341a80..d73afd134a 100644 --- a/harbour/contrib/hbzebra/hbzebra.hbc +++ b/harbour/contrib/hbzebra/hbzebra.hbc @@ -5,5 +5,3 @@ incpaths=. libs=${hb_name} - -..\hbcairo\hbcairo.hbc diff --git a/harbour/package/winuni/mpkg_win_uni.bat b/harbour/package/winuni/mpkg_win_uni.bat index 5c856bc177..cb46d233a0 100644 --- a/harbour/package/winuni/mpkg_win_uni.bat +++ b/harbour/package/winuni/mpkg_win_uni.bat @@ -93,13 +93,14 @@ cd %~dp0..\..\contrib 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\*.txt %HB_ABSROOT%contrib\%%a\ xcopy /y /s %%a\tests\*.* %HB_ABSROOT%contrib\%%a\tests\ ) +xcopy /y /s *.hbc %HB_ABSROOT%contrib + popd rem ; Create unified installer