From 0186ebda84d9d94779577c1ee78ef70fe3157316 Mon Sep 17 00:00:00 2001 From: Yi Luo Date: Wed, 10 Jan 2018 12:28:30 -0800 Subject: [PATCH] Use cmake instead of configure Change-Id: I07267eb6a7ac9b96325433a7d3ff6b1d68365df3 --- scripts/BasketballDrill_480p.sh | 2 +- scripts/aom_nightly_config.sh | 16 +++------------- scripts/aomenc_nightly_speed.sh | 2 +- 3 files changed, 5 insertions(+), 15 deletions(-) diff --git a/scripts/BasketballDrill_480p.sh b/scripts/BasketballDrill_480p.sh index 13fae9533..3c9d594a5 100644 --- a/scripts/BasketballDrill_480p.sh +++ b/scripts/BasketballDrill_480p.sh @@ -1,7 +1,7 @@ #!/bin/sh video=~/Dev/samples/videos/midres/BasketballDrill_832x480_50.y4m -frames=2 +frames=60 bitrate=800 fps="50/1" wide= diff --git a/scripts/aom_nightly_config.sh b/scripts/aom_nightly_config.sh index 6f0635354..29056f5a4 100755 --- a/scripts/aom_nightly_config.sh +++ b/scripts/aom_nightly_config.sh @@ -1,23 +1,13 @@ #!/bin/sh #set -x -platform=x86_64-linux-gcc -codec=--enable-av1 libsrc=aom test_dir=~/Dev/nightly -script_dir=~/Dev/sandbox/libvpx/scripts -tool= -common="--disable-unit-tests --disable-docs" -debug= +echo "cmake ../$libsrc -DCONFIG_UNIT_TESTS=0 -DENABLE_DOCS=0" -#. $script_dir/disabled_list.sh -disabled= - -echo ../$libsrc/configure $common $debug $disabled $tool - -../$libsrc/configure $common $debug $disabled $tool > /dev/null +cmake ../$libsrc -DCONFIG_UNIT_TESTS=0 -DENABLE_DOCS=0 > /dev/null 2>&1 if [ $? -ne 0 ]; then - echo "Error: configure fails!" > $test_dir/aom_error_config.txt + echo "Error: cmake configure fails!" > $test_dir/aom_error_config.txt exit 1 fi diff --git a/scripts/aomenc_nightly_speed.sh b/scripts/aomenc_nightly_speed.sh index 63496b765..bb54dffd7 100755 --- a/scripts/aomenc_nightly_speed.sh +++ b/scripts/aomenc_nightly_speed.sh @@ -44,7 +44,7 @@ $script_path/aom_nightly_speed.sh $av1_code $pdfps $petime $speed $html_log_file users=luoyi host_name=`hostname` sender=luoyi -#cc_list="--cc=yunqingwang,vpx-eng" +cc_list="--cc=yunqingwang,vpx-eng" $script_path/gen_html_footer.sh >> $log_path/$html_log_file -- 2.40.0