diff --git a/harbour/ChangeLog b/harbour/ChangeLog.txt similarity index 99% rename from harbour/ChangeLog rename to harbour/ChangeLog.txt index 152cdbf027..6522a6f17f 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog.txt @@ -10,6 +10,37 @@ * Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment */ +2012-11-27 14:38 UTC+0100 Viktor Szakats (harbour syenar.net) + - ChangeLog + + ChangeLog.txt + * bin/commit.hb + * doc/howtorel.txt + * doc/howtorep.txt + * package/harbour.spec + * package/winuni/mpkg_win_uni.bat + * package/winuni/mpkg_win_uni.nsi + * package/winuni/RELNOTES.txt + * README.txt + * src/pp/hbpp.c + * tests/fixcase.hb + * website/changelog.html + * website/index.html + * website/news.html + * website/news1.html + * website/snapshot.html + * renamed ChangeLog to ChangeLog.txt + ; TODO: Please update SVN URL references in google groups web headers: + .../ChangeLog -> .../ChangeLog.txt + .../README -> .../README.txt + ; NOTE: Also update your local scripts to use ChangeLog.txt instead + of ChangeLog. Or use bin/hbcommit.hb script, which supports + both. + + - w64-make.exe + * README.txt + % deleted. it was my private build and it didn't offer + much over win-make.exe. + 2012-11-27 14:21 UTC+0100 Viktor Szakats (harbour syenar.net) * doc/howtorep.txt * minor correction to prev diff --git a/harbour/README.txt b/harbour/README.txt index 92969a04a5..f560e7d859 100644 --- a/harbour/README.txt +++ b/harbour/README.txt @@ -1284,7 +1284,7 @@ TABLE OF CONTENT WARNING: Recommended for users contributing to Harbour development, following the development mailing list, commits and reading - ChangeLog. + ChangeLog.txt. 1.) Harbour live source repository @@ -1758,7 +1758,7 @@ TABLE OF CONTENT http://sourceforge.net/projects/mingw/files/MinGW/Extension/make/make-3.82-mingw32/make-3.82-5-mingw32-bin.tar.lzma/download http://sourceforge.net/projects/mingw/files/MinGW/Extension/make/make-3.82-mingw32/make-3.82-5-mingw32-src.tar.lzma/download cvs -z3 -d:pserver:anonymous@cvs.savannah.gnu.org:/sources/make co make - (included in Harbour as win-make.exe and w64-make.exe) + (included in Harbour as win-make.exe) MS-DOS binary + source: ftp://ftp.delorie.com/pub/djgpp/beta/v2gnu/ ftp://ftp.delorie.com/pub/djgpp/beta/v2gnu/mak381b.zip @@ -1865,7 +1865,7 @@ TABLE OF CONTENT Comparing Harbour to xHarbour: http://harbour-project.svn.sourceforge.net/svnroot/harbour-project/trunk/harbour/doc/xhb-diff.txt ChangeLog: - http://harbour-project.svn.sourceforge.net/svnroot/harbour-project/trunk/harbour/ChangeLog + http://harbour-project.svn.sourceforge.net/svnroot/harbour-project/trunk/harbour/ChangeLog.txt [ Copyright (c) 2009-2012 Viktor Szakats (harbour syenar.net) diff --git a/harbour/bin/commit.hb b/harbour/bin/commit.hb index bf835a75b3..294ea9edac 100644 --- a/harbour/bin/commit.hb +++ b/harbour/bin/commit.hb @@ -46,6 +46,7 @@ PROCEDURE Main() LOCAL nPos LOCAL cMyName LOCAL cOldLang + LOCAL cLogName IF Empty( aChanges ) OutStd( hb_ProgName() + ": no changes" + hb_eol() ) @@ -77,7 +78,14 @@ PROCEDURE Main() // ; - cLog := MemoRead( "ChangeLog" ) + IF ! hb_FileExists( cLogName := "ChangeLog.txt" ) + IF ! hb_FileExists( cLogName := "ChangeLog" ) + OutStd( hb_ProgName() + ": can't find ChangeLog file" + hb_eol() ) + RETURN + ENDIF + ENDIF + + cLog := MemoRead( cLogName ) cOldLang := hb_cdpSelect( "EN" ) cHit := hb_AtX( "\n[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9] [0-9][0-9]:[0-9][0-9] UTC[\-+][0-9][0-9][0-9][0-9] ", cLog ) IF Empty( cHit ) @@ -92,7 +100,7 @@ PROCEDURE Main() cLog += hb_eol() + cLogNew ENDIF - hb_MemoWrit( "ChangeLog", cLog ) + hb_MemoWrit( cLogName, cLog ) RETURN diff --git a/harbour/doc/howtorel.txt b/harbour/doc/howtorel.txt index a0480ae971..c5ea0501fd 100644 --- a/harbour/doc/howtorel.txt +++ b/harbour/doc/howtorel.txt @@ -20,8 +20,8 @@ By Przemyslaw Czerpak (druzus/at/priv.onet.pl) 3. Set proper release date in NEWS (found as doc/oldnews.txt) and if necessary update release informations. Also add the exact tag name to this file, for example "tag: build46". -4. Update ChangeLog file and commit your modifications. -5. Update hbver.h with ChangeLog file ID and your last entry ID. +4. Update ChangeLog.txt and commit your modifications. +5. Update hbver.h with ChangeLog.txt file ID and your last entry ID. 6. Tag the CVS tree with the new release tag: cvs tag -t -F -D for example: diff --git a/harbour/doc/howtorep.txt b/harbour/doc/howtorep.txt index 65765c7c4a..c0ed803829 100644 --- a/harbour/doc/howtorep.txt +++ b/harbour/doc/howtorep.txt @@ -33,18 +33,18 @@ by Viktor Szakats ======================================================= by Viktor Szakats - 1) Do the changes in the source, and in parallel modify ChangeLog + 1) Do the changes in the source, and in parallel modify ChangeLog.txt 2) Go online (if needed) 3) svn update 4) Resolve all conflicts - 5) Copy the last ChangeLog entry to the clipboard + 5) Copy the last ChangeLog.txt entry to the clipboard 6) svn commit --editor-cmd notepad.exe --username sfuser Change notepad.exe to the editor of your choice and platform. Change "sfuser" to your sf.net username. 7) The SVN pops up a window with the changed filenames - 8) Check if all the changed filenames are referred in the ChangeLog entry, + 8) Check if all the changed filenames are referred in the ChangeLog.txt entry, if not, make the corrections and start again - 9) Paste the ChangeLog entry header to the SVN window, save, exit + 9) Paste the ChangeLog.txt entry header to the SVN window, save, exit 10) SVN is now uploading, if there are any errors, make the corrections and start again 11) Always check if the upload session ended without errors. @@ -61,16 +61,16 @@ by Ryszard Glab 4) Run 'svn status' redirecting the output into a file (for example: "svn status >.log" 5) Copy all names of modifed, added or deleted files (files marked with - 'M', 'A' or 'D' flag) from update log into a ChangeLog - 6) Write necessary comments in the ChangeLog - 7) Save all your changes from ChangeLog into a file + 'M', 'A' or 'D' flag) from update log into the ChangeLog.txt + 6) Write necessary comments in the ChangeLog.txt + 7) Save all your changes from ChangeLog.txt into a file 8) Run 'svn update' again 9) Commit changes running: svn commit -F file_with_saved_ChangeLog_changes --username sfuser Important notes: - 1) *Always* add a ChangeLog entry when committing to the SVN. + 1) *Always* add a ChangeLog.txt entry when committing to the SVN. 2) When adding a new file to the SVN, always use lower case 8.3 filenames (*), add a SVN ID header to the file, don't use tabs in the file, end the file with a newline char. @@ -80,11 +80,11 @@ Important notes: (*) There are some exceptions: ChangeLog.*, Makefile, COPYING.txt, README.txt. -1.3 Here's how to format your ChangeLog entries -=============================================== +1.3 Here's how to format your ChangeLog.txt entries +=================================================== by Viktor Szakats -- Always add new entries to the top of the ChangeLog file. +- Always add new entries to the top of the ChangeLog.txt - Add an entry header using this format: YYYY-MM-DD HH:MM UTC[-|+]hhmm Your Full Name @@ -159,17 +159,18 @@ by David G. Holm to a file and look at the results to confirm that you are ready to do a commit. Any files marked M, A or D are files that you have modified or are adding or deleting. Confirm that you have comments for all of - them in your ChangeLog entry. If you see many modules marked P or U, + them in your ChangeLog.txt entry. If you see many modules marked P or U, then you need to recompile and retest before you commit your changes. If you see any conflicts reported in the update output, then you need to resolve them before committing. SVN is generally good at merging changes, so you probably won't see conflicts very often, but if you - edit the ChangeLog file before you run 'svn update' and other changes - have been committed by others, then ChangeLog will have conflicts. To - resolve those conflicts, simply remove the conflict markers. What I do - to avoid conflicts to ChangeLog is to record my changes in changes.txt - and then copy them into ChangeLog between the update and the commit. + edit the ChangeLog.txt before you run 'svn update' and other changes + have been committed by others, then ChangeLog.txt will have conflicts. + To resolve those conflicts, simply remove the conflict markers. What + I do to avoid conflicts to ChangeLog.txt is to record my changes in + changes.txt and then copy them into ChangeLog.txt between the update + and the commit. 1.6 How to add SVN ID to new files ================================== diff --git a/harbour/package/harbour.spec b/harbour/package/harbour.spec index a92485c7aa..e59f4e7500 100644 --- a/harbour/package/harbour.spec +++ b/harbour/package/harbour.spec @@ -690,7 +690,7 @@ rm -rf $RPM_BUILD_ROOT * Mon Jul 31 2000 Dave Pearson - Re-worked the layout of the spec file to make it cleaner and easier to read and maintain. -- The latest harbour ChangeLog is now installed into the RPM's doc +- The latest harbour ChangeLog.txt is now installed into the RPM's doc directory. - The content of the RPM's doc directory reflects the layout and content of the harbour source's doc directory. diff --git a/harbour/package/winuni/RELNOTES.txt b/harbour/package/winuni/RELNOTES.txt index 106176cd19..26f646e75d 100644 --- a/harbour/package/winuni/RELNOTES.txt +++ b/harbour/package/winuni/RELNOTES.txt @@ -141,7 +141,7 @@ Changes since previous (2.0.0beta3 20090905) release: - Deleted hbmake from examples. - Many other smaller improvements, additions, fixes, cleanups. - For 3rd party developers it's recommended to look for the word - "incompatibility" in ChangeLog to find spots which may imply changes + "incompatibility" in ChangeLog.txt to find spots which may imply changes on their part. Changes since previous (2.0.0beta2 20090624) release: @@ -197,7 +197,7 @@ Changes since previous (2.0.0beta1 20090609) release: - MinGW64 updated to 4.4.1 - There were a few changes in this release which may require updating your source code (hb_par*()/hb_stor*() in .c files and GTWVG WIN_*() - function in .prg files). Search for 'incompatible' word in ChangeLog + function in .prg files). Search for 'incompatible' word in ChangeLog.txt for more. ----------------------------------------------------------------------- diff --git a/harbour/package/winuni/mpkg_win_uni.bat b/harbour/package/winuni/mpkg_win_uni.bat index 4bb52bd7f4..0e04691ace 100644 --- a/harbour/package/winuni/mpkg_win_uni.bat +++ b/harbour/package/winuni/mpkg_win_uni.bat @@ -103,7 +103,7 @@ echo.> _hbfiles echo "%HB_DR%RELNOTES.txt" >> _hbfiles echo "%HB_DR%README.txt" >> _hbfiles echo "%HB_DR%COPYING.txt" >> _hbfiles -echo "%HB_DR%ChangeLog*" >> _hbfiles +echo "%HB_DR%ChangeLog*.txt" >> _hbfiles echo "%HB_DR%bin\*-%HB_VS%.dll" >> _hbfiles echo "%HB_DR%bin\harbour.exe" >> _hbfiles echo "%HB_DR%bin\hbformat.exe" >> _hbfiles diff --git a/harbour/package/winuni/mpkg_win_uni.nsi b/harbour/package/winuni/mpkg_win_uni.nsi index e60bdb6b62..6cac8da2a7 100644 --- a/harbour/package/winuni/mpkg_win_uni.nsi +++ b/harbour/package/winuni/mpkg_win_uni.nsi @@ -86,7 +86,7 @@ Section "Main components" hb_main File /nonfatal "$%HB_ABSROOT%README.txt" File /nonfatal "$%HB_ABSROOT%COPYING.txt" - File /nonfatal "$%HB_ABSROOT%ChangeLog*" + File /nonfatal "$%HB_ABSROOT%ChangeLog.txt*" SetOutPath $INSTDIR\bin File "$%HB_ABSROOT%bin\*-$%HB_VS%.dll" diff --git a/harbour/src/pp/hbpp.c b/harbour/src/pp/hbpp.c index d1d5c5243e..d8a926a550 100644 --- a/harbour/src/pp/hbpp.c +++ b/harbour/src/pp/hbpp.c @@ -454,13 +454,13 @@ static int hb_pp_parseChangelog( PHB_PP_STATE pState, const char * pszFileName, if( ! pFileName->szName ) { static const char * s_szNames[] = { - "ChangeLog", - "CHANGES", + "ChangeLog.txt", + "CHANGES.txt", #if defined( HB_OS_DOS ) - "ChangeLo", - "Change~1", - "Change~?", - "Chang~??", + "ChangeLo.txt", + "Change~1.txt", + "Change~?.txt", + "Chang~??.txt", #endif NULL }; diff --git a/harbour/tests/fixcase.hb b/harbour/tests/fixcase.hb index 9165d6cdb3..5fe8e5a4da 100644 --- a/harbour/tests/fixcase.hb +++ b/harbour/tests/fixcase.hb @@ -64,27 +64,27 @@ PROCEDURE Main() ".tif" => NIL } LOCAL hFileExceptions := { ; - "ChangeLog" => NIL, ; - "std.ch" => NIL, ; - "wcecon.prg" => NIL, ; - "uc16_gen.prg" => NIL, ; - "clsscope.prg" => NIL, ; - "speedstr.prg" => NIL, ; - "cpinfo.prg" => NIL, ; - "clsccast.prg" => NIL, ; - "clsicast.prg" => NIL, ; - "clsscast.prg" => NIL, ; - "big5_gen.prg" => NIL, ; - "foreach2.prg" => NIL, ; - "speedtst.prg" => NIL, ; - "keywords.prg" => NIL, ; - "xhb-diff.txt" => NIL, ; - "pp.txt" => NIL, ; - "locks.txt" => NIL, ; - "oldnews.txt" => NIL, ; - "c_std.txt" => NIL, ; - "tracing.txt" => NIL, ; - "pcode.txt" => NIL } + "ChangeLog.txt" => NIL, ; + "std.ch" => NIL, ; + "wcecon.prg" => NIL, ; + "uc16_gen.prg" => NIL, ; + "clsscope.prg" => NIL, ; + "speedstr.prg" => NIL, ; + "cpinfo.prg" => NIL, ; + "clsccast.prg" => NIL, ; + "clsicast.prg" => NIL, ; + "clsscast.prg" => NIL, ; + "big5_gen.prg" => NIL, ; + "foreach2.prg" => NIL, ; + "speedtst.prg" => NIL, ; + "keywords.prg" => NIL, ; + "xhb-diff.txt" => NIL, ; + "pp.txt" => NIL, ; + "locks.txt" => NIL, ; + "oldnews.txt" => NIL, ; + "c_std.txt" => NIL, ; + "tracing.txt" => NIL, ; + "pcode.txt" => NIL } LOCAL aMaskExceptions := { ; "contrib/xhb/thtm.prg" , ; diff --git a/harbour/w64-make.exe b/harbour/w64-make.exe deleted file mode 100644 index ca8108ab0d..0000000000 Binary files a/harbour/w64-make.exe and /dev/null differ diff --git a/harbour/website/changelog.html b/harbour/website/changelog.html index b75c2ae90d..fec6500d56 100644 --- a/harbour/website/changelog.html +++ b/harbour/website/changelog.html @@ -2,7 +2,7 @@ -Harbour Project - Changelog +Harbour Project - ChangeLog @@ -38,14 +38,14 @@ - + - + http://harbour-project.svn.sourceforge.net/svnroot/harbour-project/trunk/harbour/ChangeLog.txt
 ChangelogChangeLog  
 Through the ChangeLog you can give a list of amendments that were added to the repository project. This list is updated frequently by developers and is available at:
