diff options
| author | Jose <jose@zeroc.com> | 2019-10-30 20:08:03 +0100 |
|---|---|---|
| committer | Joe George <joe@zeroc.com> | 2019-11-05 11:02:25 -0500 |
| commit | f858d073b76e0fa040382f4a3d5b3fec343f691e (patch) | |
| tree | d9ca3ca61894804e8abba2cc0b98a7c719fdc15b | |
| parent | Fixed IceSSL/configuration to skip some tests on macOS (diff) | |
| download | ice-f858d073b76e0fa040382f4a3d5b3fec343f691e.tar.bz2 ice-f858d073b76e0fa040382f4a3d5b3fec343f691e.tar.xz ice-f858d073b76e0fa040382f4a3d5b3fec343f691e.zip | |
Fix slice2swift build failures
| -rw-r--r-- | cpp/src/Slice/Preprocessor.cpp | 12 | ||||
| -rw-r--r-- | cpp/src/Slice/Preprocessor.h | 2 | ||||
| -rw-r--r-- | cpp/src/slice2swift/Main.cpp | 2 |
3 files changed, 14 insertions, 2 deletions
diff --git a/cpp/src/Slice/Preprocessor.cpp b/cpp/src/Slice/Preprocessor.cpp index 958facf5f34..13210390423 100644 --- a/cpp/src/Slice/Preprocessor.cpp +++ b/cpp/src/Slice/Preprocessor.cpp @@ -721,6 +721,18 @@ Slice::Preprocessor::printMakefileDependencies(ostream& out, Language lang, cons } break; } + case Swift: + { + // + // Change .o[bj] suffix to .swift suffix. + // + pos = 0; + if ((pos = result.find(suffix)) != string::npos) + { + result.replace(pos, suffix.size() - 1, ".swift"); + } + break; + } default: { assert(false); diff --git a/cpp/src/Slice/Preprocessor.h b/cpp/src/Slice/Preprocessor.h index e9456ae1fbf..745f0e5c8fd 100644 --- a/cpp/src/Slice/Preprocessor.h +++ b/cpp/src/Slice/Preprocessor.h @@ -27,7 +27,7 @@ public: FILE* preprocess(bool, const std::vector<std::string>&); bool close(); - enum Language { CPlusPlus, Java, CSharp, Python, Ruby, PHP, JavaScript, JavaScriptJSON, ObjC, SliceXML, MATLAB }; + enum Language { CPlusPlus, Java, CSharp, Python, Ruby, PHP, JavaScript, JavaScriptJSON, ObjC, SliceXML, MATLAB, Swift }; bool printMakefileDependencies(std::ostream&, Language, const std::vector<std::string>&, const std::string& = "", const std::string& = "cpp", const std::string& = ""); diff --git a/cpp/src/slice2swift/Main.cpp b/cpp/src/slice2swift/Main.cpp index ae435a1cdf0..6464e2be4fa 100644 --- a/cpp/src/slice2swift/Main.cpp +++ b/cpp/src/slice2swift/Main.cpp @@ -218,7 +218,7 @@ compile(const vector<string>& argv) return EXIT_FAILURE; } - if(!icecpp->printMakefileDependencies(os, depend ? Preprocessor::PHP : Preprocessor::SliceXML, + if(!icecpp->printMakefileDependencies(os, depend ? Preprocessor::Swift : Preprocessor::SliceXML, includePaths, "-D__SLICE2SWIFT__")) { return EXIT_FAILURE; |