From 5ca8e138be80f67c6be345436bfb9f4feb27c915 Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Mon, 23 Apr 2012 12:12:07 -0400
Subject: add debugging wrappers to check for dictionaries

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

(limited to 'build.sh')

diff --git a/build.sh b/build.sh
index c7c89fe3c2..90818009c3 100755
--- a/build.sh
+++ b/build.sh
@@ -59,6 +59,9 @@ pre_build()
     && [ -r "$master_message_template_checkout/message_template.msg" ] \
     && template_verifier_master_url="-DTEMPLATE_VERIFIER_MASTER_URL=file://$master_message_template_checkout/message_template.msg"
 
+    echo -n "Before 'autobuild configure' ${build_dir}/packages/dictionaries " 1>&2
+    (test -d "${build_dir}/packages/dictionaries" && 'found' || echo 'missing' ) 1>&2
+
     "$AUTOBUILD" configure -c $variant -- \
      -DPACKAGE:BOOL=ON \
      -DRELEASE_CRASH_REPORTING:BOOL=ON \
@@ -67,6 +70,10 @@ pre_build()
      -DGRID:STRING="\"$viewer_grid\"" \
      -DLL_TESTS:BOOL="$run_tests" \
      -DTEMPLATE_VERIFIER_OPTIONS:STRING="$template_verifier_options" $template_verifier_master_url
+
+    echo -n "After 'autobuild configure' ${build_dir}/packages/dictionaries " 1>&2
+    (test -d "${build_dir}/packages/dictionaries" && 'found' || echo 'missing' ) 1>&2
+
  end_section "Pre$variant"
 }
 
@@ -76,12 +83,19 @@ build()
   if $build_viewer
   then
     begin_section "Viewer$variant"
+
+    echo -n "Before 'autobuild build' ${build_dir}/packages/dictionaries " 1>&2
+    (test -d "${build_dir}/packages/dictionaries" && 'found' || echo 'missing' ) 1>&2
+
     if "$AUTOBUILD" build --no-configure -c $variant
     then
       echo true >"$build_dir"/build_ok
     else
       echo false >"$build_dir"/build_ok
     fi
+    echo -n "After 'autobuild build' ${build_dir}/packages/dictionaries " 1>&2
+    (test -d "${build_dir}/packages/dictionaries" && 'found' || echo 'missing' ) 1>&2
+
     end_section "Viewer$variant"
   fi
 }
@@ -177,9 +191,15 @@ eval "$("$AUTOBUILD" source_environment)"
 env|sort
 
 
+echo -n "Before 'autobuild install' ${build_dir}/packages/dictionaries " 1>&2
+(test -d "${build_dir}/packages/dictionaries" && 'found' || echo 'missing' ) 1>&2
+
 # Install packages.
 "$AUTOBUILD" install --skip-license-check
 
+echo -n "After 'autobuild install' ${build_dir}/packages/dictionaries " 1>&2
+(test -d "${build_dir}/packages/dictionaries" && 'found' || echo 'missing' ) 1>&2
+
 # Now run the build
 succeeded=true
 build_processes=
-- 
cgit v1.2.3


From e02bf8f90dba7cd7ac8874d7ee1baf782397784f Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Mon, 23 Apr 2012 14:00:25 -0400
Subject: add dictionaries to the Hunspell.cmake so that it gets installed

---
 build.sh | 27 +++++++++++++--------------
 1 file changed, 13 insertions(+), 14 deletions(-)

(limited to 'build.sh')

diff --git a/build.sh b/build.sh
index 90818009c3..c14fdc006f 100755
--- a/build.sh
+++ b/build.sh
@@ -15,6 +15,12 @@
 # * The basic convention is that the build name can be mapped onto a mercurial URL,
 #   which is also used as the "branch" name.
 
+check_for()
+{
+    if [ -e "$2" ]; then found_dict='FOUND'; else found_dict='MISSING'; fi
+    echo "$1 ${found_dict} '$2' " 1>&2
+}
+
 build_dir_Darwin()
 {
   echo build-darwin-i386
@@ -59,8 +65,7 @@ pre_build()
     && [ -r "$master_message_template_checkout/message_template.msg" ] \
     && template_verifier_master_url="-DTEMPLATE_VERIFIER_MASTER_URL=file://$master_message_template_checkout/message_template.msg"
 
-    echo -n "Before 'autobuild configure' ${build_dir}/packages/dictionaries " 1>&2
-    (test -d "${build_dir}/packages/dictionaries" && 'found' || echo 'missing' ) 1>&2
+    check_for "Before 'autobuild configure'" ${build_dir}/packages/dictionaries
 
     "$AUTOBUILD" configure -c $variant -- \
      -DPACKAGE:BOOL=ON \
@@ -71,10 +76,9 @@ pre_build()
      -DLL_TESTS:BOOL="$run_tests" \
      -DTEMPLATE_VERIFIER_OPTIONS:STRING="$template_verifier_options" $template_verifier_master_url
 
-    echo -n "After 'autobuild configure' ${build_dir}/packages/dictionaries " 1>&2
-    (test -d "${build_dir}/packages/dictionaries" && 'found' || echo 'missing' ) 1>&2
+    check_for "After 'autobuild configure'" ${build_dir}/packages/dictionaries
 
- end_section "Pre$variant"
+  end_section "Pre$variant"
 }
 
 build()
@@ -84,8 +88,7 @@ build()
   then
     begin_section "Viewer$variant"
 
-    echo -n "Before 'autobuild build' ${build_dir}/packages/dictionaries " 1>&2
-    (test -d "${build_dir}/packages/dictionaries" && 'found' || echo 'missing' ) 1>&2
+    check_for "Before 'autobuild build'" ${build_dir}/packages/dictionaries
 
     if "$AUTOBUILD" build --no-configure -c $variant
     then
@@ -93,8 +96,7 @@ build()
     else
       echo false >"$build_dir"/build_ok
     fi
-    echo -n "After 'autobuild build' ${build_dir}/packages/dictionaries " 1>&2
-    (test -d "${build_dir}/packages/dictionaries" && 'found' || echo 'missing' ) 1>&2
+    check_for "After 'autobuild configure'" ${build_dir}/packages/dictionaries
 
     end_section "Viewer$variant"
   fi
@@ -190,15 +192,12 @@ eval "$("$AUTOBUILD" source_environment)"
 # dump environment variables for debugging
 env|sort
 
-
-echo -n "Before 'autobuild install' ${build_dir}/packages/dictionaries " 1>&2
-(test -d "${build_dir}/packages/dictionaries" && 'found' || echo 'missing' ) 1>&2
+check_for "Before 'autobuild install'" ${build_dir}/packages/dictionaries
 
 # Install packages.
 "$AUTOBUILD" install --skip-license-check
 
-echo -n "After 'autobuild install' ${build_dir}/packages/dictionaries " 1>&2
-(test -d "${build_dir}/packages/dictionaries" && 'found' || echo 'missing' ) 1>&2
+check_for "After 'autobuild install'" ${build_dir}/packages/dictionaries
 
 # Now run the build
 succeeded=true
-- 
cgit v1.2.3