Permalink
Browse files

Merge commit 'pull/origin/1034'

  • Loading branch information...
Andersbakken committed Sep 7, 2017
2 parents 2c0df69 + c8df88e commit c8b7777ced2f2c1e4e565fee0ee9b7fc1978a0ab
View
@@ -78,4 +78,8 @@ if (RTAGS_ENABLE_DEV_OPTIONS)
include(CPack)
endif ()
include(CTest)
add_test(SBRootTest perl "${CMAKE_SOURCE_DIR}/tests/sbroot/sbroot_test.pl" "${CMAKE_INSTALL_PREFIX}/bin")
feature_summary(INCLUDE_QUIET_PACKAGES WHAT ALL)
View
@@ -1967,8 +1967,10 @@ bool ClangIndexer::writeFiles(const Path &root, String &error)
FILE *f = fopen((unitRoot + "/info").constData(), "w");
if (!f)
return false;
Path rpath = path;
Sandbox::encode(rpath);
bytesWritten += fprintf(f, "%s\nIndexed by %s at %llu\n",
path.constData(),
rpath.constData(),
p.constData(), static_cast<unsigned long long>(mIndexDataMessage.parseTime()));
fclose(f);
}
View
@@ -87,7 +87,7 @@ inline Deserializer &operator>>(Deserializer &s, IndexParseData::CompileCommands
inline Serializer &operator<<(Serializer &s, const IndexParseData &data)
{
s << data.project << static_cast<uint32_t>(data.compileCommands.size());
s << Sandbox::encoded(data.project) << static_cast<uint32_t>(data.compileCommands.size());
for (const auto &pair : data.compileCommands) {
s << Location::path(pair.first) << pair.second;
}
View
@@ -66,7 +66,9 @@ void encodePath(Path &path)
void decodePath(Path &path)
{
Sandbox::decode(path);
if (Sandbox::decode(path))
return;
int i = 0;
int size = path.size();
while (i < size) {
@@ -83,7 +85,6 @@ void decodePath(Path &path)
}
}
Path encodeSourceFilePath(const Path &dataDir, const Path &project, uint32_t fileId)
{
String str = dataDir;
Oops, something went wrong.

0 comments on commit c8b7777

Please sign in to comment.