Changeset 96c414c in rtems-source-builder


Ignore:
Timestamp:
Oct 22, 2018, 12:59:10 AM (6 months ago)
Author:
Chris Johns <chrisj@…>
Branches:
master
Children:
509dfbd
Parents:
f07d2b6
git-author:
Chris Johns <chrisj@…> (10/22/18 00:59:10)
git-committer:
Chris Johns <chrisj@…> (11/05/18 04:46:42)
Message:

windows: Remove BuildRoot? from all configs, add a short tmp path.

Closes #3562.

Files:
39 edited

Legend:

Unmodified
Added
Removed
  • bare/config/devel/texane-stlink-1.cfg

    rf07d2b6 r96c414c  
    1818Release:   %{release}
    1919URL:       https://github.com/texane/stlink/
    20 BuildRoot: %{_tmppath}/%{name}-root-%(%{__id_u} -n)
    2120
    2221#
  • rtems/config/tools/rtems-kernel-4-1.cfg

    rf07d2b6 r96c414c  
    1919Release:   %{release}
    2020URL:       http://www.rtems.org/
    21 BuildRoot: %{_tmppath}/%{name}-root-%(%{__id_u} -n)
    2221
    2322#
  • rtems/config/tools/rtems-nios2-gcc-4.1-newlib-1.19.0-1.cfg

    rf07d2b6 r96c414c  
    2929Release:   %{release}
    3030URL:       http://gcc.gnu.org/
    31 BuildRoot: %{_tmppath}/%{name}-root-%(%{__id_u} -n)
    3231
    3332#
  • rtems/config/tools/rtems-tools-common-1.cfg

    rf07d2b6 r96c414c  
    1010Release:   %{release}
    1111URL:       http://www.rtems.org/
    12 BuildRoot: %{_tmppath}/%{name}-root-%(%{__id_u} -n)
    1312License:   BSD-2-Clause + GPL-2.0
    1413
  • rtems/config/tools/rtems-tools-git-1.cfg

    rf07d2b6 r96c414c  
    1010Release:   %{release}
    1111URL:       http://www.rtems.org/
    12 BuildRoot: %{_tmppath}/%{name}-root-%(%{__id_u} -n)
    1312
    1413#
  • source-builder/config/autoconf-2-1.cfg

    rf07d2b6 r96c414c  
    1717Release:   %{release}
    1818URL:       http://www.gnu.org/software/autoconf/
    19 BuildRoot: %{_tmppath}/%{name}-root-%(%{__id_u} -n)
    2019
    2120#
  • source-builder/config/automake-1-1.cfg

    rf07d2b6 r96c414c  
    1717Release:   %{release}
    1818URL:       http://www.gnu.org/software/automake/
    19 BuildRoot: %{_tmppath}/%{name}-root-%(%{__id_u} -n)
    2019
    2120#
  • source-builder/config/binutils-2-1.cfg

    rf07d2b6 r96c414c  
    2020Release:   %{release}
    2121URL:       http://sources.redhat.com/binutils
    22 BuildRoot: %{_tmppath}/%{name}-root-%(%{__id_u} -n)
    2322
    2423#
  • source-builder/config/dtc-1-1.cfg

    rf07d2b6 r96c414c  
    1414Release:   %{release}
    1515URL:       http://www.jdl.com/software/
    16 BuildRoot: %{_tmppath}/%{name}-root-%(%{__id_u} -n)
    1716
    1817#
  • source-builder/config/expat-2-1.cfg

    rf07d2b6 r96c414c  
    1414Release:   %{release}
    1515URL:       http://expat.sourceforge.net/
    16 BuildRoot: %{_tmppath}/%{name}-root-%(%{__id_u} -n)
    1716
    1817#
  • source-builder/config/freetype-1.cfg

    rf07d2b6 r96c414c  
    1414Release:   %{release}
    1515URL:     http://www.freetype.org/
    16 BuildRoot: %{_tmppath}/%{name}-root-%(%{__id_u} -n)
    1716
    1817#
  • source-builder/config/gcc-common-1.cfg

    rf07d2b6 r96c414c  
    2020Release:   %{release}
    2121URL:       http://gcc.gnu.org/
    22 BuildRoot: %{_tmppath}/%{name}-root-%(%{__id_u} -n)
    2322
    2423#
  • source-builder/config/gdb-6-1.cfg

    rf07d2b6 r96c414c  
    3030Release:   %{release}
    3131URL:       http://www.gnu.org/software/gdb/
    32 BuildRoot: %{_tmppath}/%{name}-root-%(%{__id_u} -n)
    3332
    3433#
  • source-builder/config/gdb-common-1.cfg

    rf07d2b6 r96c414c  
    140140Release:   %{release}
    141141URL:       http://www.gnu.org/software/gdb/
    142 BuildRoot: %{_tmppath}/%{name}-root-%(%{__id_u} -n)
    143142
    144143#
  • source-builder/config/gettext-0-1.cfg

    rf07d2b6 r96c414c  
    1515Release:   %{release}
    1616URL:       http://www.gnu.org/software/gettext/
    17 BuildRoot: %{_tmppath}/%{name}-root-%(%{__id_u} -n)
    1817
    1918#
  • source-builder/config/glib-2-1.cfg

    rf07d2b6 r96c414c  
    1515Release:   %{release}
    1616URL:       https://developer.gnome.org/glib/
    17 BuildRoot: %{_tmppath}/%{name}-root-%(%{__id_u} -n)
    1817
    1918#
  • source-builder/config/libffi-3-1.cfg

    rf07d2b6 r96c414c  
    1515Release:   %{release}
    1616URL:       https://sourceware.org/libffi/
    17 BuildRoot: %{_tmppath}/%{name}-root-%(%{__id_u} -n)
    1817
    1918#
  • source-builder/config/libiconv-1-1.cfg

    rf07d2b6 r96c414c  
    1616Release:   %{release}
    1717URL:       http://www.gnu.org/software/libiconv/
    18 BuildRoot: %{_tmppath}/%{name}-root-%(%{__id_u} -n)
    1918
    2019#
  • source-builder/config/libjpeg-1.cfg

    rf07d2b6 r96c414c  
    1010
    1111Name:      libjpeg-v%{libjpeg_version}-%{_host}-%{release}
    12 Summary:   libjpeg is the Independent JPEG Group jpeg library 
     12Summary:   libjpeg is the Independent JPEG Group jpeg library
    1313Version:   %{libjpeg_version}
    1414Release:   %{release}
    1515URL:       http://www.ijg.org/
    16 BuildRoot: %{_tmppath}/%{name}-root-%(%{__id_u} -n)
    1716
    1817#
  • source-builder/config/libpng-1.cfg

    rf07d2b6 r96c414c  
    1414Release:   %{release}
    1515URL:       http://www.libpng.org/
    16 BuildRoot: %{_tmppath}/%{name}-root-%(%{__id_u} -n)
    1716
    1817#
  • source-builder/config/libtiff-1.cfg

    rf07d2b6 r96c414c  
    1414Release:   %{release}
    1515URL:     http://www.libtiff.org/
    16 BuildRoot: %{_tmppath}/%{name}-root-%(%{__id_u} -n)
    1716
    1817#
  • source-builder/config/libtool-2-1.cfg

    rf07d2b6 r96c414c  
    1717Release:   %{release}
    1818URL:       http://www.gnu.org/software/libtool/
    19 BuildRoot: %{_tmppath}/%{name}-root-%(%{__id_u} -n)
    2019
    2120#
  • source-builder/config/libusb-1-1.cfg

    rf07d2b6 r96c414c  
    1313Release:   %{release}
    1414URL:       http://libusb.org/
    15 BuildRoot: %{_tmppath}/%{name}-root-%(%{__id_u} -n)
    1615
    1716#
  • source-builder/config/lwip-1.cfg

    rf07d2b6 r96c414c  
    1414Release:   %{release}
    1515URL:       http://git.savannah.gnu.org/cgit/lwip.git
    16 BuildRoot: %{_tmppath}/%{name}-root-%(%{__id_u} -n)
    1716
    1817#
  • source-builder/config/m4-1-1.cfg

    rf07d2b6 r96c414c  
    1313Release:   %{release}
    1414URL:       http://www.gnu.org/software/m4/
    15 BuildRoot: %{_tmppath}/%{name}-root-%(%{__id_u} -n)
    1615
    1716#
  • source-builder/config/microwindows-1.cfg

    rf07d2b6 r96c414c  
    1414Release:   %{release}
    1515URL:     http://www.microwindows.org/
    16 BuildRoot: %{_tmppath}/%{name}-root-%(%{__id_u} -n)
    1716
    1817#
  • source-builder/config/net-snmp-5-1.cfg

    rf07d2b6 r96c414c  
    1414Release:   %{release}
    1515URL:       http://www.net-snmp.org/
    16 BuildRoot: %{_tmppath}/%{name}-root-%(%{__id_u} -n)
    1716
    1817#
  • source-builder/config/ntp-4-1.cfg

    rf07d2b6 r96c414c  
    1414Release:   %{release}
    1515URL:       http://www.ntp.org/
    16 BuildRoot: %{_tmppath}/%{name}-root-%(%{__id_u} -n)
    1716
    1817#
  • source-builder/config/nxlib-1.cfg

    rf07d2b6 r96c414c  
    1414Release:   %{release}
    1515URL:     http://www.microwindows.org/
    16 BuildRoot: %{_tmppath}/%{name}-root-%(%{__id_u} -n)
    1716
    1817#
  • source-builder/config/or1ksim-1-1.cfg

    rf07d2b6 r96c414c  
    1414Release:   %{release}
    1515URL:       https://github.com/openrisc/or1ksim
    16 BuildRoot: %{_tmppath}/%{name}-root-%(%{__id_u} -n)
    1716
    1817#
  • source-builder/config/pixman-0-1.cfg

    rf07d2b6 r96c414c  
    1616Release:   %{release}
    1717URL:       http://www.pixman.org/
    18 BuildRoot: %{_tmppath}/%{name}-root-%(%{__id_u} -n)
    1918
    2019#
  • source-builder/config/protobuf-2-1.cfg

    rf07d2b6 r96c414c  
    1616Release:   %{release}
    1717URL:       https://developers.google.com/protocol-buffers/
    18 BuildRoot: %{_tmppath}/%{name}-root-%(%{__id_u} -n)
    1918
    2019#
  • source-builder/config/qemu-1-1.cfg

    rf07d2b6 r96c414c  
    2222Release:   %{release}
    2323URL:       http://www.qemu.org/
    24 BuildRoot: %{_tmppath}/%{name}-root-%(%{__id_u} -n)
    2524
    2625#
  • source-builder/config/spike-1-1.cfg

    rf07d2b6 r96c414c  
    1414Release:   %{release}
    1515URL:       https://github.com/riscv/riscv-isa-sim/
    16 BuildRoot: %{_tmppath}/%{name}-root-%(%{__id_u} -n)
    1716
    1817#
  • source-builder/config/sqlite-3-1.cfg

    rf07d2b6 r96c414c  
    1616Release:   %{release}
    1717URL:       http://www.sqlite.org/
    18 BuildRoot: %{_tmppath}/%{name}-root-%(%{__id_u} -n)
    1918
    2019#
  • source-builder/config/t1lib-1.cfg

    rf07d2b6 r96c414c  
    1414Release:   %{release}
    1515URL:       http://www.t1lib.org/
    16 BuildRoot: %{_tmppath}/%{name}-root-%(%{__id_u} -n)
    1716
    1817#
  • source-builder/defaults.mc

    rf07d2b6 r96c414c  
    4141# Set to invalid values.
    4242_bset:               none,    none,     ''
     43_bset_tmp:           none,    none,     ''
    4344name:                none,    none,     ''
    4445version:             none,    none,     ''
     
    9293_docdir:             dir,     none,     '%{_defaultdocdir}'
    9394_tmppath:            dir,     none,     '%{_topdir}/build/tmp'
    94 _tmproot:            dir,     none,     '%{_tmppath}/sb-%{_uid}/%{_bset}'
    95 _tmpcxcroot:         dir,     none,     '%{_tmppath}/sb-%{_uid}-cxc/%{_bset}'
     95_tmproot:            dir,     none,     '%{_tmppath}/sb-%{_uid}/%{_bset_tmp}'
     96_tmpcxcroot:         dir,     none,     '%{_tmppath}/sb-%{_uid}-cxc/%{_bset_tmp}'
    9697buildroot:           dir,     none,     '%{_tmppath}/%{buildname}-%{_uid}'
    9798buildcxcroot:        dir,     none,     '%{_tmppath}/%{buildname}-%{_uid}-cxc'
  • source-builder/sb/build.py

    rf07d2b6 r96c414c  
    5959    return "%.3f%s%s" % (size, 'Y', suffix)
    6060
     61def short_name(name):
     62    #
     63    # If on Windows use short names to keep the build paths as short as possible.
     64    #
     65    if options.host_windows:
     66        buildname = ''
     67        add = True
     68        for n in name.split('-'):
     69            buildname += n[0]
     70        return buildname
     71    else:
     72        return name
     73
    6174class script:
    6275    """Create and manage a shell script."""
     
    109122    """Build a package given a config file."""
    110123
    111     def _name_(self, name):
    112         #
    113         # If on Windows use shorter names to keep the build paths.
    114         #
    115         if options.host_windows:
    116             buildname = ''
    117             add = True
    118             for c in name:
    119                 if c == '-':
    120                     add = True
    121                 elif add:
    122                     buildname += c
    123                     add = False
    124             return buildname
    125         else:
    126             return name
    127 
    128124    def _generate_report_(self, header, footer = None):
    129125        ereport.generate('rsb-report-%s.txt' % self.macros['name'],
     
    142138            self.script_build = script()
    143139            self.script_clean = script()
    144             self.macros['buildname'] = self._name_(self.macros['name'])
     140            self.macros['buildname'] = short_name(self.macros['name'])
    145141        except error.general as gerr:
    146142            log.notice(str(gerr))
  • source-builder/sb/setbuilder.py

    rf07d2b6 r96c414c  
    323323            exbset = self.macros.expand(self.bset)
    324324            self.macros['_bset'] = exbset
     325            self.macros['_bset_tmp'] = build.short_name(exbset)
    325326            root, ext = path.splitext(exbset)
    326327            if exbset.endswith('.bset'):
Note: See TracChangeset for help on using the changeset viewer.