[PATCH V2] BaseTools: Update Brotli and BrotliCompress mode and format

[PATCH V2] BaseTools: Update Brotli and BrotliCompress mode and format

[Song, BinX]

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>
---
 BaseTools/BinWrappers/PosixLike/Brotli         | 58 +++++++++---------
 BaseTools/BinWrappers/PosixLike/BrotliCompress | 84 +++++++++++++-------------
 2 files changed, 71 insertions(+), 71 deletions(-)
 mode change 100644 => 100755 BaseTools/BinWrappers/PosixLike/Brotli
 mode change 100644 => 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=${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")
-cmd=${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=${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")
+cmd=${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.<BR>
-# This program and the accompanying materials
-# 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
-# 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="--quality 9"
-
-while [ $# != 0 ];do
-  case $1 in
-    -d)
-      ARGS+="--decompress "
-    ;;
-    -e)
-    ;;
-    -g)
-      ARGS+="--gap $2 "
-      shift
-    ;;
-    -l)
-      LVL="--quality $2 "
-      shift
-    ;;
-    -o)
-      ARGS+="--output $2 "
-      shift
-    ;;
-    *)
-      ARGS+="--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.<BR>
+# This program and the accompanying materials
+# 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
+# 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="--quality 9"
+
+while [ $# != 0 ];do
+  case $1 in
+    -d)
+      ARGS+="--decompress "
+    ;;
+    -e)
+    ;;
+    -g)
+      ARGS+="--gap $2 "
+      shift
+    ;;
+    -l)
+      LVL="--quality $2 "
+      shift
+    ;;
+    -o)
+      ARGS+="--output $2 "
+      shift
+    ;;
+    *)
+      ARGS+="--input $1 "
+  esac
+
+shift
+done
+
+exec Brotli $ARGS $LVL
-- 
2.10.2.windows.1

Re: [PATCH V2] BaseTools: Update Brotli and BrotliCompress mode and format

[Gao, Liming]

Reviewed-by: Liming Gao <liming.gao@intel.com>

>-----Original Message-----
>From: Song, BinX
>Sent: Thursday, March 30, 2017 4:23 PM
>To: edk2-devel@lists.01.org
>Cc: Gao, Liming <liming.gao@intel.com>
>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 <liming.gao@intel.com>
>Contributed-under: TianoCore Contribution Agreement 1.0
>Signed-off-by: Bell Song <binx.song@intel.com>
>---
> BaseTools/BinWrappers/PosixLike/Brotli         | 58 +++++++++---------
> BaseTools/BinWrappers/PosixLike/BrotliCompress | 84 +++++++++++++------
>-------
> 2 files changed, 71 insertions(+), 71 deletions(-)
> mode change 100644 => 100755 BaseTools/BinWrappers/PosixLike/Brotli
> mode change 100644 => 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=${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")
>-cmd=${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=${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")
>+cmd=${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.<BR>
>-# This program and the accompanying materials
>-# 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
>-# 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="--quality 9"
>-
>-while [ $# != 0 ];do
>-  case $1 in
>-    -d)
>-      ARGS+="--decompress "
>-    ;;
>-    -e)
>-    ;;
>-    -g)
>-      ARGS+="--gap $2 "
>-      shift
>-    ;;
>-    -l)
>-      LVL="--quality $2 "
>-      shift
>-    ;;
>-    -o)
>-      ARGS+="--output $2 "
>-      shift
>-    ;;
>-    *)
>-      ARGS+="--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.<BR>
>+# This program and the accompanying materials
>+# 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
>+# 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="--quality 9"
>+
>+while [ $# != 0 ];do
>+  case $1 in
>+    -d)
>+      ARGS+="--decompress "
>+    ;;
>+    -e)
>+    ;;
>+    -g)
>+      ARGS+="--gap $2 "
>+      shift
>+    ;;
>+    -l)
>+      LVL="--quality $2 "
>+      shift
>+    ;;
>+    -o)
>+      ARGS+="--output $2 "
>+      shift
>+    ;;
>+    *)
>+      ARGS+="--input $1 "
>+  esac
>+
>+shift
>+done
>+
>+exec Brotli $ARGS $LVL
>--
>2.10.2.windows.1