BaseTools: Update Brotli and BrotliCompress mode and format

V2:
- Update correct patch info

V1:
- Add x mode for Brotli and BrotliCompress
- Change Brotli and BrotliCompress format from DOS to UNIX

Cc: Liming Gao <liming.gao@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Bell Song <binx.song@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>
This commit is contained in:
Song, BinX 2017-03-30 16:23:10 +08:00 committed by Hao Wu
parent 251779fca7
commit de87f23291
2 changed files with 71 additions and 71 deletions

58
BaseTools/BinWrappers/PosixLike/Brotli Normal file → Executable file
View File

@ -1,29 +1,29 @@
#!/usr/bin/env bash #!/usr/bin/env bash
full_cmd=${BASH_SOURCE:-$0} # see http://mywiki.wooledge.org/BashFAQ/028 for a discussion of why $0 is not a good choice here full_cmd=${BASH_SOURCE:-$0} # see http://mywiki.wooledge.org/BashFAQ/028 for a discussion of why $0 is not a good choice here
dir=$(dirname "$full_cmd") dir=$(dirname "$full_cmd")
cmd=${full_cmd##*/} cmd=${full_cmd##*/}
if [ -n "$WORKSPACE" ] && [ -e "$WORKSPACE/Conf/BaseToolsCBinaries" ] if [ -n "$WORKSPACE" ] && [ -e "$WORKSPACE/Conf/BaseToolsCBinaries" ]
then then
exec "$WORKSPACE/Conf/BaseToolsCBinaries/$cmd" exec "$WORKSPACE/Conf/BaseToolsCBinaries/$cmd"
elif [ -n "$WORKSPACE" ] && [ -e "$EDK_TOOLS_PATH/Source/C" ] elif [ -n "$WORKSPACE" ] && [ -e "$EDK_TOOLS_PATH/Source/C" ]
then then
if [ ! -e "$EDK_TOOLS_PATH/Source/C/bin/$cmd" ] if [ ! -e "$EDK_TOOLS_PATH/Source/C/bin/$cmd" ]
then then
echo "BaseTools C Tool binary was not found ($cmd)" echo "BaseTools C Tool binary was not found ($cmd)"
echo "You may need to run:" echo "You may need to run:"
echo " make -C $EDK_TOOLS_PATH/Source/C" echo " make -C $EDK_TOOLS_PATH/Source/C"
else else
exec "$EDK_TOOLS_PATH/Source/C/bin/$cmd" "$@" exec "$EDK_TOOLS_PATH/Source/C/bin/$cmd" "$@"
fi fi
elif [ -e "$dir/../../Source/C/bin/$cmd" ] elif [ -e "$dir/../../Source/C/bin/$cmd" ]
then then
exec "$dir/../../Source/C/bin/$cmd" "$@" exec "$dir/../../Source/C/bin/$cmd" "$@"
else else
echo "Unable to find the real '$cmd' to run" echo "Unable to find the real '$cmd' to run"
echo "This message was printed by" echo "This message was printed by"
echo " $0" echo " $0"
exit 127 exit 127
fi fi

84
BaseTools/BinWrappers/PosixLike/BrotliCompress Normal file → Executable file
View File

@ -1,42 +1,42 @@
#!/usr/bin/env bash #!/usr/bin/env bash
# #
# This script will exec Brotli tool. # This script will exec Brotli tool.
# #
# Copyright (c) 2017, Intel Corporation. All rights reserved.<BR> # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
# This program and the accompanying materials # This program and the accompanying materials
# are licensed and made available under the terms and conditions of the BSD License # are licensed and made available under the terms and conditions of the BSD License
# which accompanies this distribution. The full text of the license may be found at # which accompanies this distribution. The full text of the license may be found at
# http://opensource.org/licenses/bsd-license.php # http://opensource.org/licenses/bsd-license.php
# #
# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, # THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. # WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
# #
LVL="--quality 9" LVL="--quality 9"
while [ $# != 0 ];do while [ $# != 0 ];do
case $1 in case $1 in
-d) -d)
ARGS+="--decompress " ARGS+="--decompress "
;; ;;
-e) -e)
;; ;;
-g) -g)
ARGS+="--gap $2 " ARGS+="--gap $2 "
shift shift
;; ;;
-l) -l)
LVL="--quality $2 " LVL="--quality $2 "
shift shift
;; ;;
-o) -o)
ARGS+="--output $2 " ARGS+="--output $2 "
shift shift
;; ;;
*) *)
ARGS+="--input $1 " ARGS+="--input $1 "
esac esac
shift shift
done done
exec Brotli $ARGS $LVL exec Brotli $ARGS $LVL