Changeset 49061

Show
Ignore:
Timestamp:
08/23/06 14:38:41 (2 years ago)
Author:
bdelbosc
Message:

setting up svn:keywords

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • tools/bundleman/trunk/INSTALL.txt

    • Property svn:keywords set to Id

  • tools/bundleman/trunk/LICENSE.txt

    • Property svn:keywords set to Id

  • tools/bundleman/trunk/Makefile

    • Property svn:keywords set to Id
    r49032 r49061  
    11# FunkLoad Makefile 
    2 # $Id: $ 
     2# $Id$ 
    33# 
    44.PHONY: build clean 

  • tools/bundleman/trunk/README.txt

    • Property svn:keywords set to Id
    r49032 r49061  
    3232    ... 
    3333 
    34 products can be in an other svn tree. 
     34Products can be in differents svn trees. 
    3535 
    3636Product files 
    …… 
    4545bm-product-init 
    4646--------------- 
    47 Add version and changes file to the product svn. 
     47Check that the working copy path point to a trunk url. 
     48Check that we have a tags and branches folder. 
     49If missing prompt user to add VERSION, CHANGES and HISTORY files 
     50to the product working copy and commit them, 
     51 
    4852 
    4953bm-product-package 
    5054------------------ 
    51 Create a package: 
     55Create a package. 
    5256 
    5357* Analyse the working copy: 
    54   - check that the working copy use the same revision 
    55   - parse the changes and compute the new version 
    56 * Tag the current co into products/ProdA/tags/2.0.3 
    57 * Create a branch products/ProdA/branches/release-2.0.3 
     58  - Checks that the working copy use the same revision 
     59  - Parses the CHANGES file and computes the new version 
     60  - If CHANGES is empty checks the that there is no diff between the current 
     61    revision and the tagged version. 
     62* Tag the current working copy revision into products/ProdA/tags/2.0.3 
     63* Flush CHANGES into HISTORY, update VERSION commit in the tags/2.0.3, 
     64  then merge back to the working copy. 
    5865* (optional) create a tgz 
    5966 
    6067Versioning depend on the svn path 
    61 * the product is in products/ProdA/trunk (version 2.0.2) 
    62   changes contains only bug fixes 
    63   tag url is: products/ProdA/tags/2.0.3 
    64   branch url is: products/ProdA/branches/release-2.0.3 
     68* the product svn url is a trunk like products/ProdA/trunk, 
     69  VERSION file contains 2.0.2: 
     70  - if CHANGES contains only bug fixes: tag url is: products/ProdA/tags/2.0.3 
     71  - if CHANGES contains any requires, features or internal features, 
     72  the version will be 2.1.0 
    6573 
    66 * the product is a vendor branch or a tag 
    67   (products/ProdB/tags/1.5.0 or vendor/something) 
    68   no changes can be done here we keep the tag 
     74* the product is a vendor branch or a tag like products/ProdB/tags/1.5.0 or 
     75  vendor/something, no changes can be done here. 
    6976  tag url = svn url 
    7077 
    71 * the product is a user branch like 
     78* the product is a user branch or a release branch like 
    7279  products/Products/ProdC/branches/user-refactor 
    73   the current version is 2.0.2, only bug fixes in the CHANGES 
    74   the new version is 2.0.3-user-refactor 
     80  or products/Products/ProdB/branches/2.0.2-r20060821-05 
     81  VERSION contains 2.0.2, 
     82  CHANGES contains only bug fixes the new version is 2.0.3-$BRANCH-NAME 
    7583  tag url is: products/ProdC/tags/2.0.3-user-refactor 
    76   branch is: products/ProdC/branches/release-2.0.3-user-refactor 
     84          or: products/ProdB/tags/2.0.3-r20060821-05 
    7785 
    78 * the product is a release branch, your are patching a release 
    79   products/Products/ProdA/branches/release-2.0.3 
    80   whatever the CHANGES file contains we just increment the release number 
    81   so we move from 2.0.3-1 to 2.0.3-2 
    82   tag url is the same:products/Products/ProdA/tags/2.0.3 
    83   branch url is the same: products/Products/ProdA/branches/release-2.0.3 
     86 
     87 
     88 
     89bm-bundle-branch TAG 
     90-------------------- 
     91Create an svn branch from a tag TAG: 
     92 
     93vendor/something -> vendor/something 
     94products/ProdA/tags/2.0.3 -> products/ProdA/branch/ 
     95products/ProdC/tags/2.0.3-user-refactor 
     96products/ProdD/tags/ 
     97 
     98 
     99 
     100the branch path depends on the tag: 
     101 
     102 
     103 
    84104 
    85105bm-bundle-init 

  • tools/bundleman/trunk/TODO.txt

    • Property svn:keywords set to Id
    r49047 r49061  
    22TODO BundleMan 
    33============== 
    4 $Id: $ 
     4$Id$ 
    55 
    6 * testing use cases 
     6* testing branch use cases 
     7 
     8* check that there is no modified file before packaging ? 
     9 
     10* branch release_tag 
     11 
     12  tags/1.0.3 -> branch/hash(release_tag) 
     13 
     14* bm-bundle-package 
     15 
     16 - package a product from a branch 
     17   - tag ok 
     18   - VERSION ok ? 
     19   - if no changes -> missing TAG instead of reuse TAG in trunk 
     20 
     21   use hash instead of tag -> remove the 0.2.0-CPSrc1 in a rc2 
    722 
    823* bm-product-package building tar.gz 
     24  build a MANIFEST with md5 -> bm-bundle-check 
    925 
    10 * bm-product-init ask for confirmation 
     26* bm-bundle-init 
     27  - commit a svn:externals file 
    1128 
    12 * bm-bundle-package 
    13    - create tags and branch on success 
    14  
    15 * bm-bundle-init  
    16    - use svn:externals file ? 
    17  
    18 * bundleman: createTag createBranch 
    19  

  • tools/bundleman/trunk/bundleman/Makefile

    • Property svn:keywords set to Id
    r49032 r49061  
    11# BundleMan Makefile 
    2 # $Id: $ 
     2# $Id$ 
    33# 
    44.PHONY: clean 

  • tools/bundleman/trunk/bundleman/__init__.py

    • Property svn:keywords set to Id
    r49032 r49061  
    1919"""BundleMan package init. 
    2020 
    21 $Id: __init__.py 24649 2005-08-29 14:20:19Z bdelbosc $ 
     21$Id$ 
    2222""" 

  • tools/bundleman/trunk/bundleman/bundleman.py

    • Property svn:keywords set to Id
    r49053 r49061  
    1919"""Bundle Manager 
    2020 
    21 $Id: __init__.py 24649 2005-08-29 14:20:19Z bdelbosc $ 
     21$Id$ 
    2222""" 
    2323import sys 

  • tools/bundleman/trunk/bundleman/productman.py

    • Property svn:keywords set to Id
    r49057 r49061  
    1919"""Product Manager. 
    2020 
    21 $Id: __init__.py 24649 2005-08-29 14:20:19Z bdelbosc $ 
     21$Id$ 
    2222""" 
    2323import sys 

  • tools/bundleman/trunk/bundleman/tests/svnsandbox.py

    • Property svn:keywords set to Id
    r49055 r49061  
    1919"""Create a svn tree 
    2020 
    21 $Id: test_projectmanager.py 28741 2006-01-05 14:08:22Z bdelbosc $ 
     21$Id$ 
    2222""" 
    2323import sys 

  • tools/bundleman/trunk/bundleman/tests/test_productman.py

    • Property svn:keywords set to Id
    r49059 r49061  
    1919"""Test the productman 
    2020 
    21 $Id: test_projectmanager.py 28741 2006-01-05 14:08:22Z bdelbosc $ 
     21$Id$ 
    2222""" 
    2323import sys 

  • tools/bundleman/trunk/bundleman/tests/test_utils.py

    • Property svn:keywords set to Id
    r49054 r49061  
    1919"""Test the make_release 
    2020 
    21 $Id: test_projectmanager.py 28741 2006-01-05 14:08:22Z bdelbosc $ 
     21$Id$ 
    2222""" 
    2323import sys 

  • tools/bundleman/trunk/bundleman/utils.py

    • Property svn:keywords set to bundleman.py

  • tools/bundleman/trunk/bundleman/version.py

    • Property svn:keywords set to bundleman.py

  • tools/bundleman/trunk/setup.cfg

    • Property svn:keywords set to Id

  • tools/bundleman/trunk/setup.py

    • Property svn:keywords set to Id
    r49032 r49061  
    2020"""Bundle Manager setup 
    2121 
    22 $Id: setup.py 24768 2005-08-31 14:01:05Z bdelbosc $ 
     22$Id$ 
    2323""" 
    2424from distutils.core import setup