From 44ad672b9e0a5ba1eef3ef7c71da3eb887f4fe0a Mon Sep 17 00:00:00 2001
From: "Christian Goetze (CG)" <cg@lindenlab.com>
Date: Thu, 31 Mar 2011 15:43:47 -0700
Subject: Apply server side code to message template verification onto the
 viewer tree.

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

(limited to 'build.sh')

diff --git a/build.sh b/build.sh
index 1c28f5a255..92c2222c73 100755
--- a/build.sh
+++ b/build.sh
@@ -53,6 +53,8 @@ pre_build()
   local build_dir="$2"
   begin_section "Pre$variant"
   #export PATH="/cygdrive/c/Program Files/Microsoft Visual Studio 8/Common7/IDE/:$PATH"
+  [ -n "$master_message_template_checkout" ] && [ -r "$master_message_template_checkout/message_template.msg" ]\
+   && template_verifier_master_url="-DTEMPLATE_VERIFIER_MASTER_URL=file://$master_message_template_checkout/message_template.msg"
   python develop.py \
     --incredibuild \
     --unattended \
@@ -67,7 +69,8 @@ pre_build()
     -DLOCALIZESETUP:BOOL=ON \
     -DPACKAGE:BOOL=ON \
     -DCMAKE_VERBOSE_MAKEFILE:BOOL=TRUE \
-    -DLL_TESTS:BOOL="$run_tests"
+    -DLL_TESTS:BOOL="$run_tests" \
+    -DTEMPLATE_VERIFIER_OPTIONS:STRING="$template_verifier_options" $template_verifier_master_url
   end_section "Pre$variant"
 }
 
-- 
cgit v1.2.3


From 983b49c31652b00f0659ef1a5a5d189681b1a826 Mon Sep 17 00:00:00 2001
From: Aaron Stone <stone@lindenlab.com>
Date: Fri, 1 Apr 2011 16:10:35 -0700
Subject: Attempt at fixing build.sh and improving readability.

---
 build.sh | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

(limited to 'build.sh')

diff --git a/build.sh b/build.sh
index cb5f74fb3c..6677958716 100755
--- a/build.sh
+++ b/build.sh
@@ -51,12 +51,20 @@ pre_build()
 {
   local variant="$1"
   begin_section "Pre$variant"
-    "$AUTOBUILD" configure -c $variant -- -DPACKAGE:BOOL=ON -DRELEASE_CRASH_REPORTING:BOOL=ON -DUSE_PRECOMPILED_HEADERS=FALSE "-DVIEWER_CHANNEL:STRING=\"$viewer_channel\"" "-DVIEWER_LOGIN_CHANNEL:STRING=\"$viewer_login_channel\""
-  [ -n "$master_message_template_checkout" ] && [ -r "$master_message_template_checkout/message_template.msg" ]\
-   && template_verifier_master_url="-DTEMPLATE_VERIFIER_MASTER_URL=file://$master_message_template_checkout/message_template.msg"
-    -DLL_TESTS:BOOL="$run_tests" \
-    -DTEMPLATE_VERIFIER_OPTIONS:STRING="$template_verifier_options" $template_verifier_master_url
-  end_section "Pre$variant"
+    [ -n "$master_message_template_checkout" ] \
+    && [ -r "$master_message_template_checkout/message_template.msg" ] \
+    && template_verifier_master_url="-DTEMPLATE_VERIFIER_MASTER_URL=file://$master_message_template_checkout/message_template.msg"
+
+    "$AUTOBUILD" configure -c $variant -- \
+     -DPACKAGE:BOOL=ON \
+     -DRELEASE_CRASH_REPORTING:BOOL=ON \
+     -DUSE_PRECOMPILED_HEADERS=FALSE \
+     -DVIEWER_CHANNEL:STRING="\"$viewer_channel\"" \
+     -DVIEWER_LOGIN_CHANNEL:STRING="\"$viewer_login_channel\"" \
+     -DGRID:STRING="\"$viewer_grid\"" \
+     -DLL_TESTS:BOOL="$run_tests" \
+     -DTEMPLATE_VERIFIER_OPTIONS:STRING="$template_verifier_options" $template_verifier_master_url
+ end_section "Pre$variant"
 }
 
 build()
-- 
cgit v1.2.3