AxioDL
/
metaforce
mirror of https://github.com/AxioDL/metaforce.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Implement -o flag for extracting

This commit is contained in:
Jack Andersen 2018-01-03 13:52:23 -10:00
parent f57e086e57
commit eb1803aa0f
2 changed files with 27 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
hecl/driver/ToolExtract.hpp
View File

@ -34,6 +34,10 @@ public:
LogModule.report(logvisor::Fatal, "hecl extract needs a source path as its first argument"); LogModule.report(logvisor::Fatal, "hecl extract needs a source path as its first argument");
if (!info.project) if (!info.project)
{
hecl::SystemString rootDir;
if (info.output.empty())
{ {
/* Get name from input file and init project there */ /* Get name from input file and init project there */
hecl::SystemString baseFile = info.args.front(); hecl::SystemString baseFile = info.args.front();
@ -49,8 +53,17 @@ public:
if (baseFile.empty()) if (baseFile.empty())
LogModule.report(logvisor::Fatal, "hecl extract must be ran within a project directory"); LogModule.report(logvisor::Fatal, "hecl extract must be ran within a project directory");
rootDir = info.cwd + baseFile;
}
else
{
if (hecl::PathRelative(info.output.c_str()))
rootDir = info.cwd + info.output;
else
rootDir = info.output;
}
size_t ErrorRef = logvisor::ErrorCount; size_t ErrorRef = logvisor::ErrorCount;
hecl::SystemString rootDir = info.cwd + baseFile;
hecl::ProjectRootPath newProjRoot(rootDir); hecl::ProjectRootPath newProjRoot(rootDir);
newProjRoot.makeDir(); newProjRoot.makeDir();
m_fallbackProj.reset(new hecl::Database::Project(newProjRoot)); m_fallbackProj.reset(new hecl::Database::Project(newProjRoot));

2
hecl/extern/athena vendored

@ -1 +1 @@
Subproject commit 87f213bc0bba888eeea4e614162a8b3b918bcbf8 Subproject commit ec49377fcd20748ae4490cd18afc9abefa11e7be