diff options
| author | Dave SIMmONs <simon@lindenlab.com> | 2011-04-15 15:57:57 -0700 |
|---|---|---|
| committer | Dave SIMmONs <simon@lindenlab.com> | 2011-04-15 15:57:57 -0700 |
| commit | ddd599b3473609788e430adf1895b12a5cb35375 (patch) | |
| tree | c41da37ab77e25cfc76d85448c51103a7b55e2ca /build.sh | |
| parent | ebe0c8204df30a85b8228e81acbcf7945c15220c (diff) | |
| parent | 411a1bfcb6e6f7c0bc6e8afcf8aed447426df340 (diff) | |
Merge
Diffstat (limited to 'build.sh')
| -rwxr-xr-x | build.sh | 20 |
1 files changed, 14 insertions, 6 deletions
@@ -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() |