Merge pull request #1481 from stweil/version

training: Support new argument --version for remaining executables
tesseract-ocr · Apr 16, 2018 · 69c8292 · 69c8292
2 parents a07ee5c + 0998bcf
commit 69c8292
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 18 deletions.
diff --git a/training/ambiguous_words.cpp b/training/ambiguous_words.cpp
@@ -21,8 +21,6 @@
 ///////////////////////////////////////////////////////////////////////
 //
 
-#include <stdio.h>
-
 #include "baseapi.h"
 #include "commontraining.h"     // CheckSharedLibraryVersion
 #include "helpers.h"
@@ -34,9 +32,12 @@ int main(int argc, char** argv) {
   tesseract::CheckSharedLibraryVersion();
 
   // Parse input arguments.
-  if (argc != 4 && (argc != 6 || strcmp(argv[1], "-l") != 0)) {
-    printf("Usage: %s [-l lang] tessdata_dir wordlist_file"
-           " output_ambiguous_wordlist_file\n", argv[0]);
+  if (argc > 1 && !strcmp(argv[1], "--version")) {
+    printf("%s\n", tesseract::TessBaseAPI::Version());
+    return 0;
+  } else if (argc != 4 && (argc != 6 || strcmp(argv[1], "-l") != 0)) {
+    printf("Usage: %s --version | %s [-l lang] tessdata_dir wordlist_file"
+           " output_ambiguous_wordlist_file\n", argv[0], argv[0]);
     return 1;
   }
   int argv_offset = 0;

diff --git a/training/combine_tessdata.cpp b/training/combine_tessdata.cpp
@@ -70,7 +70,10 @@ int main(int argc, char **argv) {
 
   int i;
   tesseract::TessdataManager tm;
-  if (argc == 2) {
+  if (argc > 1 && !strcmp(argv[1], "--version")) {
+    printf("%s\n", tesseract::TessBaseAPI::Version());
+    return 0;
+  } else if (argc == 2) {
     printf("Combining tessdata files\n");
     STRING lang = argv[1];
     char* last = &argv[1][strlen(argv[1])-1];

diff --git a/training/dawg2wordlist.cpp b/training/dawg2wordlist.cpp
@@ -75,10 +75,13 @@ int WriteDawgAsWordlist(const UNICHARSET &unicharset,
 int main(int argc, char *argv[]) {
   tesseract::CheckSharedLibraryVersion();
 
-  if (argc != 4) {
+  if (argc > 1 && !strcmp(argv[1], "--version")) {
+    printf("%s\n", tesseract::TessBaseAPI::Version());
+    return 0;
+  } else if (argc != 4) {
     tprintf("Print all the words in a given dawg.\n");
-    tprintf("Usage: %s <unicharset> <dawgfile> <wordlistfile>\n",
-            argv[0]);
+    tprintf("Usage: %s --version | %s <unicharset> <dawgfile> <wordlistfile>\n",
+            argv[0], argv[0]);
     return 1;
   }
   const char *unicharset_file = argv[1];

diff --git a/training/merge_unicharsets.cpp b/training/merge_unicharsets.cpp
@@ -23,11 +23,15 @@
 int main(int argc, char** argv) {
   tesseract::CheckSharedLibraryVersion();
 
-  // Print usage
-  if (argc < 4) {
-    printf("Usage: %s unicharset-in-1 ... unicharset-in-n unicharset-out\n",
-           argv[0]);
-    exit(1);
+  if (argc > 1 && !strcmp(argv[1], "--version")) {
+    printf("%s\n", tesseract::TessBaseAPI::Version());
+    return 0;
+  } else if (argc < 4) {
+    // Print usage
+    printf("Usage: %s --version |\n"
+           "       %s unicharset-in-1 ... unicharset-in-n unicharset-out\n",
+           argv[0], argv[0]);
+    return 1;
   }
 
   UNICHARSET input_unicharset, result_unicharset;

diff --git a/training/wordlist2dawg.cpp b/training/wordlist2dawg.cpp
@@ -33,10 +33,14 @@
 int main(int argc, char** argv) {
   tesseract::CheckSharedLibraryVersion();
 
-  if (!(argc == 4 || (argc == 5 && strcmp(argv[1], "-t") == 0) ||
-      (argc == 6 && strcmp(argv[1], "-r") == 0))) {
-    printf("Usage: %s [-t | -r [reverse policy] ] word_list_file"
-           " dawg_file unicharset_file\n", argv[0]);
+  if (argc > 1 && !strcmp(argv[1], "--version")) {
+    printf("%s\n", tesseract::TessBaseAPI::Version());
+    return 0;
+  } else if (!(argc == 4 || (argc == 5 && strcmp(argv[1], "-t") == 0) ||
+             (argc == 6 && strcmp(argv[1], "-r") == 0))) {
+    printf("Usage: %s --version |\n"
+           "       %s [-t | -r [reverse policy] ] word_list_file"
+           " dawg_file unicharset_file\n", argv[0], argv[0]);
     return 1;
   }
   tesseract::Classify *classify = new tesseract::Classify();