1 files changed, 41 insertions, 14 deletions

diff --git a/cpp/src/slice2java/Main.cpp b/cpp/src/slice2java/Main.cpp
index 7439180b8f2..cb98ac9823c 100644
--- a/cpp/src/slice2java/Main.cpp
+++ b/cpp/src/slice2java/Main.cpp
@@ -12,6 +12,7 @@
 #include <IceUtil/StaticMutex.h>
 #include <Slice/Preprocessor.h>
 #include <Slice/FileTracker.h>
+#include <Slice/Util.h>
 #include <Gen.h>
 
 #ifdef __BCPLUSPLUS__
@@ -50,6 +51,8 @@ usage(const char* n)
         "--impl                  Generate sample implementations.\n"
         "--impl-tie              Generate sample TIE implementations.\n"
         "--depend                Generate Makefile dependencies.\n"
+        "--depend-xml            Generate dependencies in XML format.\n"
+        "--list-generated        Emit list of generated files in XML format.\n"
         "-d, --debug             Print debug messages.\n"
         "--ice                   Permit `Ice' prefix (for building Ice source code only)\n"
         "--checksum CLASS        Generate checksums for Slice definitions into CLASS.\n"
@@ -74,6 +77,8 @@ main(int argc, char* argv[])
     opts.addOpt("", "impl");
     opts.addOpt("", "impl-tie");
     opts.addOpt("", "depend");
+    opts.addOpt("", "depend-xml");
+    opts.addOpt("", "list-generated");
     opts.addOpt("d", "debug");
     opts.addOpt("", "ice");
     opts.addOpt("", "checksum", IceUtilInternal::Options::NeedArg);
@@ -88,7 +93,7 @@ main(int argc, char* argv[])
     }
     catch(const IceUtilInternal::BadOptException& e)
     {
-        cerr << argv[0] << ": " << e.reason << endl;
+        cerr << argv[0] << ": error: " << e.reason << endl;
         usage(argv[0]);
         return EXIT_FAILURE;
     }
@@ -136,6 +141,7 @@ main(int argc, char* argv[])
     bool implTie = opts.isSet("impl-tie");
 
     bool depend = opts.isSet("depend");
+    bool dependxml = opts.isSet("depend-xml");
 
     bool debug = opts.isSet("debug");
 
@@ -164,21 +170,21 @@ main(int argc, char* argv[])
 
     if(java2)
     {
-        cerr << argv[0] << ": warning: The Java2 mapping is deprecated." << endl;
+        getErrorStream() << argv[0] << ": warning: The Java2 mapping is deprecated." << endl;
     }
 
     bool caseSensitive = opts.isSet("case-sensitive");
 
     if(args.empty())
     {
-        cerr << argv[0] << ": no input file" << endl;
+        getErrorStream() << argv[0] << ": error: no input file" << endl;
         usage(argv[0]);
         return EXIT_FAILURE;
     }
 
     if(impl && implTie)
     {
-        cerr << argv[0] << ": cannot specify both --impl and --impl-tie" << endl;
+        getErrorStream() << argv[0] << ": error: cannot specify both --impl and --impl-tie" << endl;
         usage(argv[0]);
         return EXIT_FAILURE;
     }
@@ -190,24 +196,37 @@ main(int argc, char* argv[])
     IceUtil::CtrlCHandler ctrlCHandler;
     ctrlCHandler.setCallback(interruptedCallback);
 
+    if(dependxml)
+    {
+        cout << "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<dependencies>" << endl;
+    }
+
     for(i = args.begin(); i != args.end(); ++i)
     {
-        if(depend)
+        if(depend || dependxml)
         {
             Preprocessor icecpp(argv[0], *i, cppArgs);
-            if(!icecpp.printMakefileDependencies(Preprocessor::Java, includePaths))
+            if(!icecpp.printMakefileDependencies(depend ? Preprocessor::Java : Preprocessor::JavaXML, includePaths))
             {
                 return EXIT_FAILURE;
             }
         }
         else
         {
+            ostringstream os;
+            if(opts.isSet("list-generated"))
+            {
+                Slice::setErrorStream(os);
+            }
+
             Preprocessor icecpp(argv[0], *i, cppArgs);
             FILE* cppHandle = icecpp.preprocess(false);
 
             if(cppHandle == 0)
             {
-                return EXIT_FAILURE;
+                FileTracker::instance()->setSource(*i, os.str(), true);
+                status = EXIT_FAILURE;
+                continue;
             }
 
             if(preprocess)
@@ -238,18 +257,16 @@ main(int argc, char* argv[])
 
                 if(parseStatus == EXIT_FAILURE)
                 {
+                    p->destroy();
+                    FileTracker::instance()->setSource(*i, os.str(), true);
                     status = EXIT_FAILURE;
                 }
                 else
                 {
                     try
                     {
+                        FileTracker::instance()->setSource(*i, os.str(), false);
                         Gen gen(argv[0], icecpp.getBaseName(), includePaths, output);
-                        if(!gen)
-                        {
-                            p->destroy();
-                            return EXIT_FAILURE;
-                        }
                         gen.generate(p, stream);
                         if(tie)
                         {
@@ -278,7 +295,7 @@ main(int argc, char* argv[])
                         // cleanup any created files.
                         FileTracker::instance()->cleanup();
                         p->destroy();
-                        cerr << argv[0] << ": " << ex.reason() << endl;
+                        getErrorStream() << argv[0] << ": error: " << ex.reason() << endl;
                         return EXIT_FAILURE;
                     }
                 }
@@ -299,6 +316,11 @@ main(int argc, char* argv[])
         }
     }
 
+    if(dependxml)
+    {
+        cout << "</dependencies>\n";
+    }
+
     if(!checksumClass.empty())
     {
         try
@@ -310,10 +332,15 @@ main(int argc, char* argv[])
             // If a file could not be created, then
             // cleanup any created files.
             FileTracker::instance()->cleanup();
-            cerr << argv[0] << ": " << ex.reason() << endl;
+            getErrorStream() << argv[0] << ": error: " << ex.reason() << endl;
             return EXIT_FAILURE;
         }
     }
 
+    if(opts.isSet("list-generated"))
+    {
+        FileTracker::instance()->dumpxml();
+    }
+
     return status;
 }