Check first, then push

Do NOT disable debug output in default makefile, we had LOTs of trouble with it

diff --git a/release-howto.txt b/release-howto.txt
index 32bc9e4..a85ce30 100644 (file)
--- a/release-howto.txt
+++ b/release-howto.txt
@@ -5,19 +5,21 @@ cheat sheet for making a (stable) release tarball.
 
 1. clone a fresh tree:
 
 
 1. clone a fresh tree:
 

-   $ hg clone http://gredler.at/hg/olsrd-0.5.7
-   $ hg update -C OLSRD_0_5_7_BRANCH
+   $ hg clone http://gredler.at/hg/olsrd-0.5.6
+   $ hg update -C OLSRD_0_5_6_BRANCH

 
 2. check if the DEBUG settings in Makefile.inc are correct:
 
 
 2. check if the DEBUG settings in Makefile.inc are correct:
 

-   DEBUG ?= 0
-   NO_DEBUG_MESSAGES ?= 1
+   DEBUG ?= 1
+   NO_DEBUG_MESSAGES ?= 0

 
    now check if it builds correct:
 
 
    now check if it builds correct:
 

-   $ make build_all
+   $ make uberclean build_all

 
 

-3. Change VERS in Makefile.inc to your target release.
+3. Update the changelog
+
+4. Change VERS in Makefile.inc to your target release.

    in this example the target release is 0.5.6-r5
 
    most likely this is carrying some pre-XXX-release tag.
    in this example the target release is 0.5.6-r5
 
    most likely this is carrying some pre-XXX-release tag.


@@ -29,10 +31,23 @@ cheat sheet for making a (stable) release tarball.
 
    VERS =          0.5.6-r5
 
 
    VERS =          0.5.6-r5
 

-4. commit & push
+5. commit
+
+6. make the release tarball
+
+   $ cd scripts/
+   $ ./mk-tarball.sh
+   [ ... ]
+   ### creating /tmp/olsrd-0.5.6-r5.tar.gz
+   6c996e94de06115d19dbbcaf6847051a  /tmp/olsrd-0.5.6-r5.tar.gz
+   ### creating /tmp/olsrd-0.5.6-r5.tar.bz2
+   e476819be5747758e3d6f579e4096bce  /tmp/olsrd-0.5.6-r5.tar.bz2
+
+7. check if everything is in the release tarball (ideally on a a
+   differnt machine) and try to build from the tarball.
+
+8. display the used tags:

 
 

-5. display the used tags: 
-   

    $ hg tags
    tip                             1757:77e1ccb98227
    OLSRD_0_5_6_R3                  1728:feb3d7883ff0
    $ hg tags
    tip                             1757:77e1ccb98227
    OLSRD_0_5_6_R3                  1728:feb3d7883ff0


@@ -60,23 +75,12 @@ cheat sheet for making a (stable) release tarball.
 
    $ hg tag OLSRD_0_5_6_R5
 
 
    $ hg tag OLSRD_0_5_6_R5
 

-6. make the release tarball
-
-   $ cd scripts/
-   $ ./mk-tarball.sh
-   [ ... ]
-   ### creating /tmp/olsrd-0.5.6-r5.tar.gz
-   6c996e94de06115d19dbbcaf6847051a  /tmp/olsrd-0.5.6-r5.tar.gz
-   ### creating /tmp/olsrd-0.5.6-r5.tar.bz2
-   e476819be5747758e3d6f579e4096bce  /tmp/olsrd-0.5.6-r5.tar.bz2
-
-7. check if everything is in the release tarball (ideally on a a
-   differnt machine) and try to build from the tarball.
+9. push

 
 

-8. upload the the .tgz and .bz2 tarballs to the http://www.olsr.org/downaload/0.5/
+10. upload the the .tgz and .bz2 tarballs to the http://www.olsr.org/downaload/0.5/

    sectaion and add a release articel on the web.
 
    sectaion and add a release articel on the web.
 

-9. Change VERS in Makefile.inc to your *next* target release.
+11. Change VERS in Makefile.inc to your *next* target release.

    in this example the next target release is pre-0.5.6-r6
 
    change it from:
    in this example the next target release is pre-0.5.6-r6
 
    change it from: