Changeset c65b9eb in rtems-source-builder


Ignore:
Timestamp:
Apr 25, 2013, 5:06:20 AM (7 years ago)
Author:
Chris Johns <chrisj@…>
Branches:
4.10, 4.11, 4.9, master
Children:
8029c99
Parents:
1a3c484
Message:

Change the CVS download path to include the module and tag/date.

Location:
source-builder
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • source-builder/config/gdb-7-1.cfg

    r1a3c484 rc65b9eb  
    77%include %{_configdir}/checks.cfg
    88
     9#
     10# Select Snapshot Macro Maps
     11#
     12%select gdb-snapshot
     13%select expat-snapshot
     14
     15#
     16# The description.
     17#
    918Name:      %{_target}-gdb-%{gdb_version}-%{release}
    1019Summary:   GDB v%{gdb_version} for target %{_target} on host %{_host}
     
    3443#
    3544%prep
     45  source_dir_0="gdb-%{gdb_version}"
    3646  %setup -q -c -n %{name}-%{version}
    37   cd gdb-%{gdb_version}
     47  cd ${source_dir_0}
    3848  %{?patch0:%patch0 %{?patch0_opts:%{patch0_opts}}%{!?patch0_opts:-p1}}
    3949  %{?patch1:%patch1 %{?patch1_opts:%{patch1_opts}}%{!?patch1_opts:-p1}}
     
    6272  CFLAGS="$SB_OPT_FLAGS" \
    6373  LIBS="%{_forced_static}" \
    64   ../gdb-%{gdb_version}/configure \
     74  ../${source_dir_0}/configure \
    6575    --build=%{_build} --host=%{_host} \
    6676    --target=%{_target} \
  • source-builder/config/snapshots/gdb-7.6-branch.mc

    r1a3c484 rc65b9eb  
    11[gdb-snapshot]
    2 GDB_Version: none, override, ' gdb-7.6-branch'
     2GDB_Version: none, override, '7.6-branch'
    33Source0:     none, override, 'cvs://pserver:anoncvs@sourceware.org/cvs/src?module=gdb?src-prefix=src?tag=gdb_7_6-branch'
    44Patch0:      none, undefine, ''
  • source-builder/sb/download.py

    r1a3c484 rc65b9eb  
    7272    try:
    7373        url = us[0]
    74         source['file'] = \
    75             url[url[6:].index(':') + 7:].replace('/', '_').replace('@', '_').replace('.', '_')
     74        source['file'] = url[url[6:].index(':') + 7:]
    7675        source['cvsroot'] = ':%s:' % (url[6:url[6:].index('/') + 6:])
    7776    except:
    7877        raise error.general('invalid cvs path: %s' % (source['url']))
    79     source['local'] = path.join(source['local_prefix'], 'cvs', source['file'])
    8078    for a in us[1:]:
    8179        _as = a.split('=')
    82         if  _as[0] == 'src-prefix':
     80        if _as[0] == 'module':
     81            if len(_as) != 2:
     82                raise error.general('invalid cvs module: %s' % (a))
     83            source['module'] = _as[1]
     84        elif _as[0] == 'src-prefix':
    8385            if len(_as) != 2:
    8486                raise error.general('invalid cvs src-prefix: %s' % (a))
    8587            source['src_prefix'] = _as[1]
     88        elif _as[0] == 'tag':
     89            if len(_as) != 2:
     90                raise error.general('invalid cvs tag: %s' % (a))
     91            source['tag'] = _as[1]
     92        elif _as[0] == 'date':
     93            if len(_as) != 2:
     94                raise error.general('invalid cvs date: %s' % (a))
     95            source['date'] = _as[1]
     96    if 'date' in source and 'tag' in source:
     97        raise error.general('cvs URL cannot have a date and tag: %s' % (source['url']))
     98    # Do here to ensure an ordered path, the URL can include options in any order
     99    if 'module' in source:
     100        source['file'] += '_%s' % (source['module'])
     101    if 'tag' in source:
     102        source['file'] += '_%s' % (source['tag'])
     103    if 'date' in source:
     104        source['file'] += '_%s' % (source['date'])
     105    for c in '/@#%.-':
     106        source['file'] = source['file'].replace(c, '_')
     107    source['local'] = path.join(source['local_prefix'], 'cvs', source['file'])
    86108    if 'src_prefix' in source:
    87109        source['symlink'] = path.join(source['local'], source['src_prefix'])
Note: See TracChangeset for help on using the changeset viewer.