BaseTools: Add --version option in Brotli and BrotliCompress

https://bugzilla.tianocore.org/show_bug.cgi?id=464
V2:
- Add build version

V1:
- Add --version option in Brotli and BrotliCompress

Cc: Liming Gao <liming.gao@intel.com>
Cc: Yonghong Zhu <yonghong.zhu@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>

diff --git a/BaseTools/BinWrappers/PosixLike/BrotliCompress b/BaseTools/BinWrappers/PosixLike/BrotliCompress
index 59c6465dadd0e48a40d8289c18db1786a68bc63d..49358b232984b777eb854535267eb6deae895ca0 100755 (executable)
--- a/BaseTools/BinWrappers/PosixLike/BrotliCompress
+++ b/BaseTools/BinWrappers/PosixLike/BrotliCompress
@@ -11,32 +11,43 @@
 # 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"
+QLT="-q 9"
+INPUTFLAG=0
 
 while [ $# != 0 ];do
   case $1 in
     -d)
-      ARGS+="--decompress "
+      INPUTFLAG=1
+      ARGS+="$1 "
     ;;
     -e)
+      INPUTFLAG=1
     ;;
     -g)
-      ARGS+="--gap $2 "
+      ARGS+="$1 $2 "
       shift
     ;;
-    -l)
-      LVL="--quality $2 "
+    -o)
+      ARGS+="$1 $2 "
       shift
     ;;
-    -o)
-      ARGS+="--output $2 "
+    -q)
+      QLT="$1 $2 "
       shift
     ;;
     *)
-      ARGS+="--input $1 "
+      if [ $INPUTFLAG -eq 1 ]
+      then
+        if [ -z $2 ]
+          then
+            ARGS+="$QLT -i $1 "
+            break;
+        fi
+      fi
+      ARGS+="$1 "
   esac
 
 shift
 done
 
-exec Brotli $ARGS $LVL
+exec Brotli $ARGS

diff --git a/BaseTools/Source/C/BrotliCompress/BrotliCompress.bat b/BaseTools/Source/C/BrotliCompress/BrotliCompress.bat
index 257bf1e9abf3ec8d16a7f5c7513ceffa14b88163..b291ff07f89e6b252fc8df8441c017f1e370aaad 100644 (file)
--- a/BaseTools/Source/C/BrotliCompress/BrotliCompress.bat
+++ b/BaseTools/Source/C/BrotliCompress/BrotliCompress.bat
@@ -14,48 +14,54 @@
 @echo off\r
 @setlocal\r
 \r
-set LVL=--quality 9\r
+set QLT=-q 9\r
+set INPUTFLAG=0\r
 \r
 :Begin\r
 if "%1"=="" goto End\r
 \r
 if "%1"=="-d" (\r
-  set ARGS=%ARGS% --decompress\r
-  shift\r
-  goto Begin\r
+  set INPUTFLAG=1\r
 )\r
 \r
 if "%1"=="-e" (\r
+  set INPUTFLAG=1\r
   shift\r
   goto Begin\r
 )\r
 \r
 if "%1"=="-g" (\r
-  set ARGS=%ARGS% --gap %2\r
+  set ARGS=%ARGS% %1 %2\r
   shift\r
   shift\r
   goto Begin\r
 )\r
 \r
-if "%1"=="-l" (\r
-  set LVL=--quality %2\r
+if "%1"=="-o" (\r
+  set ARGS=%ARGS% %1 %2\r
   shift\r
   shift\r
   goto Begin\r
 )\r
 \r
-if "%1"=="-o" (\r
-  set ARGS=%ARGS% --output %2\r
-  set INTMP=%2\r
+if "%1"=="-q" (\r
+  set QLT=%1 %2\r
   shift\r
   shift\r
   goto Begin\r
 )\r
 \r
-set ARGS=%ARGS% --input %1\r
+if %INPUTFLAG%==1 (\r
+ if "%2"=="" (\r
+    set ARGS=%ARGS% %QLT% -i %1\r
+    goto End\r
+  )\r
+)\r
+\r
+set ARGS=%ARGS% %1\r
 shift\r
 goto Begin\r
 \r
 :End\r
-Brotli %ARGS% %LVL%\r
+Brotli %ARGS%\r
 @echo on\r

diff --git a/BaseTools/Source/C/BrotliCompress/tools/bro.c b/BaseTools/Source/C/BrotliCompress/tools/bro.c
index 2fa9f05e7f21f68d73ea9dc4a1ac376fbede8b02..ef4592d420f43d90663202f3f135ec38a025eb28 100644 (file)
--- a/BaseTools/Source/C/BrotliCompress/tools/bro.c
+++ b/BaseTools/Source/C/BrotliCompress/tools/bro.c
@@ -13,6 +13,7 @@
 #include <sys/stat.h>\r
 #include <sys/types.h>\r
 #include <time.h>\r
+#include <Common/BuildVersion.h>\r
 \r
 #include "../dec/decode.h"\r
 #include "../enc/encode.h"\r
@@ -67,6 +68,11 @@ static int ParseQuality(const char* s, int* quality) {
   return 0;\r
 }\r
 \r
+#define UTILITY_NAME          "Brotli"\r
+#define UTILITY_MAJOR_VERSION 0\r
+#define UTILITY_MINOR_VERSION 5\r
+#define UTILITY_REVERSION     2\r
+\r
 static void ParseArgv(int argc, char **argv,\r
                       char **input_path,\r
                       char **output_path,\r
@@ -110,6 +116,15 @@ static void ParseArgv(int argc, char **argv,
       }\r
       *verbose = 1;\r
       continue;\r
+    } else if (!strcmp("--version", argv[k])) {\r
+      fprintf(stderr,\r
+              "%s Version %d.%d.%d %s\n",\r
+              UTILITY_NAME,\r
+              UTILITY_MAJOR_VERSION,\r
+              UTILITY_MINOR_VERSION,\r
+              UTILITY_REVERSION,\r
+              __BUILD_VERSION);\r
+      exit(1);\r
     }\r
     if (k < argc - 1) {\r
       if (!strcmp("--input", argv[k]) ||\r
@@ -177,7 +192,8 @@ error:
   fprintf(stderr,\r
           "Usage: %s [--force] [--quality n] [--gap n] [--decompress]"\r
           " [--input filename] [--output filename] [--repeat iters]"\r
-          " [--verbose] [--window n] [--custom-dictionary filename]\n",\r
+          " [--verbose] [--window n] [--custom-dictionary filename]"\r
+          " [--version]\n",\r
           argv[0]);\r
   exit(1);\r
 }\r