From 65faaed6608ea1201b9b599bd1771e497a3a9d6f Mon Sep 17 00:00:00 2001 From: Francis Rowe Date: Sun, 07 Jun 2015 16:35:07 -0400 Subject: build/release/*: version in file names no longer optional (also, rename archives to util) --- diff --git a/resources/scripts/helpers/build/release/crossgcc b/resources/scripts/helpers/build/release/crossgcc index 80defb5..d76947b 100755 --- a/resources/scripts/helpers/build/release/crossgcc +++ b/resources/scripts/helpers/build/release/crossgcc @@ -26,11 +26,7 @@ set -u -e printf 'Building the coreboot crossgcc archives\n' version="$(git describe --tags HEAD)" -if [ "x${VERSION_IN_FILENAMES+set}" = 'xset' ]; then - distdir="crossgcc_${version}" -else - distdir='crossgcc' -fi +distdir="crossgcc_${version}" printf 'Deleting old coreboot crossgcc archives\n' rm -Rf "release/${distdir}/" diff --git a/resources/scripts/helpers/build/release/docs b/resources/scripts/helpers/build/release/docs index 93aa4a2..a1f7b96 100755 --- a/resources/scripts/helpers/build/release/docs +++ b/resources/scripts/helpers/build/release/docs @@ -26,11 +26,7 @@ set -u -e printf 'Building the documentation release archive\n' version="$(git describe --tags HEAD)" -if [ "x${VERSION_IN_FILENAMES+set}" = 'xset' ]; then - distdir="libreboot_${version}_docs" -else - distdir='libreboot_docs' -fi +distdir="libreboot_${version}_docs" [ -d release/ ] || mkdir release/ diff --git a/resources/scripts/helpers/build/release/roms b/resources/scripts/helpers/build/release/roms index 13629b7..eb58a51 100755 --- a/resources/scripts/helpers/build/release/roms +++ b/resources/scripts/helpers/build/release/roms @@ -29,11 +29,7 @@ if [ ! -d bin/ ]; then fi version="$(git describe --tags HEAD)" -if [ "x${VERSION_IN_FILENAMES+set}" = 'xset' ]; then - distname="libreboot_${version}" -else - distname='libreboot' -fi +distname="libreboot_${version}" [ -d release/rom/ ] || mkdir -p release/rom/ diff --git a/resources/scripts/helpers/build/release/src b/resources/scripts/helpers/build/release/src index 29c0ee0..4663c1b 100755 --- a/resources/scripts/helpers/build/release/src +++ b/resources/scripts/helpers/build/release/src @@ -26,11 +26,7 @@ set -u -e printf 'Building the source release archive\n' version="$(git describe --tags HEAD)" -if [ "x${VERSION_IN_FILENAMES+set}" = 'xset' ]; then - distdir="libreboot_${version}_src" -else - distdir='libreboot_src' -fi +distdir="libreboot_${version}_src" printf 'Deleting old source release archives\n' rm -f "release/${distdir}.tar.xz" diff --git a/resources/scripts/helpers/build/release/archives b/resources/scripts/helpers/build/release/util index 1795df0..1795df0 100755 --- a/resources/scripts/helpers/build/release/archives +++ b/resources/scripts/helpers/build/release/util -- cgit v0.9.1