* Create AppImage package using linuxdeployqt in Travis CI * Renamed appPath() to sharedDataPath() * Fixed include error in tutorial
This commit is contained in:
@@ -1,17 +1,43 @@
|
||||
#include "AppPath.h"
|
||||
|
||||
FilePath AppPath::m_appPath(L"");
|
||||
FilePath AppPath::m_sharedDataPath(L"");
|
||||
FilePath AppPath::m_cxxIndexerPath(L"");
|
||||
|
||||
FilePath AppPath::getAppPath()
|
||||
FilePath AppPath::getSharedDataPath()
|
||||
{
|
||||
return m_appPath;
|
||||
return m_sharedDataPath;
|
||||
}
|
||||
|
||||
bool AppPath::setAppPath(const FilePath& path)
|
||||
bool AppPath::setSharedDataPath(const FilePath& path)
|
||||
{
|
||||
if (!path.empty())
|
||||
{
|
||||
m_appPath = path;
|
||||
m_sharedDataPath = path;
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
FilePath AppPath::getCxxIndexerPath()
|
||||
{
|
||||
#if _WIN32
|
||||
const std::wstring cxxIndexerName(L"sourcetrail_indexer.exe");
|
||||
#else
|
||||
const std::wstring cxxIndexerName(L"sourcetrail_indexer");
|
||||
#endif
|
||||
|
||||
if (!m_cxxIndexerPath.empty())
|
||||
{
|
||||
return m_cxxIndexerPath.getConcatenated(cxxIndexerName);
|
||||
}
|
||||
return m_sharedDataPath.getConcatenated(cxxIndexerName);
|
||||
}
|
||||
|
||||
bool AppPath::setCxxIndexerPath(const FilePath& path)
|
||||
{
|
||||
if (!path.empty())
|
||||
{
|
||||
m_cxxIndexerPath = path;
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
|
||||
@@ -6,11 +6,15 @@
|
||||
class AppPath
|
||||
{
|
||||
public:
|
||||
static FilePath getAppPath();
|
||||
static bool setAppPath(const FilePath& path);
|
||||
static FilePath getSharedDataPath();
|
||||
static bool setSharedDataPath(const FilePath& path);
|
||||
|
||||
static FilePath getCxxIndexerPath();
|
||||
static bool setCxxIndexerPath(const FilePath& path);
|
||||
|
||||
private:
|
||||
static FilePath m_appPath;
|
||||
static FilePath m_sharedDataPath;
|
||||
static FilePath m_cxxIndexerPath;
|
||||
};
|
||||
|
||||
#endif // APP_PATH_H
|
||||
|
||||
@@ -4,45 +4,45 @@
|
||||
|
||||
FilePath ResourcePaths::getColorSchemesPath()
|
||||
{
|
||||
return AppPath::getAppPath().concatenate(L"data/color_schemes/");
|
||||
return AppPath::getSharedDataPath().concatenate(L"data/color_schemes/");
|
||||
}
|
||||
|
||||
FilePath ResourcePaths::getSyntaxHighlightingRulesPath()
|
||||
{
|
||||
return AppPath::getAppPath().concatenate(L"data/syntax_highlighting_rules/");
|
||||
return AppPath::getSharedDataPath().concatenate(L"data/syntax_highlighting_rules/");
|
||||
}
|
||||
|
||||
FilePath ResourcePaths::getFallbackPath()
|
||||
{
|
||||
return AppPath::getAppPath().concatenate(L"data/fallback/");
|
||||
return AppPath::getSharedDataPath().concatenate(L"data/fallback/");
|
||||
}
|
||||
|
||||
FilePath ResourcePaths::getFontsPath()
|
||||
{
|
||||
return AppPath::getAppPath().concatenate(L"data/fonts/");
|
||||
return AppPath::getSharedDataPath().concatenate(L"data/fonts/");
|
||||
}
|
||||
|
||||
FilePath ResourcePaths::getGuiPath()
|
||||
{
|
||||
return AppPath::getAppPath().concatenate(L"data/gui/");
|
||||
return AppPath::getSharedDataPath().concatenate(L"data/gui/");
|
||||
}
|
||||
|
||||
FilePath ResourcePaths::getLicensePath()
|
||||
{
|
||||
return AppPath::getAppPath().concatenate(L"data/license/");
|
||||
return AppPath::getSharedDataPath().concatenate(L"data/license/");
|
||||
}
|
||||
|
||||
FilePath ResourcePaths::getJavaPath()
|
||||
{
|
||||
return AppPath::getAppPath().concatenate(L"data/java/");
|
||||
return AppPath::getSharedDataPath().concatenate(L"data/java/");
|
||||
}
|
||||
|
||||
FilePath ResourcePaths::getPythonPath()
|
||||
{
|
||||
return AppPath::getAppPath().concatenate(L"data/python/");
|
||||
return AppPath::getSharedDataPath().concatenate(L"data/python/");
|
||||
}
|
||||
|
||||
FilePath ResourcePaths::getCxxCompilerHeaderPath()
|
||||
{
|
||||
return AppPath::getAppPath().concatenate(L"data/cxx/include/").getCanonical();
|
||||
return AppPath::getSharedDataPath().concatenate(L"data/cxx/include/").getCanonical();
|
||||
}
|
||||
|
||||
@@ -13,13 +13,6 @@
|
||||
#include "UserPaths.h"
|
||||
#include "utilityApp.h"
|
||||
|
||||
|
||||
#if _WIN32
|
||||
const std::wstring TaskBuildIndex::s_processName(L"sourcetrail_indexer.exe");
|
||||
#else
|
||||
const std::wstring TaskBuildIndex::s_processName(L"sourcetrail_indexer");
|
||||
#endif
|
||||
|
||||
TaskBuildIndex::TaskBuildIndex(
|
||||
size_t processCount,
|
||||
std::shared_ptr<StorageProvider> storageProvider,
|
||||
@@ -185,7 +178,7 @@ void TaskBuildIndex::handleMessage(MessageIndexingInterrupted* message)
|
||||
|
||||
void TaskBuildIndex::runIndexerProcess(int processId, const std::wstring& logFilePath)
|
||||
{
|
||||
const FilePath indexerProcessPath = AppPath::getAppPath().concatenate(s_processName);
|
||||
const FilePath indexerProcessPath = AppPath::getCxxIndexerPath();
|
||||
if (!indexerProcessPath.exists())
|
||||
{
|
||||
m_interrupted = true;
|
||||
@@ -199,7 +192,7 @@ void TaskBuildIndex::runIndexerProcess(int processId, const std::wstring& logFil
|
||||
std::vector<std::wstring> commandArguments;
|
||||
commandArguments.push_back(std::to_wstring(processId));
|
||||
commandArguments.push_back(utility::decodeFromUtf8(m_appUUID));
|
||||
commandArguments.push_back(L"\"" + AppPath::getAppPath().getAbsolute().wstr() + L"\"");
|
||||
commandArguments.push_back(L"\"" + AppPath::getSharedDataPath().getAbsolute().wstr() + L"\"");
|
||||
commandArguments.push_back(L"\"" + UserPaths::getUserDataPath().getAbsolute().wstr() + L"\"");
|
||||
|
||||
if (!logFilePath.empty())
|
||||
|
||||
Reference in New Issue
Block a user