rtems/rtems-source-builder
1
0
Fork 0
mirror of https://git.rtems.org/rtems-source-builder synced 2024-10-09 07:15:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Closes #3562.
This commit is contained in:
Chris Johns 2018-10-22 11:59:10 +11:00
parent f07d2b6e9a
commit 96c414c8ff
39 changed files with 19 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
bare/config/devel/texane-stlink-1.cfg
View File

@ -17,7 +17,6 @@ Summary: ST-Link v%{stlink_version} for host %{_host}
Version: %{stlink_version}
Release: %{release}
URL: https://github.com/texane/stlink/
BuildRoot: %{_tmppath}/%{name}-root-%(%{__id_u} -n)
#
# Source

1
rtems/config/tools/rtems-kernel-4-1.cfg
View File

@ -18,7 +18,6 @@ Summary: RTEMS v%{rtems_kernel_version} for target %{_target} on host %{_host}
Version: %{rtems_kernel_version}
Release: %{release}
URL: http://www.rtems.org/
BuildRoot: %{_tmppath}/%{name}-root-%(%{__id_u} -n)
#
# Build if the RSB is released or optionally enable/disable building the RTEMS

1
rtems/config/tools/rtems-nios2-gcc-4.1-newlib-1.19.0-1.cfg
View File

@ -28,7 +28,6 @@ Summary: GCC v%{gcc_version} and Newlib v%{newlib_version} for target %{_targe
Version: %{gcc_version}
Release: %{release}
URL: http://gcc.gnu.org/
BuildRoot: %{_tmppath}/%{name}-root-%(%{__id_u} -n)
#
# Supports Candian Cross (Cxc).

1
rtems/config/tools/rtems-tools-common-1.cfg
View File

@ -9,7 +9,6 @@ Summary: RTEMS Tools %{rtems_tools_version} for host %{_host}
Version: %{rtems_tools_version}
Release: %{release}
URL: http://www.rtems.org/
BuildRoot: %{_tmppath}/%{name}-root-%(%{__id_u} -n)
License: BSD-2-Clause + GPL-2.0
#

1
rtems/config/tools/rtems-tools-git-1.cfg
View File

@ -9,7 +9,6 @@ Summary: RTEMS Tools %{rtems_tools_version} for host %{_host}
Version: %{rtems_tools_version}
Release: %{release}
URL: http://www.rtems.org/
BuildRoot: %{_tmppath}/%{name}-root-%(%{__id_u} -n)
#
# Prepare the source code.

1
source-builder/config/autoconf-2-1.cfg
View File

@ -16,7 +16,6 @@ Summary: Autoconf v%{autoconf_version} for host %{_host}
Version: %{autoconf_version}
Release: %{release}
URL: http://www.gnu.org/software/autoconf/
BuildRoot: %{_tmppath}/%{name}-root-%(%{__id_u} -n)
#
# Source

1
source-builder/config/automake-1-1.cfg
View File

@ -16,7 +16,6 @@ Summary: Automake v%{automake_version} for host %{_host}
Version: %{automake_version}
Release: %{release}
URL: http://www.gnu.org/software/automake/
BuildRoot: %{_tmppath}/%{name}-root-%(%{__id_u} -n)
#
# Source

1
source-builder/config/binutils-2-1.cfg
View File

@ -19,7 +19,6 @@ Summary: Binutils v%{binutils_version} for target %{_target} on host %{_host}
Version: %{binutils_version}
Release: %{release}
URL: http://sources.redhat.com/binutils
BuildRoot: %{_tmppath}/%{name}-root-%(%{__id_u} -n)
#
# Supports Candian Cross (Cxc).

1
source-builder/config/dtc-1-1.cfg
View File

@ -13,7 +13,6 @@ Summary: Device Tree Compiler v%{dtc_version} for target %{_target} on host %{
Version: %{dtc_version}
Release: %{release}
URL: http://www.jdl.com/software/
BuildRoot: %{_tmppath}/%{name}-root-%(%{__id_u} -n)
#
# Source

1
source-builder/config/expat-2-1.cfg
View File

@ -13,7 +13,6 @@ Summary: Expat XML Parser v%{expat_version} for target %{_target} on host %{_h
Version: %{expat_version}
Release: %{release}
URL: http://expat.sourceforge.net/
BuildRoot: %{_tmppath}/%{name}-root-%(%{__id_u} -n)
#
# Source

1
source-builder/config/freetype-1.cfg
View File

@ -13,7 +13,6 @@ Summary: freetype is for producing high-quality output (glyph images) of most
Version: %{freetype_version}
Release: %{release}
URL: http://www.freetype.org/
BuildRoot: %{_tmppath}/%{name}-root-%(%{__id_u} -n)
#
# freetype Source

1
source-builder/config/gcc-common-1.cfg
View File

@ -19,7 +19,6 @@ Summary: GCC v%{gcc_version} and Newlib v%{newlib_version} for target %{_targe
Version: %{gcc_version}
Release: %{release}
URL: http://gcc.gnu.org/
BuildRoot: %{_tmppath}/%{name}-root-%(%{__id_u} -n)
#
# Supports Candian Cross (Cxc).

1
source-builder/config/gdb-6-1.cfg
View File

@ -29,7 +29,6 @@ Summary: GDB v%{gdb_version} for target %{_target} on host %{_host}
Version: %{gdb_version}
Release: %{release}
URL: http://www.gnu.org/software/gdb/
BuildRoot: %{_tmppath}/%{name}-root-%(%{__id_u} -n)
#
# Source

1
source-builder/config/gdb-common-1.cfg
View File

@ -139,7 +139,6 @@ Summary: GDB v%{gdb_version} for target %{_target} on host %{_host}
Version: %{gdb_version}
Release: %{release}
URL: http://www.gnu.org/software/gdb/
BuildRoot: %{_tmppath}/%{name}-root-%(%{__id_u} -n)
#
# GDB has changed it default extension.

1
source-builder/config/gettext-0-1.cfg
View File

@ -14,7 +14,6 @@ Summary: GetText offers to programmers, translators, and even users, a well
Version: %{gettext_version}
Release: %{release}
URL: http://www.gnu.org/software/gettext/
BuildRoot: %{_tmppath}/%{name}-root-%(%{__id_u} -n)
#
# Source

1
source-builder/config/glib-2-1.cfg
View File

@ -14,7 +14,6 @@ Summary: GLib provides the core application building blocks for
Version: %{glib_version}
Release: %{release}
URL: https://developer.gnome.org/glib/
BuildRoot: %{_tmppath}/%{name}-root-%(%{__id_u} -n)
#
# Source

1
source-builder/config/libffi-3-1.cfg
View File

@ -14,7 +14,6 @@ Summary: LibFFI provides a portable, high level programming interface to
Version: %{libffi_version}
Release: %{release}
URL: https://sourceware.org/libffi/
BuildRoot: %{_tmppath}/%{name}-root-%(%{__id_u} -n)
#
# Source

1
source-builder/config/libiconv-1-1.cfg
View File

@ -15,7 +15,6 @@ Summary: Provides an iconv() implementation, for use on systems which
Version: %{libiconv_version}
Release: %{release}
URL: http://www.gnu.org/software/libiconv/
BuildRoot: %{_tmppath}/%{name}-root-%(%{__id_u} -n)
#
# Source

3
source-builder/config/libjpeg-1.cfg
View File

@ -9,11 +9,10 @@
%endif
Name: libjpeg-v%{libjpeg_version}-%{_host}-%{release}
Summary: libjpeg is the Independent JPEG Group jpeg library
Summary: libjpeg is the Independent JPEG Group jpeg library
Version: %{libjpeg_version}
Release: %{release}
URL: http://www.ijg.org/
BuildRoot: %{_tmppath}/%{name}-root-%(%{__id_u} -n)
#
# NTP Source

1
source-builder/config/libpng-1.cfg
View File

@ -13,7 +13,6 @@ Summary: libpng is the official PNG reference library
Version: %{libpng_version}
Release: %{release}
URL: http://www.libpng.org/
BuildRoot: %{_tmppath}/%{name}-root-%(%{__id_u} -n)
#
# libpng Source

1
source-builder/config/libtiff-1.cfg
View File

@ -13,7 +13,6 @@ Summary: libtiff provides support for the Tag Image File Format (TIFF), a wide
Version: %{tiff_version}
Release: %{release}
URL: http://www.libtiff.org/
BuildRoot: %{_tmppath}/%{name}-root-%(%{__id_u} -n)
#
# libtiff Source

1
source-builder/config/libtool-2-1.cfg
View File

@ -16,7 +16,6 @@ Summary: Libtool v%{libtool_version} for host %{_host}
Version: %{libtool_version}
Release: %{release}
URL: http://www.gnu.org/software/libtool/
BuildRoot: %{_tmppath}/%{name}-root-%(%{__id_u} -n)
#
# Source

1
source-builder/config/libusb-1-1.cfg
View File

@ -12,7 +12,6 @@ Summary: LibUSB v%{libusb_version} for target %{_target} on host %{_host}
Version: %{libusb_version}
Release: %{release}
URL: http://libusb.org/
BuildRoot: %{_tmppath}/%{name}-root-%(%{__id_u} -n)
#
# Source

1
source-builder/config/lwip-1.cfg
View File

@ -13,7 +13,6 @@ Summary: Light weight TCP/IP stack
Version: %{lwip_version}
Release: %{release}
URL: http://git.savannah.gnu.org/cgit/lwip.git
BuildRoot: %{_tmppath}/%{name}-root-%(%{__id_u} -n)
#
# LWIP Source

1
source-builder/config/m4-1-1.cfg
View File

@ -12,7 +12,6 @@ Summary: M4 v%{m4_version} for host %{_host}
Version: %{m4_version}
Release: %{release}
URL: http://www.gnu.org/software/m4/
BuildRoot: %{_tmppath}/%{name}-root-%(%{__id_u} -n)
#
# Source

1
source-builder/config/microwindows-1.cfg
View File

@ -13,7 +13,6 @@ Summary: microwindows is an Open Source Window System
Version: %{microwindows_version}
Release: %{release}
URL: http://www.microwindows.org/
BuildRoot: %{_tmppath}/%{name}-root-%(%{__id_u} -n)
#
# microwindows Source

1
source-builder/config/net-snmp-5-1.cfg
View File

@ -13,7 +13,6 @@ Summary: NetSNMP is a SNMP v1, v2c and v3 Management Agent with MIB-II support
Version: %{net_snmp_version}
Release: %{release}
URL: http://www.net-snmp.org/
BuildRoot: %{_tmppath}/%{name}-root-%(%{__id_u} -n)
#
# NetSNMP Source

1
source-builder/config/ntp-4-1.cfg
View File

@ -13,7 +13,6 @@ Summary: NTP is the Network Time Protocol.
Version: %{ntp_version}
Release: %{release}
URL: http://www.ntp.org/
BuildRoot: %{_tmppath}/%{name}-root-%(%{__id_u} -n)
#
# NTP Source

1
source-builder/config/nxlib-1.cfg
View File

@ -13,7 +13,6 @@ Summary: nxlib is a wrapper library that provides closer compatibility to the
Version: %{nxlib_version}
Release: %{release}
URL: http://www.microwindows.org/
BuildRoot: %{_tmppath}/%{name}-root-%(%{__id_u} -n)
#
# nxlib Source

1
source-builder/config/or1ksim-1-1.cfg
View File

@ -13,7 +13,6 @@ Summary: or1ksim-github
Version: %{or1ksim_version}
Release: %{release}
URL: https://github.com/openrisc/or1ksim
BuildRoot: %{_tmppath}/%{name}-root-%(%{__id_u} -n)
#
# Source

1
source-builder/config/pixman-0-1.cfg
View File

@ -15,7 +15,6 @@ Summary: Pixman is a low-level software library for pixel manipulation,
Version: %{pixman_version}
Release: %{release}
URL: http://www.pixman.org/
BuildRoot: %{_tmppath}/%{name}-root-%(%{__id_u} -n)
#
# Source

1
source-builder/config/protobuf-2-1.cfg
View File

@ -15,7 +15,6 @@ Summary: Protocol buffers are Googles language-neutral,
Version: %{protobuf_version}
Release: %{release}
URL: https://developers.google.com/protocol-buffers/
BuildRoot: %{_tmppath}/%{name}-root-%(%{__id_u} -n)
#
# Protocol Buffers Source

1
source-builder/config/qemu-1-1.cfg
View File

@ -21,7 +21,6 @@ Summary: Qemu is a simulator of various processors.
Version: %{qemu_version}
Release: %{release}
URL: http://www.qemu.org/
BuildRoot: %{_tmppath}/%{name}-root-%(%{__id_u} -n)
#
# Source

1
source-builder/config/spike-1-1.cfg
View File

@ -13,7 +13,6 @@ Summary: spike-github
Version: %{spike_version}
Release: %{release}
URL: https://github.com/riscv/riscv-isa-sim/
BuildRoot: %{_tmppath}/%{name}-root-%(%{__id_u} -n)
#
# Source

1
source-builder/config/sqlite-3-1.cfg
View File

@ -15,7 +15,6 @@ Summary: SQLite is an in-process library that implements a
Version: %{sqlite_version}
Release: %{release}
URL: http://www.sqlite.org/
BuildRoot: %{_tmppath}/%{name}-root-%(%{__id_u} -n)
#
# Sqlite Source

1
source-builder/config/t1lib-1.cfg
View File

@ -13,7 +13,6 @@ Summary: t1lib is the official PNG reference library
Version: %{t1lib_version}
Release: %{release}
URL: http://www.t1lib.org/
BuildRoot: %{_tmppath}/%{name}-root-%(%{__id_u} -n)
#
# t1lib Source

5
source-builder/defaults.mc
View File

@ -40,6 +40,7 @@ nil: none, none, ''
# Set to invalid values.
_bset: none, none, ''
_bset_tmp: none, none, ''
name: none, none, ''
version: none, none, ''
release: none, none, ''
@ -91,8 +92,8 @@ _buildcxcdir: dir, optional, '%{_topdir}/build/%{buildname}-cxc'
_buildxcdir: dir, optional, '%{_topdir}/build/%{buildname}-xc'
_docdir: dir, none, '%{_defaultdocdir}'
_tmppath: dir, none, '%{_topdir}/build/tmp'
_tmproot: dir, none, '%{_tmppath}/sb-%{_uid}/%{_bset}'
_tmpcxcroot: dir, none, '%{_tmppath}/sb-%{_uid}-cxc/%{_bset}'
_tmproot: dir, none, '%{_tmppath}/sb-%{_uid}/%{_bset_tmp}'
_tmpcxcroot: dir, none, '%{_tmppath}/sb-%{_uid}-cxc/%{_bset_tmp}'
buildroot: dir, none, '%{_tmppath}/%{buildname}-%{_uid}'
buildcxcroot: dir, none, '%{_tmppath}/%{buildname}-%{_uid}-cxc'
buildxcroot: dir, none, '%{_tmppath}/%{buildname}-%{_uid}-xx'

32
source-builder/sb/build.py
View File

@ -58,6 +58,19 @@ def humanize_number(num, suffix):
num /= 1024.0
return "%.3f%s%s" % (size, 'Y', suffix)
def short_name(name):
#
# If on Windows use short names to keep the build paths as short as possible.
#
if options.host_windows:
buildname = ''
add = True
for n in name.split('-'):
buildname += n[0]
return buildname
else:
return name
class script:
"""Create and manage a shell script."""
@ -108,23 +121,6 @@ class script:
class build:
"""Build a package given a config file."""
def _name_(self, name):
#
# If on Windows use shorter names to keep the build paths.
#
if options.host_windows:
buildname = ''
add = True
for c in name:
if c == '-':
add = True
elif add:
buildname += c
add = False
return buildname
else:
return name
def _generate_report_(self, header, footer = None):
ereport.generate('rsb-report-%s.txt' % self.macros['name'],
self.opts, header, footer)
@ -141,7 +137,7 @@ class build:
self.config = config.file(name, opts, self.macros)
self.script_build = script()
self.script_clean = script()
self.macros['buildname'] = self._name_(self.macros['name'])
self.macros['buildname'] = short_name(self.macros['name'])
except error.general as gerr:
log.notice(str(gerr))
log.stderr('Build FAILED')

1
source-builder/sb/setbuilder.py
View File

@ -322,6 +322,7 @@ class buildset:
else:
exbset = self.macros.expand(self.bset)
self.macros['_bset'] = exbset
self.macros['_bset_tmp'] = build.short_name(exbset)
root, ext = path.splitext(exbset)
if exbset.endswith('.bset'):
bset = exbset