diff options
author | Dwayne Boone <dwayne@zeroc.com> | 2009-03-25 14:18:34 -0230 |
---|---|---|
committer | Dwayne Boone <dwayne@zeroc.com> | 2009-03-25 14:18:34 -0230 |
commit | 30b2a3a07da9f9f0d6333b0b6c7c588a6ca61ba3 (patch) | |
tree | 68183ee7dcd8d5b21a7c855b445f5e3d19eadac3 /cpp/src/slice2java/Main.cpp | |
parent | Fixed bug 3230 - IceGrid node leak (diff) | |
download | ice-30b2a3a07da9f9f0d6333b0b6c7c588a6ca61ba3.tar.bz2 ice-30b2a3a07da9f9f0d6333b0b6c7c588a6ca61ba3.tar.xz ice-30b2a3a07da9f9f0d6333b0b6c7c588a6ca61ba3.zip |
Bug 3651 - --depend succeeds for bad slice
Diffstat (limited to 'cpp/src/slice2java/Main.cpp')
-rw-r--r-- | cpp/src/slice2java/Main.cpp | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/cpp/src/slice2java/Main.cpp b/cpp/src/slice2java/Main.cpp index 0ed57b5d415..3016b42d3d5 100644 --- a/cpp/src/slice2java/Main.cpp +++ b/cpp/src/slice2java/Main.cpp @@ -211,10 +211,31 @@ main(int argc, char* argv[]) if(depend || dependxml) { Preprocessor icecpp(argv[0], *i, cppArgs); + FILE* cppHandle = icecpp.preprocess(false); + + if(cppHandle == 0) + { + return EXIT_FAILURE; + } + + UnitPtr u = Unit::createUnit(false, false, ice, caseSensitive); + int parseStatus = u->parse(*i, cppHandle, debug); + u->destroy(); + + if(parseStatus == EXIT_FAILURE) + { + return EXIT_FAILURE; + } + if(!icecpp.printMakefileDependencies(depend ? Preprocessor::Java : Preprocessor::JavaXML, includePaths)) { return EXIT_FAILURE; } + + if(!icecpp.close()) + { + return EXIT_FAILURE; + } } else { |