From 1d335aa135fa7f63599773006da9bbeeb7ddac81 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Wed, 14 Nov 2012 19:53:04 +0000 Subject: [PATCH] 2012-11-14 20:49 UTC+0100 Viktor Szakats (harbour syenar.net) - INSTALL + README * config/global.mk * config/postinst.hb * contrib/hbmysql/readme.txt * doc/gmake.txt * NEWS * package/mpkg_win.nsi * package/winuni/mpkg_win_uni.bat * package/winuni/mpkg_win_uni.nsi * package/winuni/RELNOTES * tests/hbdoctst.prg * website/menu/harbour-menu.js * website/news.html * doc/howtorep.txt * 'INSTALL' doc renamed to 'README'. A little disruption, but hopefully it will be more intuitive place to look for. The doc by now contains lots more than installation procedures. This "new" name is also recognized and displayed by several source management web UIs automatically. ; To mailing list admins: Please update the links in the web group headers. Thank you! --- harbour/ChangeLog | 27 ++++++++++++++++++++++++- harbour/NEWS | 4 ++-- harbour/{INSTALL => README} | 0 harbour/config/global.mk | 2 +- harbour/config/postinst.hb | 2 +- harbour/contrib/hbmysql/readme.txt | 2 +- harbour/doc/gmake.txt | 2 +- harbour/doc/howtorep.txt | 4 ++-- harbour/package/mpkg_win.nsi | 4 ++-- harbour/package/winuni/RELNOTES | 6 +++--- harbour/package/winuni/mpkg_win_uni.bat | 2 +- harbour/package/winuni/mpkg_win_uni.nsi | 2 +- harbour/tests/hbdoctst.prg | 2 +- harbour/website/menu/harbour-menu.js | 2 +- harbour/website/news.html | 4 ++-- 15 files changed, 45 insertions(+), 20 deletions(-) rename harbour/{INSTALL => README} (100%) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 104979126f..a8bef90e5f 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,10 +16,35 @@ The license applies to all entries newer than 2009-04-28. */ +2012-11-14 20:49 UTC+0100 Viktor Szakats (harbour syenar.net) + - INSTALL + + README + * config/global.mk + * config/postinst.hb + * contrib/hbmysql/readme.txt + * doc/gmake.txt + * NEWS + * package/mpkg_win.nsi + * package/winuni/mpkg_win_uni.bat + * package/winuni/mpkg_win_uni.nsi + * package/winuni/RELNOTES + * tests/hbdoctst.prg + * website/menu/harbour-menu.js + * website/news.html + * doc/howtorep.txt + * 'INSTALL' doc renamed to 'README'. + A little disruption, but hopefully it will be + more intuitive place to look for. The doc by + now contains lots more than installation procedures. + This "new" name is also recognized and displayed + by several source management web UIs automatically. + ; To mailing list admins: Please update the + links in the web group headers. Thank you! + 2012-11-14 15:00 UTC+0100 Viktor Szakats (harbour syenar.net) * utils/hbmk2/hbmk2.es_PE.po + extensive Spanish translation update from - Guillermo Varona Silupú (GVS). Thanks very much. + Guillermo Varona Silupu (GVS). Thanks very much. 2012-11-14 13:24 UTC+0100 Viktor Szakats (harbour syenar.net) * utils/hbmk2/hbmk2.prg diff --git a/harbour/NEWS b/harbour/NEWS index 3a8c038456..6194279a77 100644 --- a/harbour/NEWS +++ b/harbour/NEWS @@ -117,7 +117,7 @@ General - x64 msvc compiler got a distinct HB_COMPILER value: msvc64. - msvcce compiler made compatible with older MSVC/WinCE versions. - Added support for Intel(R) C++ compiler (icc) on Linux and Windows. -- Added new INSTALL document giving a quick describing of the build +- Added new README document giving a quick describing of the build process on all supported platforms and compilers. - Several steps to make the build process simpler and requiring the less amount of preparation. @@ -126,7 +126,7 @@ General - Added support for HB_CONTRIBLIBS=no to disable building of all contribs. - Added ability to generate Windows installer and .zip distribution file. - Fully transitioned to GNU Make system for all compilers. - Now msvc, msvcce and bcc builds need GNU Make, see INSTALL for more + Now msvc, msvcce and bcc builds need GNU Make, see README for more information. "non-GNU" make systems got deleted from the source tree. - Cygwin renamed from gcc to cygwin. (NOTE: Cygwin doesn't work since some versions, and support may be removed in the future.) diff --git a/harbour/INSTALL b/harbour/README similarity index 100% rename from harbour/INSTALL rename to harbour/README diff --git a/harbour/config/global.mk b/harbour/config/global.mk index 5d88c76297..741c830e27 100644 --- a/harbour/config/global.mk +++ b/harbour/config/global.mk @@ -1890,7 +1890,7 @@ else # copied to install destination. ifneq ($(filter install,$(HB_MAKECMDGOALS)),) ifeq ($(HB_PLATFORM_UNIX),) - $(error ! Please set HB_INSTALL_PREFIX and try again. For more information: read INSTALL) + $(error ! Please set HB_INSTALL_PREFIX and try again. For more information: see README) endif endif endif diff --git a/harbour/config/postinst.hb b/harbour/config/postinst.hb index 3c4c42bbd5..ceffe90192 100644 --- a/harbour/config/postinst.hb +++ b/harbour/config/postinst.hb @@ -69,7 +69,7 @@ PROCEDURE Main( ... ) NEXT mk_hb_FCopy( "COPYING", tmp + hb_ps() ) - mk_hb_FCopy( "INSTALL", tmp + hb_ps() ) + mk_hb_FCopy( "README" , tmp + hb_ps() ) mk_hb_FCopy( "NEWS" , tmp + hb_ps() ) mk_hb_FCopy( "TODO" , tmp + hb_ps() ) ELSE diff --git a/harbour/contrib/hbmysql/readme.txt b/harbour/contrib/hbmysql/readme.txt index 791807d4e6..94fffee926 100644 --- a/harbour/contrib/hbmysql/readme.txt +++ b/harbour/contrib/hbmysql/readme.txt @@ -20,7 +20,7 @@ test.prg : a little test program which wont work for you :-) since it uses a provided. Use it as a small tutorial of tmysql.prg provided functions. -1) See INSTALL on how to obtain/install and configure Harbour build +1) See README on how to obtain/install and configure Harbour build system for mysql. 2) Add hbmysql.hbc to your hbmk2 command line (you can also try to diff --git a/harbour/doc/gmake.txt b/harbour/doc/gmake.txt index e89bfb19fc..ee10d4b55f 100644 --- a/harbour/doc/gmake.txt +++ b/harbour/doc/gmake.txt @@ -209,7 +209,7 @@ The most used targets are these: NOTES ===== -See INSTALL about details. +See README about details. You can build and/or run any program in tests/working by using hbmk2 diff --git a/harbour/doc/howtorep.txt b/harbour/doc/howtorep.txt index ab673c42e6..da86d7b5d1 100644 --- a/harbour/doc/howtorep.txt +++ b/harbour/doc/howtorep.txt @@ -19,7 +19,7 @@ Content ========================================================= by Viktor Szakats - 1) Read the Harbour INSTALL, monitor the development mailing list, + 1) Read the Harbour README, monitor the development mailing list, consult with the developers, make contributions. This way your chances are high to get a R/W access to the repository. 2) Before uploading anything you'll need Developer (R/W) status for the @@ -78,7 +78,7 @@ Important notes: placement. Add the new filename to the related makefiles. (*) There are some exceptions: ChangeLog.*, Makefile, COPYING, - TODO and INSTALL for example. + TODO and README for example. 1.3 Here's how to format your ChangeLog entries =============================================== diff --git a/harbour/package/mpkg_win.nsi b/harbour/package/mpkg_win.nsi index 9cf3a2504a..1e89434324 100644 --- a/harbour/package/mpkg_win.nsi +++ b/harbour/package/mpkg_win.nsi @@ -9,7 +9,7 @@ ; Harbour Nullsoft installer script (for Windows/MS-DOS) ; [ Do not try to use this script directly. It won't work. ] ; -; Please read INSTALL for further information. +; Please see README for further information. ; --------------------------------------------------------------- SetCompressor /solid lzma @@ -78,7 +78,7 @@ Section "Main components" hb_main SetOutPath $INSTDIR File /nonfatal "$%HB_INSTALL_PREFIX%\COPYING" - File /nonfatal "$%HB_INSTALL_PREFIX%\INSTALL" + File /nonfatal "$%HB_INSTALL_PREFIX%\README" File /nonfatal "$%HB_INSTALL_PREFIX%\NEWS" File /nonfatal "$%HB_INSTALL_PREFIX%\TODO" ; Let it work also for MS-DOS packages where short filename is used here diff --git a/harbour/package/winuni/RELNOTES b/harbour/package/winuni/RELNOTES index 962dc113e5..6593a28feb 100644 --- a/harbour/package/winuni/RELNOTES +++ b/harbour/package/winuni/RELNOTES @@ -5,7 +5,7 @@ releases are available for download on sourceforge.net: http://sourceforge.net/projects/harbour-project/files/ -Make sure to check INSTALL doc "QUICK START" section and visit +Make sure to check README doc "QUICK START" section and visit our user mailing list at: http://groups.google.com/group/harbour-users/ @@ -84,7 +84,7 @@ Changes since previous (2.0.0beta3 20090905) release: - hbnetio finalized. - hbqt cleanups and improvements, QT 4.6 support. - hbide (early development stage). -- Documentation enhancements: INSTALL and doc/xhb-diff.txt. +- Documentation enhancements: README and doc/xhb-diff.txt. - hbmk2 got support to convert xMate, hbmake and xbuild make files to .hbp format. - Added hbsms contrib library (to send SMS text messages in multiplatform way). @@ -186,7 +186,7 @@ Changes since previous (2.0.0beta1 20090609) release: - MS-DOS support tested and required fixes applied - embedded compilers moved to 'comp' subdir - support for latest MinGW x64 and MSVS 2010 compilers -- extended INSTALL with new examples and app build quick guide +- extended README with new examples and app build quick guide - icon for installer and hbrun tool - hbxbp and hbqt enhancements - hbwin refinements and better compatibility diff --git a/harbour/package/winuni/mpkg_win_uni.bat b/harbour/package/winuni/mpkg_win_uni.bat index 8d060a1278..091ea415c4 100644 --- a/harbour/package/winuni/mpkg_win_uni.bat +++ b/harbour/package/winuni/mpkg_win_uni.bat @@ -101,7 +101,7 @@ rem ; Create unified archive echo.> _hbfiles echo "%HB_DR%RELNOTES" >> _hbfiles -echo "%HB_DR%INSTALL" >> _hbfiles +echo "%HB_DR%README" >> _hbfiles echo "%HB_DR%COPYING" >> _hbfiles echo "%HB_DR%NEWS" >> _hbfiles echo "%HB_DR%TODO" >> _hbfiles diff --git a/harbour/package/winuni/mpkg_win_uni.nsi b/harbour/package/winuni/mpkg_win_uni.nsi index 4b8100a66b..eccba6ad19 100644 --- a/harbour/package/winuni/mpkg_win_uni.nsi +++ b/harbour/package/winuni/mpkg_win_uni.nsi @@ -84,7 +84,7 @@ Section "Main components" hb_main File /nonfatal "$%HB_ABSROOT%RELNOTES" - File /nonfatal "$%HB_ABSROOT%INSTALL" + File /nonfatal "$%HB_ABSROOT%README" File /nonfatal "$%HB_ABSROOT%COPYING" File /nonfatal "$%HB_ABSROOT%NEWS" File /nonfatal "$%HB_ABSROOT%TODO" diff --git a/harbour/tests/hbdoctst.prg b/harbour/tests/hbdoctst.prg index dfd2336b4a..58b1636df9 100644 --- a/harbour/tests/hbdoctst.prg +++ b/harbour/tests/hbdoctst.prg @@ -31,7 +31,7 @@ PROCEDURE Main( cRoot ) /* Detect Harbour root */ cRoot := "." + hb_ps() DO WHILE hb_DirExists( cRoot + ".." ) - IF hb_FileExists( cRoot + "INSTALL" ) .AND. ; + IF hb_FileExists( cRoot + "README" ) .AND. ; hb_FileExists( cRoot + "COPYING" ) .AND. ; hb_DirExists( cRoot + "config" ) EXIT diff --git a/harbour/website/menu/harbour-menu.js b/harbour/website/menu/harbour-menu.js index 464184450a..76dc89cb94 100644 --- a/harbour/website/menu/harbour-menu.js +++ b/harbour/website/menu/harbour-menu.js @@ -11,7 +11,7 @@ stm_ep(); stm_aix("p0i4","p0i2",[]); stm_aix("p0i5","p0i1",[2,"","documentation.png","documentation.png",90,65,0,"doc/harbour.html","_self","","","","",0,0,0,"","",-1,-1,0,0,1,"#E6EFF9",1,"#FFD602"]); stm_bpx("p2","p1",[1,4,0,-3,3,0,0,0,100,"",-2,"",-2,50,0,0,"#CCCCCC"]); -stm_aix("p2i0","p1i0",[0," Basic information (INSTALL) ","","",-1,-1,0,"http://harbour-project.svn.sourceforge.net/svnroot/harbour-project/trunk/harbour/INSTALL"]); +stm_aix("p2i0","p1i0",[0," Basic information (README) ","","",-1,-1,0,"http://harbour-project.svn.sourceforge.net/svnroot/harbour-project/trunk/harbour/README"]); stm_aix("p2i1","p1i0",[0," ChangeLog ","","",-1,-1,0,"http://harbour-project.svn.sourceforge.net/svnroot/harbour-project/trunk/harbour/ChangeLog"]); stm_aix("p2i2","p1i0",[0," Clipper 5.3 ","","",-1,-1,0,"http://x-hacker.org/ng/53guide/"]); stm_aix("p2i3","p1i0",[0," Harbour ","","",-1,-1,0,"doc/harbour.html"]); diff --git a/harbour/website/news.html b/harbour/website/news.html index 8eb25f290c..8aa5037987 100644 --- a/harbour/website/news.html +++ b/harbour/website/news.html @@ -198,7 +198,7 @@ options and readable name were lost along the migration.
  • Added support for Intel(R) C++ compiler (icc) on Linux and Windows.
    • -
  • Added new INSTALL document giving a quick describing of the build +
  • Added new README document giving a quick describing of the build process on all supported platforms and compilers.
  • Several steps to make the build process simpler and requiring the @@ -213,7 +213,7 @@ options and readable name were lost along the migration.
  • Added ability to generate Windows installer and .zip distribution file.
  • Fully transitioned to GNU Make system for all compilers.
    - Now msvc, msvcce and bcc builds need GNU Make, see INSTALL for more + Now msvc, msvcce and bcc builds need GNU Make, see README for more information. "non-GNU" make systems got deleted from the source tree.
  • Cygwin renamed from gcc to cygwin. (NOTE: Cygwin doesn't work since some versions, and support may be removed in the future.)