Changeset 52742

Show
Ignore:
Timestamp:
04/16/08 16:31:30 (6 months ago)
Author:
bdelbosc
Message:

bundle can have sources along with externals, make them part of the bundle

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • tools/bundleman/trunk/CHANGES.txt

    r51584 r52742  
    2727 
    2828* bm-bundle new ``--archive-name`` option to set the archive name. 
     29 
     30* bm-bundle packages and tags the contents that are not externals. 
    2931 
    3032 

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

    r51575 r52742  
    263263        # create bundle 
    264264        logger.info('Creating bundle %s' % tag_url) 
    265         createBundle(tag_url, products, release_tag) 
     265        createBundle(tag_url, products, release_tag, bundle_url) 
    266266        return 0 
    267267 

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

    r49721 r52742  
    284284 
    285285 
    286 def createBundle(url, products, tag): 
     286def createBundle(url, products, tag, from_bundle=None): 
    287287    """Create a bundle at url with products. 
    288288 
    …… 
    290290    """ 
    291291    # create bundle 
    292     command('svn -m"bundleman create bundle %s" mkdir %s' % 
    293             (tag, url)) 
     292    if from_bundle is not None: 
     293        command('svn -m"bundleman create bundle %s from %s" cp %s %s' % 
     294                (tag, from_bundle, from_bundle, url)) 
     295    else: 
     296        command('svn -m"bundleman create bundle %s" mkdir %s' % 
     297                (tag, url)) 
    294298    lines = [] 
    295299    for product in products: