diff --git a/ChangeLog.txt b/ChangeLog.txt index 452073ce60..b894284a40 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -10,6 +10,16 @@ * Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment */ +2013-04-08 02:12 UTC+0200 Viktor Szakats (harbour syenar.net) + * config/postinst.hb + * minor + + * doc/howtorep.txt + * README.md + ! updated link to hbmk2 doc + * updated steps for committing to emphasis in bin/commit + script than trying to describe some of the rules + 2013-04-08 00:58 UTC+0200 Viktor Szakats (harbour syenar.net) * bin/commit.hb + do not overwrite clipboard content if it already diff --git a/README.md b/README.md index b9e7071b97..9ee8988ff5 100644 --- a/README.md +++ b/README.md @@ -53,12 +53,13 @@ There are several ways to help making Harbour better: - Submit a change: 1. Fork Harbour 2. Create a branch: `git checkout -b my_mod` - 3. Commit your changes: `git commit -am "Added my feature"` - 4. Push to the branch: `git push origin my_mod` - 5. Open a Pull Request + 3. Do commit pre-check and new log entry: `hbrun bin/commit` + 4. Commit your changes: `git commit -am "Added my feature"` + 5. Push to the branch: `git push origin my_mod` + 6. Open a Pull Request - Always use the same coding/formatting style as you find in - the files you're patching. The easiest way to achieve this - is to use these commands to format your sources: + the files you're modifying. The easiest way to achieve this + is to use these commands to format the sources: $ uncrustify -c /bin/harbour.ucf $ /bin/hbformat @@ -112,7 +113,7 @@ Download source archive from this page and unpack: You'll need Git version control software installed on your system, and issue this command: - git clone https://github.com/harbour/core.git harbour + git clone https://github.com/harbour/core.git harbour-core You can get subsequent updates using this command: @@ -1341,7 +1342,7 @@ For all platforms you'll need two things: Use hbmk2 to build your app from source. It's recommended to put it in the PATH (f.e. by using `set PATH=C:\harbour\bin;%PATH%` on Windows). -See hbmk2 [documentation, with examples](utils/hbmk2/hbmk2.md). +See hbmk2 [documentation, with examples](utils/hbmk2/doc/hbmk2.en.md). # Debugging Options diff --git a/config/postinst.hb b/config/postinst.hb index 2ace56a6b8..b01e0e2a4c 100644 --- a/config/postinst.hb +++ b/config/postinst.hb @@ -80,8 +80,8 @@ PROCEDURE Main( ... ) /* public Harbour scripts */ FOR EACH tmp IN { ; "bin/3rdpatch.hb", ; - "bin/commit.hb", ; "bin/check.hb", ; + "bin/commit.hb", ; "bin/harbour.ucf" } mk_hb_FCopy( tmp, GetEnvC( "HB_INSTALL_BIN" ) + hb_ps() ) NEXT diff --git a/doc/howtorep.txt b/doc/howtorep.txt index 88d581ba93..7ac432be64 100644 --- a/doc/howtorep.txt +++ b/doc/howtorep.txt @@ -31,8 +31,8 @@ by Viktor Szakats 1) Make the changes in the source 2) Do a 'git pull' 3) Resolve any conflicts - 4) Run 'hbrun bin/commit' to create new ChangeLog.txt entry - with timestamp and list of modified files + 4) Run 'hbrun bin/commit' to check any commit pre-checks + and to create new ChangeLog.txt entry template 5) Edit ChangeLog.txt with a text editor (do not use notepad.exe) 6) Copy the last ChangeLog.txt entry to the clipboard If it's a single atomic change, it's better to copy only @@ -45,13 +45,6 @@ by Viktor Szakats 11) Do a 'git push' to publish your changes online to the master repository -Important notes: - - 1) *Always* add a ChangeLog.txt entry when committing. - 2) When adding a new file to the repository, always use lower case 8.3 - filenames, do not use tabs, trailing spaces, BOM and EOF markers - in the file, end the file with a newline. - 1.3 Here's how to format your ChangeLog.txt entries =================================================== by Viktor Szakats @@ -73,13 +66,10 @@ by Viktor Szakats - Leave an empty line after the body. -- Do not use tabs, trailing spaces, BOM and EOF markers - in the file, end the file with a newline. - 1.4 Here's how to use the Git server in read-only mode ====================================================== - git clone git://github.com/harbour/core.git harbour + git clone git://github.com/harbour/core.git harbour-core 1.5 Things to do to avoid damaging the Git repository =====================================================