diff options
author | Oz Linden <oz@lindenlab.com> | 2011-04-01 09:32:08 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2011-04-01 09:32:08 -0400 |
commit | e23eeb7ed20055e1a95ea87e0014ba141f4ab0bb (patch) | |
tree | 121a9ac847173773cccc0660ebe54ffeb44491b3 /build.sh | |
parent | e0ca936fbf7411bcc1cdd935a50c5913db6a1cb9 (diff) | |
parent | 9698314736252b248921bb3a3459f2bdf539ffba (diff) |
merge changes for storm-1072
Diffstat (limited to 'build.sh')
-rwxr-xr-x | build.sh | 5 |
1 files changed, 4 insertions, 1 deletions
@@ -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" } |