From 79459bc9ba8cefa67091e65dd676f50c9ddc612d Mon Sep 17 00:00:00 2001
From: CG Linden <cg@lindenlab.com>
Date: Tue, 17 May 2011 11:06:33 -0400
Subject: [PATCH] Restore reference to $last_built_variant when computing path
to the Windows Installer
---
build.sh | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/build.sh b/build.sh
index b322d30daf4..4268c76e78a 100755
--- a/build.sh
+++ b/build.sh
@@ -32,19 +32,23 @@ build_dir_CYGWIN()
installer_Darwin()
{
- ls -1td "$(build_dir_Darwin 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 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 Release)
- p=$(sed 's:.*=::' "$d/newview/Release/touched.bat")
- echo "$d/newview/Release/$p"
+ v=${last_built_variant:-Release}
+ d=$(build_dir_CYGWIN $v)
+ if [ -r "$d/newview/$v/touched.bat" ]
+ then
+ p=$(sed 's:.*=::' "$d/newview/$v/touched.bat")
+ echo "$d/newview/$v/$p"
+ fi
}
pre_build()
--
GitLab