Commit 9703c657 authored by Daniel Pfeifer's avatar Daniel Pfeifer Committed by wahikihiki

cmFileCommand: put subcommands in unnamed namespace

parent 64f987c1
This diff is collapsed.
......@@ -35,71 +35,6 @@ public:
*/
bool InitialPass(std::vector<std::string> const& args,
cmExecutionStatus& status) override;
protected:
bool HandleRename(std::vector<std::string> const& args,
cmExecutionStatus& status);
bool HandleRemove(std::vector<std::string> const& args, bool recurse,
cmExecutionStatus& status);
bool HandleWriteCommand(std::vector<std::string> const& args, bool append,
cmExecutionStatus& status);
bool HandleReadCommand(std::vector<std::string> const& args,
cmExecutionStatus& status);
bool HandleHashCommand(std::vector<std::string> const& args,
cmExecutionStatus& status);
bool HandleStringsCommand(std::vector<std::string> const& args,
cmExecutionStatus& status);
bool HandleGlobCommand(std::vector<std::string> const& args, bool recurse,
cmExecutionStatus& status);
bool HandleTouchCommand(std::vector<std::string> const& args, bool create,
cmExecutionStatus& status);
bool HandleMakeDirectoryCommand(std::vector<std::string> const& args,
cmExecutionStatus& status);
bool HandleRelativePathCommand(std::vector<std::string> const& args,
cmExecutionStatus& status);
bool HandleCMakePathCommand(std::vector<std::string> const& args,
bool nativePath, cmExecutionStatus& status);
bool HandleReadElfCommand(std::vector<std::string> const& args,
cmExecutionStatus& status);
bool HandleRPathChangeCommand(std::vector<std::string> const& args,
cmExecutionStatus& status);
bool HandleRPathCheckCommand(std::vector<std::string> const& args,
cmExecutionStatus& status);
bool HandleRPathRemoveCommand(std::vector<std::string> const& args,
cmExecutionStatus& status);
bool HandleDifferentCommand(std::vector<std::string> const& args,
cmExecutionStatus& status);
bool HandleCopyCommand(std::vector<std::string> const& args,
cmExecutionStatus& status);
bool HandleInstallCommand(std::vector<std::string> const& args,
cmExecutionStatus& status);
bool HandleDownloadCommand(std::vector<std::string> const& args,
cmExecutionStatus& status);
bool HandleUploadCommand(std::vector<std::string> const& args,
cmExecutionStatus& status);
bool HandleTimestampCommand(std::vector<std::string> const& args,
cmExecutionStatus& status);
bool HandleGenerateCommand(std::vector<std::string> const& args,
cmExecutionStatus& status);
bool HandleLockCommand(std::vector<std::string> const& args,
cmExecutionStatus& status);
bool HandleSizeCommand(std::vector<std::string> const& args,
cmExecutionStatus& status);
bool HandleReadSymlinkCommand(std::vector<std::string> const& args,
cmExecutionStatus& status);
bool HandleCreateLinkCommand(std::vector<std::string> const& args,
cmExecutionStatus& status);
bool HandleGetRuntimeDependenciesCommand(
std::vector<std::string> const& args, cmExecutionStatus& status);
private:
void AddEvaluationFile(const std::string& inputName,
const std::string& outputExpr,
const std::string& condition, bool inputIsContent,
cmExecutionStatus& status);
};
#endif
......@@ -6,7 +6,7 @@
#include "cmBinUtilsLinuxELFLinker.h"
#include "cmBinUtilsMacOSMachOLinker.h"
#include "cmBinUtilsWindowsPELinker.h"
#include "cmCommand.h"
#include "cmExecutionStatus.h"
#include "cmMakefile.h"
#include "cmStateTypes.h"
#include "cmSystemTools.h"
......@@ -108,13 +108,13 @@ static cmsys::RegularExpression TransformCompile(const std::string& str)
}
cmRuntimeDependencyArchive::cmRuntimeDependencyArchive(
cmCommand* command, std::vector<std::string> searchDirectories,
cmExecutionStatus& status, std::vector<std::string> searchDirectories,
std::string bundleExecutable,
const std::vector<std::string>& preIncludeRegexes,
const std::vector<std::string>& preExcludeRegexes,
const std::vector<std::string>& postIncludeRegexes,
const std::vector<std::string>& postExcludeRegexes)
: Command(command)
: Status(status)
, SearchDirectories(std::move(searchDirectories))
, BundleExecutable(std::move(bundleExecutable))
, PreIncludeRegexes(preIncludeRegexes.size())
......@@ -190,7 +190,7 @@ bool cmRuntimeDependencyArchive::GetRuntimeDependencies(
void cmRuntimeDependencyArchive::SetError(const std::string& e)
{
this->Command->SetError(e);
this->Status.SetError(e);
}
std::string cmRuntimeDependencyArchive::GetBundleExecutable()
......@@ -361,7 +361,7 @@ void cmRuntimeDependencyArchive::AddUnresolvedPath(const std::string& name)
cmMakefile* cmRuntimeDependencyArchive::GetMakefile()
{
return this->Command->GetMakefile();
return &this->Status.GetMakefile();
}
const std::map<std::string, std::set<std::string>>&
......
......@@ -14,14 +14,14 @@
#include <string>
#include <vector>
class cmCommand;
class cmExecutionStatus;
class cmMakefile;
class cmRuntimeDependencyArchive
{
public:
explicit cmRuntimeDependencyArchive(
cmCommand* command, std::vector<std::string> searchDirectories,
cmExecutionStatus& status, std::vector<std::string> searchDirectories,
std::string bundleExecutable,
const std::vector<std::string>& preIncludeRegexes,
const std::vector<std::string>& preExcludeRegexes,
......@@ -51,7 +51,7 @@ public:
const std::set<std::string>& GetUnresolvedPaths();
private:
cmCommand* Command;
cmExecutionStatus& Status;
std::unique_ptr<cmBinUtilsLinker> Linker;
std::string GetRuntimeDependenciesTool;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment