BigfootDev/flatbuffers
1
0
Fork 1
mirror of https://github.com/google/flatbuffers.git synced 2026-06-02 20:15:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make --bfbs-filenames default to location of first schema file. (#6705)

Browse Source 
* Make --bfbs-filenames default to location of first schema file.

Make RelativeToProjectRoot always work, applying "../" where needed. This is
needed for backwards compatibility. The first input file may be deeper in some
directory than the other files. Now, there will always be a declaration
file.

* documentation

* clang format

Co-authored-by: Casper Neo <cneo@google.com>
This commit is contained in:
Casper
2021-06-22 10:19:46 -04:00
committed by GitHub
parent c8db1ca5d4
commit 71d43f3be9
4 changed files with 34 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/util.cpp
View File

@@ -225,20 +225,29 @@ std::string RelativeToRootPath(const std::string &project,
std::string absolute_project = PosixPath(AbsolutePath(project));
if (absolute_project.back() != '/') absolute_project += "/";
std::string absolute_filepath = PosixPath(AbsolutePath(filepath));
if (absolute_filepath.size() < absolute_project.size() ||
absolute_filepath.substr(0, absolute_project.size()) !=
absolute_project) {
printf(
"The --bfbs-filenames directory must contain all files and included "
"files.\n");
printf("project: %s\n", project.c_str());
printf("filepath: %s\n", filepath.c_str());
printf("absolute_project: %s\n", absolute_project.c_str());
printf("absolute_filepath:%s\n", absolute_filepath.c_str());
FLATBUFFERS_ASSERT(0);
// Find the first character where they disagree.
// The previous directory is the lowest common ancestor;
const char *a = absolute_project.c_str();
const char *b = absolute_filepath.c_str();
size_t common_prefix_len = 0;
while (*a != '\0' && *b != '\0' && *a == *b) {
if (*a == '/') common_prefix_len = a - absolute_project.c_str();
a++;
b++;
}
const std::string relpath = absolute_filepath.substr(absolute_project.size());
return "//" + relpath;
// the number of ../ to prepend to b depends on the number of remaining
// directories in A.
const char *suffix = absolute_project.c_str() + common_prefix_len;
size_t num_up = 0;
while (*suffix != '\0')
if (*suffix++ == '/') num_up++;
num_up--; // last one is known to be '/'.
std::string result = "//";
for (size_t i = 0; i < num_up; i++) result += "../";
result += absolute_filepath.substr(common_prefix_len + 1);
return result;
}
// Locale-independent code.