From 7d4a259c9efbc2e6c5006e0d965e4a4976b54383 Mon Sep 17 00:00:00 2001
From: Francis Rowe <info@gluglug.org.uk>
Date: Mon, 8 Jun 2015 16:42:33 +0100
Subject: build/release/*: if version file already exists, re-use it

---
 resources/scripts/helpers/build/release/crossgcc   | 8 +++++++-
 resources/scripts/helpers/build/release/docs       | 8 +++++++-
 resources/scripts/helpers/build/release/roms       | 8 +++++++-
 resources/scripts/helpers/build/release/sha512sums | 8 +++++++-
 resources/scripts/helpers/build/release/src        | 8 +++++++-
 resources/scripts/helpers/build/release/tobuild    | 8 +++++++-
 resources/scripts/helpers/build/release/util       | 8 +++++++-
 7 files changed, 49 insertions(+), 7 deletions(-)

(limited to 'resources/scripts/helpers/build/release')

diff --git a/resources/scripts/helpers/build/release/crossgcc b/resources/scripts/helpers/build/release/crossgcc
index e1e4d9cc..c7aa97a7 100755
--- a/resources/scripts/helpers/build/release/crossgcc
+++ b/resources/scripts/helpers/build/release/crossgcc
@@ -25,7 +25,13 @@ set -u -e
 
 printf 'Building the coreboot crossgcc archives\n'
 
-version="$(git describe --tags HEAD)"
+if [ -f "version" ]; then
+	# _src release archive is being used
+	version="$(cat version)"
+else
+	# git repo is being used
+	version="$(git describe --tags HEAD)"
+fi
 versiondir="release/${version}"
 distdir="${versiondir}/crossgcc_${version}"
 
diff --git a/resources/scripts/helpers/build/release/docs b/resources/scripts/helpers/build/release/docs
index 523d1760..410e8fae 100755
--- a/resources/scripts/helpers/build/release/docs
+++ b/resources/scripts/helpers/build/release/docs
@@ -25,7 +25,13 @@ set -u -e
 
 printf 'Building the documentation release archive\n'
 
-version="$(git describe --tags HEAD)"
+if [ -f "version" ]; then
+	# _src release archive is being used
+	version="$(cat version)"
+else
+	# git repo is being used
+	version="$(git describe --tags HEAD)"
+fi
 versiondir="release/${version}"
 distdir="${versiondir}/libreboot_${version}_docs"
 
diff --git a/resources/scripts/helpers/build/release/roms b/resources/scripts/helpers/build/release/roms
index 6b026552..2f46f39a 100755
--- a/resources/scripts/helpers/build/release/roms
+++ b/resources/scripts/helpers/build/release/roms
@@ -28,7 +28,13 @@ if [ ! -d bin/ ]; then
 	exit 1
 fi
 
-version="$(git describe --tags HEAD)"
+if [ -f "version" ]; then
+	# _src release archive is being used
+	version="$(cat version)"
+else
+	# git repo is being used
+	version="$(git describe --tags HEAD)"
+fi
 versiondir="release/${version}"
 romdir="${versiondir}/rom"
 distname="libreboot_${version}"
diff --git a/resources/scripts/helpers/build/release/sha512sums b/resources/scripts/helpers/build/release/sha512sums
index cc7668b3..f7c87541 100755
--- a/resources/scripts/helpers/build/release/sha512sums
+++ b/resources/scripts/helpers/build/release/sha512sums
@@ -22,7 +22,13 @@
 [ "x${DEBUG+set}" = 'xset' ] && set -v
 set -u -e
 
-version="$(git describe --tags HEAD)"
+if [ -f "version" ]; then
+	# _src release archive is being used
+	version="$(cat version)"
+else
+	# git repo is being used
+	version="$(git describe --tags HEAD)"
+fi
 versiondir="release/${version}"
 sha512filename="sha512sum.txt"
 sha512filepath="${versiondir}/${sha512filename}"
diff --git a/resources/scripts/helpers/build/release/src b/resources/scripts/helpers/build/release/src
index 0b345534..9d884084 100755
--- a/resources/scripts/helpers/build/release/src
+++ b/resources/scripts/helpers/build/release/src
@@ -25,7 +25,13 @@ set -u -e
 
 printf 'Building the source release archive\n'
 
-version="$(git describe --tags HEAD)"
+if [ -f "version" ]; then
+	# _src release archive is being used
+	version="$(cat version)"
+else
+	# git repo is being used
+	version="$(git describe --tags HEAD)"
+fi
 versiondir="release/${version}"
 distname="libreboot_${version}_src"
 distdir="${versiondir}/${distname}"
diff --git a/resources/scripts/helpers/build/release/tobuild b/resources/scripts/helpers/build/release/tobuild
index dc0f5a17..3e9dac08 100755
--- a/resources/scripts/helpers/build/release/tobuild
+++ b/resources/scripts/helpers/build/release/tobuild
@@ -23,7 +23,13 @@
 [ "x${DEBUG+set}" = 'xset' ] && set -v
 set -u -e
 
-version="$(git describe --tags HEAD)"
+if [ -f "version" ]; then
+	# _src release archive is being used
+	version="$(cat version)"
+else
+	# git repo is being used
+	version="$(git describe --tags HEAD)"
+fi
 versiondir="release/${version}"
 distname="tobuild"
 distdir="${versiondir}/${distname}"
diff --git a/resources/scripts/helpers/build/release/util b/resources/scripts/helpers/build/release/util
index 6807c7bc..840be6a8 100755
--- a/resources/scripts/helpers/build/release/util
+++ b/resources/scripts/helpers/build/release/util
@@ -41,7 +41,13 @@ else
 	exit 1
 fi
 
-version="$(git describe --tags HEAD)"
+if [ -f "version" ]; then
+	# _src release archive is being used
+	version="$(cat version)"
+else
+	# git repo is being used
+	version="$(git describe --tags HEAD)"
+fi
 versiondir="release/${version}"
 distname="libreboot_${version}_util"
 distdir="${versiondir}/${distname}"
-- 
cgit v1.2.3-70-g09d2