From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 4AEA020D2C3B9 for ; Thu, 30 Mar 2017 01:39:54 -0700 (PDT) Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga105.fm.intel.com with ESMTP; 30 Mar 2017 01:39:53 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.36,245,1486454400"; d="scan'208";a="1128824488" Received: from fmsmsx106.amr.corp.intel.com ([10.18.124.204]) by fmsmga001.fm.intel.com with ESMTP; 30 Mar 2017 01:39:53 -0700 Received: from fmsmsx120.amr.corp.intel.com (10.18.124.208) by FMSMSX106.amr.corp.intel.com (10.18.124.204) with Microsoft SMTP Server (TLS) id 14.3.319.2; Thu, 30 Mar 2017 01:39:53 -0700 Received: from shsmsx103.ccr.corp.intel.com (10.239.4.69) by fmsmsx120.amr.corp.intel.com (10.18.124.208) with Microsoft SMTP Server (TLS) id 14.3.319.2; Thu, 30 Mar 2017 01:39:53 -0700 Received: from shsmsx102.ccr.corp.intel.com ([169.254.2.212]) by SHSMSX103.ccr.corp.intel.com ([169.254.4.253]) with mapi id 14.03.0248.002; Thu, 30 Mar 2017 16:39:51 +0800 From: "Gao, Liming" To: "Song, BinX" , "edk2-devel@lists.01.org" , Michael Zimmermann Thread-Topic: [PATCH V2] BaseTools: Update Brotli and BrotliCompress mode and format Thread-Index: AdKpLt1kVWLb29hOQxCrid1HQPtjUgAAjiUQ Date: Thu, 30 Mar 2017 08:39:50 +0000 Message-ID: <4A89E2EF3DFEDB4C8BFDE51014F606A14D706B9B@shsmsx102.ccr.corp.intel.com> References: <559D2DF22BC9A3468B4FA1AA547F0EF10255110B@shsmsx102.ccr.corp.intel.com> In-Reply-To: <559D2DF22BC9A3468B4FA1AA547F0EF10255110B@shsmsx102.ccr.corp.intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Subject: Re: [PATCH V2] BaseTools: Update Brotli and BrotliCompress mode and format X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 30 Mar 2017 08:39:54 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Liming Gao >-----Original Message----- >From: Song, BinX >Sent: Thursday, March 30, 2017 4:23 PM >To: edk2-devel@lists.01.org >Cc: Gao, Liming >Subject: [PATCH V2] 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 >Contributed-under: TianoCore Contribution Agreement 1.0 >Signed-off-by: Bell Song >--- > BaseTools/BinWrappers/PosixLike/Brotli | 58 +++++++++--------- > BaseTools/BinWrappers/PosixLike/BrotliCompress | 84 +++++++++++++------ >------- > 2 files changed, 71 insertions(+), 71 deletions(-) > mode change 100644 =3D> 100755 BaseTools/BinWrappers/PosixLike/Brotli > mode change 100644 =3D> 100755 >BaseTools/BinWrappers/PosixLike/BrotliCompress > >diff --git a/BaseTools/BinWrappers/PosixLike/Brotli >b/BaseTools/BinWrappers/PosixLike/Brotli >old mode 100644 >new mode 100755 >index a244ecc..0945d86 >--- a/BaseTools/BinWrappers/PosixLike/Brotli >+++ b/BaseTools/BinWrappers/PosixLike/Brotli >@@ -1,29 +1,29 @@ >-#!/usr/bin/env bash >- >-full_cmd=3D${BASH_SOURCE:-$0} # see >http://mywiki.wooledge.org/BashFAQ/028 for a discussion of why $0 is not a >good choice here >-dir=3D$(dirname "$full_cmd") >-cmd=3D${full_cmd##*/} >- >-if [ -n "$WORKSPACE" ] && [ -e "$WORKSPACE/Conf/BaseToolsCBinaries" ] >-then >- exec "$WORKSPACE/Conf/BaseToolsCBinaries/$cmd" >-elif [ -n "$WORKSPACE" ] && [ -e "$EDK_TOOLS_PATH/Source/C" ] >-then >- if [ ! -e "$EDK_TOOLS_PATH/Source/C/bin/$cmd" ] >- then >- echo "BaseTools C Tool binary was not found ($cmd)" >- echo "You may need to run:" >- echo " make -C $EDK_TOOLS_PATH/Source/C" >- else >- exec "$EDK_TOOLS_PATH/Source/C/bin/$cmd" "$@" >- fi >-elif [ -e "$dir/../../Source/C/bin/$cmd" ] >-then >- exec "$dir/../../Source/C/bin/$cmd" "$@" >-else >- echo "Unable to find the real '$cmd' to run" >- echo "This message was printed by" >- echo " $0" >- exit 127 >-fi >- >+#!/usr/bin/env bash >+ >+full_cmd=3D${BASH_SOURCE:-$0} # see >http://mywiki.wooledge.org/BashFAQ/028 for a discussion of why $0 is not a >good choice here >+dir=3D$(dirname "$full_cmd") >+cmd=3D${full_cmd##*/} >+ >+if [ -n "$WORKSPACE" ] && [ -e "$WORKSPACE/Conf/BaseToolsCBinaries" ] >+then >+ exec "$WORKSPACE/Conf/BaseToolsCBinaries/$cmd" >+elif [ -n "$WORKSPACE" ] && [ -e "$EDK_TOOLS_PATH/Source/C" ] >+then >+ if [ ! -e "$EDK_TOOLS_PATH/Source/C/bin/$cmd" ] >+ then >+ echo "BaseTools C Tool binary was not found ($cmd)" >+ echo "You may need to run:" >+ echo " make -C $EDK_TOOLS_PATH/Source/C" >+ else >+ exec "$EDK_TOOLS_PATH/Source/C/bin/$cmd" "$@" >+ fi >+elif [ -e "$dir/../../Source/C/bin/$cmd" ] >+then >+ exec "$dir/../../Source/C/bin/$cmd" "$@" >+else >+ echo "Unable to find the real '$cmd' to run" >+ echo "This message was printed by" >+ echo " $0" >+ exit 127 >+fi >+ >diff --git a/BaseTools/BinWrappers/PosixLike/BrotliCompress >b/BaseTools/BinWrappers/PosixLike/BrotliCompress >old mode 100644 >new mode 100755 >index a571ff6..59c6465 >--- a/BaseTools/BinWrappers/PosixLike/BrotliCompress >+++ b/BaseTools/BinWrappers/PosixLike/BrotliCompress >@@ -1,42 +1,42 @@ >-#!/usr/bin/env bash >-# >-# This script will exec Brotli tool. >-# >-# Copyright (c) 2017, Intel Corporation. All rights reserved.
>-# This program and the accompanying materials >-# are licensed and made available under the terms and conditions of the B= SD >License >-# which accompanies this distribution. The full text of the license may = be >found at >-# http://opensource.org/licenses/bsd-license.php >-# >-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" >BASIS, >-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER >EXPRESS OR IMPLIED. >-# >-LVL=3D"--quality 9" >- >-while [ $# !=3D 0 ];do >- case $1 in >- -d) >- ARGS+=3D"--decompress " >- ;; >- -e) >- ;; >- -g) >- ARGS+=3D"--gap $2 " >- shift >- ;; >- -l) >- LVL=3D"--quality $2 " >- shift >- ;; >- -o) >- ARGS+=3D"--output $2 " >- shift >- ;; >- *) >- ARGS+=3D"--input $1 " >- esac >- >-shift >-done >- >-exec Brotli $ARGS $LVL >+#!/usr/bin/env bash >+# >+# This script will exec Brotli tool. >+# >+# Copyright (c) 2017, Intel Corporation. All rights reserved.
>+# This program and the accompanying materials >+# are licensed and made available under the terms and conditions of the B= SD >License >+# which accompanies this distribution. The full text of the license may = be >found at >+# http://opensource.org/licenses/bsd-license.php >+# >+# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" >BASIS, >+# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER >EXPRESS OR IMPLIED. >+# >+LVL=3D"--quality 9" >+ >+while [ $# !=3D 0 ];do >+ case $1 in >+ -d) >+ ARGS+=3D"--decompress " >+ ;; >+ -e) >+ ;; >+ -g) >+ ARGS+=3D"--gap $2 " >+ shift >+ ;; >+ -l) >+ LVL=3D"--quality $2 " >+ shift >+ ;; >+ -o) >+ ARGS+=3D"--output $2 " >+ shift >+ ;; >+ *) >+ ARGS+=3D"--input $1 " >+ esac >+ >+shift >+done >+ >+exec Brotli $ARGS $LVL >-- >2.10.2.windows.1