diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 0fce9e7493..46952d6412 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,20 @@ The license applies to all entries newer than 2009-04-28. */ +2012-10-31 18:54 UTC+0100 Viktor Szakats (harbour syenar.net) + - config/hb_c.cfg + + bin/harbour.ucf + * renamed and moved to public dir + + * config/postinst.hb + + added find.hb to the installed files + + added harbour.ucf to the installed file + + * package/winuni/mpkg_win_uni.bat + * package/winuni/mpkg_win_uni.nsi + + added harbour.ucf to files included in winuni distro + ! fixed missing bin/*.hb scripts in .7z winuni archive + 2012-10-31 18:20 UTC+0100 Viktor Szakats (harbour syenar.net) * tests/gfx.prg + changed do display GT name on screen rather than to stdout @@ -61,7 +75,7 @@ + updated to do better vertical aligment in structs, var declarations and assignments ; TODO: move this to /bin folder and add to 'install'-ed - file list, rename to 'harbour.ucf' + file list, rename to 'harbour.ucf' [DONE] * src/debug/*.prg * src/rdd/*.prg diff --git a/harbour/config/hb_c.cfg b/harbour/bin/harbour.ucf similarity index 100% rename from harbour/config/hb_c.cfg rename to harbour/bin/harbour.ucf diff --git a/harbour/config/postinst.hb b/harbour/config/postinst.hb index bae777a3db..a6aa7c2bed 100644 --- a/harbour/config/postinst.hb +++ b/harbour/config/postinst.hb @@ -84,7 +84,10 @@ PROCEDURE Main( ... ) OutStd( "! Copying Harbour script files..." + hb_eol() ) /* public Harbour scripts */ - FOR EACH tmp IN { "bin/3rdpatch.hb" } + FOR EACH tmp IN { ; + "bin/3rdpatch.hb", ; + "bin/find.hb", ; + "bin/harbour.ucf" } mk_hb_FCopy( tmp, GetEnvC( "HB_INSTALL_BIN" ) + hb_ps() ) NEXT ENDIF diff --git a/harbour/package/winuni/mpkg_win_uni.bat b/harbour/package/winuni/mpkg_win_uni.bat index 5c9ef1c7c3..f1397a2ccf 100644 --- a/harbour/package/winuni/mpkg_win_uni.bat +++ b/harbour/package/winuni/mpkg_win_uni.bat @@ -116,6 +116,8 @@ echo "%HB_DR%bin\hbnetio.exe" >> _hbfiles echo "%HB_DR%bin\hbpp.exe" >> _hbfiles echo "%HB_DR%bin\hbrun.exe" >> _hbfiles echo "%HB_DR%bin\hbtest.exe" >> _hbfiles +if exist "%HB_DR%bin\*.hb" echo "%HB_DR%bin\*.hb" >> _hbfiles +if exist "%HB_DR%bin\*.ucf" echo "%HB_DR%bin\*.ucf" >> _hbfiles if exist "%HB_DR%bin\hbmk.hbc" echo "%HB_DR%bin\hbmk.hbc" >> _hbfiles echo "%HB_DR%bin\upx*.*" >> _hbfiles echo "%HB_DR%include\*.*" >> _hbfiles diff --git a/harbour/package/winuni/mpkg_win_uni.nsi b/harbour/package/winuni/mpkg_win_uni.nsi index cbfb589adb..42236e48ff 100644 --- a/harbour/package/winuni/mpkg_win_uni.nsi +++ b/harbour/package/winuni/mpkg_win_uni.nsi @@ -102,6 +102,7 @@ Section "Main components" hb_main File "$%HB_ABSROOT%bin\hbrun.exe" File "$%HB_ABSROOT%bin\hbtest.exe" File /nonfatal "$%HB_ABSROOT%bin\*.hb" + File /nonfatal "$%HB_ABSROOT%bin\*.ucf" File /nonfatal "$%HB_ABSROOT%bin\hbmk.hbc" File "$%HB_ABSROOT%bin\upx*.*"