diff options
Diffstat (limited to 'build.sh')
| -rw-r--r--[-rwxr-xr-x] | build.sh | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/build.sh b/build.sh index 1c28f5a255..c7c8d13465 100755..100644 --- a/build.sh +++ b/build.sh @@ -32,19 +32,19 @@ build_dir_CYGWIN() installer_Darwin() { - ls -1td "$(build_dir_Darwin ${last_built_variant:-Release})/newview/"*.dmg 2>/dev/null | sed 1q + ls -1td "$(build_dir_Darwin Release)/newview/"*.dmg 2>/dev/null | sed 1q } installer_Linux() { - ls -1td "$(build_dir_Linux ${last_built_variant:-Release})/newview/"*.tar.bz2 2>/dev/null | sed 1q + ls -1td "$(build_dir_Linux Release)/newview/"*.tar.bz2 2>/dev/null | sed 1q } installer_CYGWIN() { - d=$(build_dir_CYGWIN ${last_built_variant:-Release}) - p=$(sed 's:.*=::' "$d/newview/${last_built_variant:-Release}/touched.bat") - echo "$d/newview/${last_built_variant:-Release}/$p" + d=$(build_dir_CYGWIN Release) + p=$(sed 's:.*=::' "$d/newview/Release/touched.bat") + echo "$d/newview/Release/$p" } pre_build() @@ -65,7 +65,7 @@ pre_build() -DINSTALL_PROPRIETARY:BOOL=ON \ -DRELEASE_CRASH_REPORTING:BOOL=ON \ -DLOCALIZESETUP:BOOL=ON \ - -DPACKAGE:BOOL=ON \ + -DPACKAGE:BOOL=ON -DCMAKE_VERBOSE_MAKEFILE:BOOL=TRUE \ -DLL_TESTS:BOOL="$run_tests" end_section "Pre$variant" @@ -261,6 +261,7 @@ then begin_section "Build$variant" build_dir=`build_dir_$arch $variant` build_dir_stubs="$build_dir/win_setup/$variant" + cat "$build_dir/build.log" >> "$build_log" if `cat "$build_dir/build_ok"` then echo so far so good. |