From 653d4760e28a068e24b8ac4baa08e8f7a0db54ad Mon Sep 17 00:00:00 2001
From: Leyla Farazha <leyla@lindenlab.com>
Date: Fri, 3 Sep 2010 13:51:30 -0700
Subject: updating build.sh to use the grid argument

---
 build.sh | 1 +
 1 file changed, 1 insertion(+)

(limited to 'build.sh')

diff --git a/build.sh b/build.sh
index 878aa45ce3..806e0fada7 100755
--- a/build.sh
+++ b/build.sh
@@ -59,6 +59,7 @@ pre_build()
     -t $variant \
     -G "$cmake_generator" \
    configure \
+	-DGRID:STRING="$viewer_grid" \
     -DVIEWER_CHANNEL:STRING="$viewer_channel" \
     -DVIEWER_LOGIN_CHANNEL:STRING="$login_channel" \
     -DINSTALL_PROPRIETARY:BOOL=ON \
-- 
cgit v1.2.3


From 48c2b2496d3ed6aeeebb0bc8950725f8ef7e305f Mon Sep 17 00:00:00 2001
From: "Christian Goetze (CG)" <cg@lindenlab.com>
Date: Fri, 8 Oct 2010 13:02:39 -0700
Subject: Have build.sh print out info usable by open source devs. Have it
 check for a README and use that if needed.

---
 build.sh | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'build.sh')

diff --git a/build.sh b/build.sh
index 25ff0f368d..9b4d4a16dc 100755
--- a/build.sh
+++ b/build.sh
@@ -114,11 +114,15 @@ then
   if [ -x "$top/../buildscripts/hg/bin/build.sh" ]
   then
     exec "$top/../buildscripts/hg/bin/build.sh" "$top"
+  elif [ -r "$top/README" ]
+  then
+    cat "$top/README"
+    exit 1
   else
     cat <<EOF
 This script, if called in a development environment, requires that the branch
 independent build script repository be checked out next to this repository.
-This repository is located at http://hg.lindenlab.com/parabuild/buildscripts
+This repository is located at http://hg.secondlife.com/buildscripts
 EOF
     exit 1
   fi
-- 
cgit v1.2.3


From 4902a2752e6ee5dfd47be3d94955f88bf73bf5d8 Mon Sep 17 00:00:00 2001
From: brad kittenbrink <brad@lindenlab.com>
Date: Tue, 2 Nov 2010 19:01:27 -0700
Subject: Bugfix for build.sh overwriting log files when build-link-parallel is
 disabled.

---
 build.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'build.sh')

diff --git a/build.sh b/build.sh
index b372168f98..f9c6beefed 100755
--- a/build.sh
+++ b/build.sh
@@ -228,7 +228,7 @@ do
       fi
     else
       begin_section "Build$variant"
-      build "$variant" "$build_dir" > "$build_log" 2>&1
+      build "$variant" "$build_dir" >> "$build_log" 2>&1
       begin_section Tests
       grep --line-buffered "^##teamcity" "$build_log"
       end_section Tests
-- 
cgit v1.2.3