diff options
| author | trav90 <travawine@palemoon.org> | 2018-10-17 22:56:27 -0500 |
|---|---|---|
| committer | trav90 <travawine@palemoon.org> | 2018-10-17 22:56:27 -0500 |
| commit | afda5e384c924ed1f7eb87c1829f112f0bb8c0f0 (patch) | |
| tree | 8e693278605f71423d7ed50b9a61b58e4f92c703 | |
| parent | dddc2aa9ec0bf7c70910f9846667da2691cd2c2f (diff) | |
| download | UXP-afda5e384c924ed1f7eb87c1829f112f0bb8c0f0.tar UXP-afda5e384c924ed1f7eb87c1829f112f0bb8c0f0.tar.gz UXP-afda5e384c924ed1f7eb87c1829f112f0bb8c0f0.tar.lz UXP-afda5e384c924ed1f7eb87c1829f112f0bb8c0f0.tar.xz UXP-afda5e384c924ed1f7eb87c1829f112f0bb8c0f0.zip | |
[av1] Clean up duplicate filenames check
| -rwxr-xr-x | media/libaom/generate_sources_mozbuild.sh | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/media/libaom/generate_sources_mozbuild.sh b/media/libaom/generate_sources_mozbuild.sh index a8c0ba83a..f30e2e253 100755 --- a/media/libaom/generate_sources_mozbuild.sh +++ b/media/libaom/generate_sources_mozbuild.sh @@ -29,24 +29,23 @@ function write_license { # The build does not support duplicate file names. function find_duplicates { local readonly duplicate_file_names=$(find \ - $BASE_DIR/$LIBAOM_SRC_DIR/vp8 \ - $BASE_DIR/$LIBAOM_SRC_DIR/vp9 \ - $BASE_DIR/$LIBAOM_SRC_DIR/av1 \ $BASE_DIR/$LIBAOM_SRC_DIR/aom \ $BASE_DIR/$LIBAOM_SRC_DIR/aom_dsp \ - -type f -name \*.c | xargs -I {} basename {} | sort | uniq -d \ + $BASE_DIR/$LIBAOM_SRC_DIR/av1 \ + -type f -name \*.c -o -name \*.asm | \ + xargs -I {} basename -s .c {} | \ + xargs -I {} basename -s .asm {} | \ + sort | uniq -d \ ) if [ -n "${duplicate_file_names}" ]; then echo "ERROR: DUPLICATE FILES FOUND" for file in ${duplicate_file_names}; do find \ - $BASE_DIR/$LIBAOM_SRC_DIR/vp8 \ - $BASE_DIR/$LIBAOM_SRC_DIR/vp9 \ - $BASE_DIR/$LIBAOM_SRC_DIR/av1 \ $BASE_DIR/$LIBAOM_SRC_DIR/aom \ $BASE_DIR/$LIBAOM_SRC_DIR/aom_dsp \ - -name $file + $BASE_DIR/$LIBAOM_SRC_DIR/av1 \ + -name $file\.* done exit 1 fi |