From 96c414c8ff0b8715111db8d0114df284ddd0d14c Mon Sep 17 00:00:00 2001 From: Chris Johns Date: Mon, 22 Oct 2018 11:59:10 +1100 Subject: windows: Remove BuildRoot from all configs, add a short tmp path. Closes #3562. --- bare/config/devel/texane-stlink-1.cfg | 1 - rtems/config/tools/rtems-kernel-4-1.cfg | 1 - .../tools/rtems-nios2-gcc-4.1-newlib-1.19.0-1.cfg | 1 - rtems/config/tools/rtems-tools-common-1.cfg | 1 - rtems/config/tools/rtems-tools-git-1.cfg | 1 - source-builder/config/autoconf-2-1.cfg | 1 - source-builder/config/automake-1-1.cfg | 1 - source-builder/config/binutils-2-1.cfg | 1 - source-builder/config/dtc-1-1.cfg | 1 - source-builder/config/expat-2-1.cfg | 1 - source-builder/config/freetype-1.cfg | 1 - source-builder/config/gcc-common-1.cfg | 1 - source-builder/config/gdb-6-1.cfg | 1 - source-builder/config/gdb-common-1.cfg | 1 - source-builder/config/gettext-0-1.cfg | 1 - source-builder/config/glib-2-1.cfg | 1 - source-builder/config/libffi-3-1.cfg | 1 - source-builder/config/libiconv-1-1.cfg | 1 - source-builder/config/libjpeg-1.cfg | 3 +- source-builder/config/libpng-1.cfg | 1 - source-builder/config/libtiff-1.cfg | 1 - source-builder/config/libtool-2-1.cfg | 1 - source-builder/config/libusb-1-1.cfg | 1 - source-builder/config/lwip-1.cfg | 1 - source-builder/config/m4-1-1.cfg | 1 - source-builder/config/microwindows-1.cfg | 1 - source-builder/config/net-snmp-5-1.cfg | 1 - source-builder/config/ntp-4-1.cfg | 1 - source-builder/config/nxlib-1.cfg | 1 - source-builder/config/or1ksim-1-1.cfg | 1 - source-builder/config/pixman-0-1.cfg | 1 - source-builder/config/protobuf-2-1.cfg | 1 - source-builder/config/qemu-1-1.cfg | 1 - source-builder/config/spike-1-1.cfg | 1 - source-builder/config/sqlite-3-1.cfg | 1 - source-builder/config/t1lib-1.cfg | 1 - source-builder/defaults.mc | 5 ++-- source-builder/sb/build.py | 32 ++++++++++------------ source-builder/sb/setbuilder.py | 1 + 39 files changed, 19 insertions(+), 57 deletions(-) diff --git a/bare/config/devel/texane-stlink-1.cfg b/bare/config/devel/texane-stlink-1.cfg index 2f102cc..9d6a157 100644 --- a/bare/config/devel/texane-stlink-1.cfg +++ b/bare/config/devel/texane-stlink-1.cfg @@ -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 diff --git a/rtems/config/tools/rtems-kernel-4-1.cfg b/rtems/config/tools/rtems-kernel-4-1.cfg index cdde4c0..8c725a5 100644 --- a/rtems/config/tools/rtems-kernel-4-1.cfg +++ b/rtems/config/tools/rtems-kernel-4-1.cfg @@ -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 diff --git a/rtems/config/tools/rtems-nios2-gcc-4.1-newlib-1.19.0-1.cfg b/rtems/config/tools/rtems-nios2-gcc-4.1-newlib-1.19.0-1.cfg index 28342cd..555956b 100644 --- a/rtems/config/tools/rtems-nios2-gcc-4.1-newlib-1.19.0-1.cfg +++ b/rtems/config/tools/rtems-nios2-gcc-4.1-newlib-1.19.0-1.cfg @@ -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). diff --git a/rtems/config/tools/rtems-tools-common-1.cfg b/rtems/config/tools/rtems-tools-common-1.cfg index cf86b7e..b15fbce 100644 --- a/rtems/config/tools/rtems-tools-common-1.cfg +++ b/rtems/config/tools/rtems-tools-common-1.cfg @@ -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 # diff --git a/rtems/config/tools/rtems-tools-git-1.cfg b/rtems/config/tools/rtems-tools-git-1.cfg index 3573c73..ec44132 100644 --- a/rtems/config/tools/rtems-tools-git-1.cfg +++ b/rtems/config/tools/rtems-tools-git-1.cfg @@ -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. diff --git a/source-builder/config/autoconf-2-1.cfg b/source-builder/config/autoconf-2-1.cfg index 5061cfd..7062881 100644 --- a/source-builder/config/autoconf-2-1.cfg +++ b/source-builder/config/autoconf-2-1.cfg @@ -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 diff --git a/source-builder/config/automake-1-1.cfg b/source-builder/config/automake-1-1.cfg index 6f45928..c4e52cd 100644 --- a/source-builder/config/automake-1-1.cfg +++ b/source-builder/config/automake-1-1.cfg @@ -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 diff --git a/source-builder/config/binutils-2-1.cfg b/source-builder/config/binutils-2-1.cfg index 5eefd0f..fd3ae55 100644 --- a/source-builder/config/binutils-2-1.cfg +++ b/source-builder/config/binutils-2-1.cfg @@ -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). diff --git a/source-builder/config/dtc-1-1.cfg b/source-builder/config/dtc-1-1.cfg index c9cb816..6dc08dd 100644 --- a/source-builder/config/dtc-1-1.cfg +++ b/source-builder/config/dtc-1-1.cfg @@ -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 diff --git a/source-builder/config/expat-2-1.cfg b/source-builder/config/expat-2-1.cfg index 77774e7..2219d15 100644 --- a/source-builder/config/expat-2-1.cfg +++ b/source-builder/config/expat-2-1.cfg @@ -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 diff --git a/source-builder/config/freetype-1.cfg b/source-builder/config/freetype-1.cfg index 37f1438..ec03feb 100644 --- a/source-builder/config/freetype-1.cfg +++ b/source-builder/config/freetype-1.cfg @@ -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 diff --git a/source-builder/config/gcc-common-1.cfg b/source-builder/config/gcc-common-1.cfg index b432fdf..69e71ee 100644 --- a/source-builder/config/gcc-common-1.cfg +++ b/source-builder/config/gcc-common-1.cfg @@ -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). diff --git a/source-builder/config/gdb-6-1.cfg b/source-builder/config/gdb-6-1.cfg index 09c112c..70729b2 100644 --- a/source-builder/config/gdb-6-1.cfg +++ b/source-builder/config/gdb-6-1.cfg @@ -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 diff --git a/source-builder/config/gdb-common-1.cfg b/source-builder/config/gdb-common-1.cfg index 30fdf90..45df5e9 100644 --- a/source-builder/config/gdb-common-1.cfg +++ b/source-builder/config/gdb-common-1.cfg @@ -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. diff --git a/source-builder/config/gettext-0-1.cfg b/source-builder/config/gettext-0-1.cfg index 7758d7b..19402b6 100644 --- a/source-builder/config/gettext-0-1.cfg +++ b/source-builder/config/gettext-0-1.cfg @@ -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 diff --git a/source-builder/config/glib-2-1.cfg b/source-builder/config/glib-2-1.cfg index 6c40be2..16a51fe 100644 --- a/source-builder/config/glib-2-1.cfg +++ b/source-builder/config/glib-2-1.cfg @@ -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 diff --git a/source-builder/config/libffi-3-1.cfg b/source-builder/config/libffi-3-1.cfg index d258acb..f64353f 100644 --- a/source-builder/config/libffi-3-1.cfg +++ b/source-builder/config/libffi-3-1.cfg @@ -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 diff --git a/source-builder/config/libiconv-1-1.cfg b/source-builder/config/libiconv-1-1.cfg index 1ccecd4..fd2d738 100644 --- a/source-builder/config/libiconv-1-1.cfg +++ b/source-builder/config/libiconv-1-1.cfg @@ -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 diff --git a/source-builder/config/libjpeg-1.cfg b/source-builder/config/libjpeg-1.cfg index 6ef0a5a..6acb02f 100644 --- a/source-builder/config/libjpeg-1.cfg +++ b/source-builder/config/libjpeg-1.cfg @@ -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 diff --git a/source-builder/config/libpng-1.cfg b/source-builder/config/libpng-1.cfg index 6821089..2644948 100644 --- a/source-builder/config/libpng-1.cfg +++ b/source-builder/config/libpng-1.cfg @@ -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 diff --git a/source-builder/config/libtiff-1.cfg b/source-builder/config/libtiff-1.cfg index f445bf0..f7fa893 100644 --- a/source-builder/config/libtiff-1.cfg +++ b/source-builder/config/libtiff-1.cfg @@ -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 diff --git a/source-builder/config/libtool-2-1.cfg b/source-builder/config/libtool-2-1.cfg index 0d1f972..df446b0 100644 --- a/source-builder/config/libtool-2-1.cfg +++ b/source-builder/config/libtool-2-1.cfg @@ -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 diff --git a/source-builder/config/libusb-1-1.cfg b/source-builder/config/libusb-1-1.cfg index 271d5e0..4b250a3 100644 --- a/source-builder/config/libusb-1-1.cfg +++ b/source-builder/config/libusb-1-1.cfg @@ -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 diff --git a/source-builder/config/lwip-1.cfg b/source-builder/config/lwip-1.cfg index 226a5d9..1dd3bb7 100644 --- a/source-builder/config/lwip-1.cfg +++ b/source-builder/config/lwip-1.cfg @@ -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 diff --git a/source-builder/config/m4-1-1.cfg b/source-builder/config/m4-1-1.cfg index c77e4a3..db0c291 100644 --- a/source-builder/config/m4-1-1.cfg +++ b/source-builder/config/m4-1-1.cfg @@ -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 diff --git a/source-builder/config/microwindows-1.cfg b/source-builder/config/microwindows-1.cfg index 189a3a8..d6cfab5 100644 --- a/source-builder/config/microwindows-1.cfg +++ b/source-builder/config/microwindows-1.cfg @@ -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 diff --git a/source-builder/config/net-snmp-5-1.cfg b/source-builder/config/net-snmp-5-1.cfg index cf85e19..bffe430 100644 --- a/source-builder/config/net-snmp-5-1.cfg +++ b/source-builder/config/net-snmp-5-1.cfg @@ -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 diff --git a/source-builder/config/ntp-4-1.cfg b/source-builder/config/ntp-4-1.cfg index 014c935..a7d5982 100644 --- a/source-builder/config/ntp-4-1.cfg +++ b/source-builder/config/ntp-4-1.cfg @@ -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 diff --git a/source-builder/config/nxlib-1.cfg b/source-builder/config/nxlib-1.cfg index ba3a941..32cbb62 100644 --- a/source-builder/config/nxlib-1.cfg +++ b/source-builder/config/nxlib-1.cfg @@ -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 diff --git a/source-builder/config/or1ksim-1-1.cfg b/source-builder/config/or1ksim-1-1.cfg index fb77567..468f524 100644 --- a/source-builder/config/or1ksim-1-1.cfg +++ b/source-builder/config/or1ksim-1-1.cfg @@ -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 diff --git a/source-builder/config/pixman-0-1.cfg b/source-builder/config/pixman-0-1.cfg index f02c3d6..fc393e8 100644 --- a/source-builder/config/pixman-0-1.cfg +++ b/source-builder/config/pixman-0-1.cfg @@ -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 diff --git a/source-builder/config/protobuf-2-1.cfg b/source-builder/config/protobuf-2-1.cfg index f5b49c8..45cfbf0 100644 --- a/source-builder/config/protobuf-2-1.cfg +++ b/source-builder/config/protobuf-2-1.cfg @@ -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 diff --git a/source-builder/config/qemu-1-1.cfg b/source-builder/config/qemu-1-1.cfg index 43af72e..178cb5c 100644 --- a/source-builder/config/qemu-1-1.cfg +++ b/source-builder/config/qemu-1-1.cfg @@ -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 diff --git a/source-builder/config/spike-1-1.cfg b/source-builder/config/spike-1-1.cfg index 54e4915..ede6a42 100644 --- a/source-builder/config/spike-1-1.cfg +++ b/source-builder/config/spike-1-1.cfg @@ -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 diff --git a/source-builder/config/sqlite-3-1.cfg b/source-builder/config/sqlite-3-1.cfg index a748848..07699fd 100644 --- a/source-builder/config/sqlite-3-1.cfg +++ b/source-builder/config/sqlite-3-1.cfg @@ -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 diff --git a/source-builder/config/t1lib-1.cfg b/source-builder/config/t1lib-1.cfg index d2a47a2..3cb02c5 100644 --- a/source-builder/config/t1lib-1.cfg +++ b/source-builder/config/t1lib-1.cfg @@ -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 diff --git a/source-builder/defaults.mc b/source-builder/defaults.mc index aa1a5e6..88cab4d 100644 --- a/source-builder/defaults.mc +++ b/source-builder/defaults.mc @@ -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' diff --git a/source-builder/sb/build.py b/source-builder/sb/build.py index a17bfe2..faa11cc 100644 --- a/source-builder/sb/build.py +++ b/source-builder/sb/build.py @@ -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') diff --git a/source-builder/sb/setbuilder.py b/source-builder/sb/setbuilder.py index d805b39..dbc4035 100644 --- a/source-builder/sb/setbuilder.py +++ b/source-builder/sb/setbuilder.py @@ -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 -- cgit v1.2.3