From f24e7084d5ebce8689e02d5f322d175d4108cf00 Mon Sep 17 00:00:00 2001
From: Dwayne Boone <dwayne@zeroc.com>
Date: Wed, 9 Jan 2008 10:46:08 -0330
Subject: Use mcpp instead of icecpp

---
 cpp/src/slice2java/Main.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'cpp/src/slice2java/Main.cpp')

diff --git a/cpp/src/slice2java/Main.cpp b/cpp/src/slice2java/Main.cpp
index 94e2110f5f5..6f814593cb6 100644
--- a/cpp/src/slice2java/Main.cpp
+++ b/cpp/src/slice2java/Main.cpp
@@ -91,24 +91,24 @@ main(int argc, char* argv[])
         return EXIT_SUCCESS;
     }
 
-    string cppArgs;
+    vector<string> cppArgs;
     vector<string> optargs = opts.argVec("D");
     vector<string>::const_iterator i;
     for(i = optargs.begin(); i != optargs.end(); ++i)
     {
-        cppArgs += " -D" + Preprocessor::addQuotes(*i);
+        cppArgs.push_back("-D" + *i);
     }
 
     optargs = opts.argVec("U");
     for(i = optargs.begin(); i != optargs.end(); ++i)
     {
-        cppArgs += " -U" + Preprocessor::addQuotes(*i);
+        cppArgs.push_back("-U" + *i);
     }
 
     vector<string> includePaths = opts.argVec("I");
     for(i = includePaths.begin(); i != includePaths.end(); ++i)
     {
-	cppArgs += " -I" + Preprocessor::normalizeIncludePath(*i);
+        cppArgs.push_back("-I" + Preprocessor::normalizeIncludePath(*i));
     }
 
     bool preprocess = opts.isSet("E");
@@ -160,7 +160,7 @@ main(int argc, char* argv[])
         if(depend)
         {
             Preprocessor icecpp(argv[0], *i, cppArgs);
-            icecpp.printMakefileDependencies(Preprocessor::Java);
+            icecpp.printMakefileDependencies(Preprocessor::Java, includePaths);
         }
         else
         {
@@ -190,7 +190,7 @@ main(int argc, char* argv[])
             else
             {
                 UnitPtr p = Unit::createUnit(false, false, ice, caseSensitive, globalMetadata);
-                int parseStatus = p->parse(cppHandle, debug, Ice);
+                int parseStatus = p->parse(*i, cppHandle, debug, Ice);
 
                 if(!icecpp.close())
                 {
-- 
cgit v1.2.3