From 8666d6016ca1fef6cb596d51212737b7e5935ba7 Mon Sep 17 00:00:00 2001
From: "Christian Goetze (CG)" <cg@lindenlab.com>
Date: Wed, 18 Aug 2010 20:30:19 -0700
Subject: [PATCH] fix mixup in "last_built_variant" vs "last_built_arch".
---
build.sh | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/build.sh b/build.sh
index 50c22ff6ac2..39032162462 100755
--- a/build.sh
+++ b/build.sh
@@ -32,19 +32,19 @@ build_dir_CYGWIN()
installer_Darwin()
{
- ls -1td "$(build_dir_Darwin ${last_built_arch:-Release})/newview/"*.dmg 2>/dev/null | sed 1q
+ ls -1td "$(build_dir_Darwin ${last_built_variant:-Release})/newview/"*.dmg 2>/dev/null | sed 1q
}
installer_Linux()
{
- ls -1td "$(build_dir_Linux ${last_built_arch:-Release})/newview/"*.tar.bz2 2>/dev/null | sed 1q
+ ls -1td "$(build_dir_Linux ${last_built_variant:-Release})/newview/"*.tar.bz2 2>/dev/null | sed 1q
}
installer_CYGWIN()
{
- d=$(build_dir_CYGWIN ${last_built_arch:-Release})
- p=$(sed 's:.*=::' "$d/newview/${last_built_arch:-Release}/touched.bat")
- echo "$d/newview/${last_built_arch:-Release}/$p"
+ d=$(build_dir_CYGWIN ${last_built_variant:-Release})
+ p=$(sed 's:.*=::' "$d/newview/${last_built_variant:-Release}/touched.bat")
+ echo "$d/newview/${last_built_variant:-Release}/$p"
}
pre_build()
@@ -280,7 +280,7 @@ then
upload_item installer "$package" binary/octet-stream
# Upload crash reporter files.
- case "$last_built_arch" in
+ case "$last_built_variant" in
Release)
for symbolfile in $symbolfiles
do
--
GitLab