From c81f1710fef57b952e1272f4126407e04c2e2d92 Mon Sep 17 00:00:00 2001
From: Dwayne Boone <dwayne@zeroc.com>
Date: Tue, 7 Jul 2015 12:31:56 -0230
Subject: ICE-6469 added --validate option to Slice compilers

---
 cpp/src/slice2java/Main.cpp | 42 +++++++++++++++++++++++++++++++++++++++---
 1 file changed, 39 insertions(+), 3 deletions(-)

(limited to 'cpp/src/slice2java')

diff --git a/cpp/src/slice2java/Main.cpp b/cpp/src/slice2java/Main.cpp
index 08260523a77..de53ef640da 100644
--- a/cpp/src/slice2java/Main.cpp
+++ b/cpp/src/slice2java/Main.cpp
@@ -62,6 +62,7 @@ usage(const char* n)
         "Options:\n"
         "-h, --help              Show this message.\n"
         "-v, --version           Display the Ice version.\n"
+        "--validate               Validate command line options.\n"
         "-DNAME                  Define NAME as 1.\n"
         "-DNAME=DEF              Define NAME as DEF.\n"
         "-UNAME                  Remove any definition for NAME.\n"
@@ -90,6 +91,7 @@ compile(int argc, char* argv[])
     IceUtilInternal::Options opts;
     opts.addOpt("h", "help");
     opts.addOpt("v", "version");
+    opts.addOpt("", "validate");
     opts.addOpt("D", "", IceUtilInternal::Options::NeedArg, "", IceUtilInternal::Options::Repeat);
     opts.addOpt("U", "", IceUtilInternal::Options::NeedArg, "", IceUtilInternal::Options::Repeat);
     opts.addOpt("I", "", IceUtilInternal::Options::NeedArg, "", IceUtilInternal::Options::Repeat);
@@ -109,6 +111,16 @@ compile(int argc, char* argv[])
     opts.addOpt("", "stream");
     opts.addOpt("", "meta", IceUtilInternal::Options::NeedArg, "", IceUtilInternal::Options::Repeat);
 
+
+    bool validate = false;
+    for(int i = 0; i < argc; ++i)
+    {
+        if(string(argv[i]) == "--validate")
+        {
+            validate = true;
+            break;
+        }
+    }
     vector<string>args;
     try
     {
@@ -117,7 +129,10 @@ compile(int argc, char* argv[])
     catch(const IceUtilInternal::BadOptException& e)
     {
         getErrorStream() << argv[0] << ": error: " << e.reason << endl;
-        usage(argv[0]);
+        if(!validate)
+        {
+            usage(argv[0]);
+        }
         return EXIT_FAILURE;
     }
 
@@ -185,17 +200,38 @@ compile(int argc, char* argv[])
     if(args.empty())
     {
         getErrorStream() << argv[0] << ": error: no input file" << endl;
-        usage(argv[0]);
+        if(!validate)
+        {
+            usage(argv[0]);
+        }
         return EXIT_FAILURE;
     }
 
     if(impl && implTie)
     {
         getErrorStream() << argv[0] << ": error: cannot specify both --impl and --impl-tie" << endl;
-        usage(argv[0]);
+        if(!validate)
+        {
+            usage(argv[0]);
+        }
+        return EXIT_FAILURE;
+    }
+
+    if(depend && dependxml)
+    {
+        getErrorStream() << argv[0] << ": error: cannot specify both --depend and --depend-xml" << endl;
+        if(!validate)
+        {
+            usage(argv[0]);
+        }
         return EXIT_FAILURE;
     }
 
+    if(validate)
+    {
+        return EXIT_SUCCESS;
+    }
+
     int status = EXIT_SUCCESS;
 
     ChecksumMap checksums;
-- 
cgit v1.2.3