diff options
author | Stephen Hines <srhines@google.com> | 2014-02-20 00:12:58 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-02-20 00:12:58 +0000 |
commit | 3d207c9ecb870668d6a845f563d2abeb9cd770ea (patch) | |
tree | 538900a59a6e582fb6730f3d7f9f7cfe0ef318c6 | |
parent | 3a18f6baa1b89f3d927c6767a8e1a9164996da0e (diff) | |
parent | 476d4f5a0249a3318cb86460e6a1adb2b40ecd6f (diff) | |
download | slang-3d207c9ecb870668d6a845f563d2abeb9cd770ea.tar.gz |
Merge "Fix C++ reflection so that -p works."
-rw-r--r-- | llvm-rs-cc.cpp | 9 | ||||
-rw-r--r-- | slang_rs_reflection_cpp.cpp | 12 |
2 files changed, 16 insertions, 5 deletions
diff --git a/llvm-rs-cc.cpp b/llvm-rs-cc.cpp index e2c9599..1736c0b 100644 --- a/llvm-rs-cc.cpp +++ b/llvm-rs-cc.cpp @@ -291,10 +291,11 @@ static void ParseArguments(llvm::SmallVectorImpl<const char*> &ArgVector, if (Args->hasArg(OPT_reflect_cpp)) { Opts.mBitcodeStorage = slang::BCST_CPP_CODE; - // mJavaReflectionPathBase isn't set for C++ reflected builds - // set it to mOutputDir so we can use the path sanely from - // RSReflectionBase later on - Opts.mJavaReflectionPathBase = Opts.mOutputDir; + // mJavaReflectionPathBase can be set for C++ reflected builds. + // Set it to the standard mOutputDir (via -o) by default. + if (Opts.mJavaReflectionPathBase.empty()) { + Opts.mJavaReflectionPathBase = Opts.mOutputDir; + } } Opts.mOutputDepDir = diff --git a/slang_rs_reflection_cpp.cpp b/slang_rs_reflection_cpp.cpp index ff23206..3f630f0 100644 --- a/slang_rs_reflection_cpp.cpp +++ b/slang_rs_reflection_cpp.cpp @@ -128,10 +128,20 @@ bool RSReflectionCpp::reflect(const string &OutputPathBase, const string &InputFileName, const string &OutputBCFileName) { mInputFileName = InputFileName; - mOutputPath = OutputPathBase; + mOutputPath = OutputPathBase + OS_PATH_SEPARATOR_STR; mOutputBCFileName = OutputBCFileName; mClassName = string("ScriptC_") + stripRS(InputFileName); + std::string Path = + RSSlangReflectUtils::ComputePackagedPath(OutputPathBase.c_str(), ""); + + std::string ErrorMsg; + if (!SlangUtils::CreateDirectoryWithParents(Path, &ErrorMsg)) { + fprintf(stderr, "Error: Could not create path %s - %s\n", + Path.c_str(), ErrorMsg.c_str()); + return false; + } + makeHeader("android::RSC::ScriptC"); std::vector< std::string > header(mText); mText.clear(); |