+ 		Through the ChangeLog.txt you can give a list of amendments that were added to the repository project. This list is updated frequently by developers and is available at:

- http://harbour-project.svn.sourceforge.net/svnroot/harbour-project/trunk/harbour/ChangeLog		  
diff --git a/harbour/website/index.html b/harbour/website/index.html index 7d781a0ca2..6d658be219 100644 --- a/harbour/website/index.html +++ b/harbour/website/index.html @@ -222,7 +222,7 @@ Harbour is a cross-platform compiler and is known to compile and run on MS-DOS,     - In 2010 July with few days of development effort, Harbour has been ported successfully to VxWorks 6.8 Real-Time Operating System (x86 CPU target for now) for both GNU GCC and Wind River C Compiler. Many thanks to Wind River Inc. for making their development package available to our open source compiler project. This means now Harbour can run on cars, planes, rockets and robots. :) See more about the technical details in ChangeLog entry '2010-07-16 18:22 UTC+0200 Viktor Szakats' here
+ In 2010 July with few days of development effort, Harbour has been ported successfully to VxWorks 6.8 Real-Time Operating System (x86 CPU target for now) for both GNU GCC and Wind River C Compiler. Many thanks to Wind River Inc. for making their development package available to our open source compiler project. This means now Harbour can run on cars, planes, rockets and robots. :) See more about the technical details in ChangeLog.txt entry '2010-07-16 18:22 UTC+0200 Viktor Szakats' here
  diff --git a/harbour/website/news.html b/harbour/website/news.html index eeb42161c5..80af0555ed 100644 --- a/harbour/website/news.html +++ b/harbour/website/news.html @@ -62,7 +62,7 @@ ul {   - This page gives you some of the main changes introduced in recent versions of Harbour project. To view the latest ChangeLog click here or download lastest stable release of Harbour here. + This page gives you some of the main changes introduced in recent versions of Harbour project. To view the latest ChangeLog.txt click here or download lastest stable release of Harbour here.   diff --git a/harbour/website/news1.html b/harbour/website/news1.html index 2387d79859..1ab90f0c19 100644 --- a/harbour/website/news1.html +++ b/harbour/website/news1.html @@ -62,7 +62,7 @@ ul {   - This page gives you some of the main changes introduced in recent versions of Harbour project. To view the latest ChangeLog click here or download lastest stable release of Harbour here. + This page gives you some of the main changes introduced in recent versions of Harbour project. To view the latest ChangeLog.txt click here or download lastest stable release of Harbour here.   @@ -625,7 +625,7 @@ ul {
  • cleaned many memory leaks in Compiler
  • added separated compiler library which can be linked with VM and RTL libraries
  • cleaned some possible bad side effects in cross references
    • -
  • many other fixes, improvements and extensions - see ChangeLog for details
    • +
  • many other fixes, improvements and extensions - see ChangeLog.txt for details
    •   diff --git a/harbour/website/snapshot.html b/harbour/website/snapshot.html index 4cbdf606d4..37610eef9b 100644 --- a/harbour/website/snapshot.html +++ b/harbour/website/snapshot.html @@ -49,7 +49,7 @@
    If you do encounter a bug, please test the latest snapshot build to see if it has already been fixed by a developer.

    - To see what developers have added, you can view the ChangeLog directly from the source repository. + To see what developers have added, you can view the ChangeLog.txt directly from the source repository.