ExportStrings.* -> CommandLineActions.*

This commit is contained in:
Chris Danford
2009-04-10 22:29:00 +00:00
parent d7208a1a2a
commit 2cf276fb43
4 changed files with 15 additions and 15 deletions
@@ -1,5 +1,5 @@
#include "global.h" #include "global.h"
#include "ExportStrings.h" #include "CommandLineActions.h"
#include "RageFile.h" #include "RageFile.h"
#include "RageUtil.h" #include "RageUtil.h"
#include "IniFile.h" #include "IniFile.h"
@@ -47,7 +47,7 @@ static void GetPackageFilesToInstall( vector<RString> &vs )
vs.clear(); vs.clear();
} }
bool ExportStrings::AnyPackageFilesInCommandLine() bool CommandLineActions::AnyPackageFilesInCommandLine()
{ {
vector<RString> vs; vector<RString> vs;
GetPackageFilesToInstall( vs ); GetPackageFilesToInstall( vs );
@@ -61,7 +61,7 @@ struct FileCopyResult
RString sFile, sComment; RString sFile, sComment;
}; };
void ExportStrings::Install() void CommandLineActions::Install()
{ {
vector<FileCopyResult> vSucceeded; vector<FileCopyResult> vSucceeded;
vector<FileCopyResult> vFailed; vector<FileCopyResult> vFailed;
@@ -118,7 +118,7 @@ void ExportStrings::Install()
Dialog::OK( sMessage ); Dialog::OK( sMessage );
} }
void ExportStrings::Nsis() void CommandLineActions::Nsis()
{ {
RageFile out; RageFile out;
if( !out.Open( "nsis_strings_temp.inc", RageFile::WRITE ) ) if( !out.Open( "nsis_strings_temp.inc", RageFile::WRITE ) )
@@ -152,7 +152,7 @@ void ExportStrings::Nsis()
} }
} }
void ExportStrings::LuaInformation() void CommandLineActions::LuaInformation()
{ {
XNode *pNode = LuaHelpers::GetLuaInformation(); XNode *pNode = LuaHelpers::GetLuaInformation();
pNode->AppendAttr( "xmlns", "http://www.stepmania.com" ); pNode->AppendAttr( "xmlns", "http://www.stepmania.com" );
@@ -1,7 +1,7 @@
#ifndef ExportStrings_H #ifndef CommandLineActions_H
#define ExportStrings_H #define CommandLineActions_H
namespace ExportStrings namespace CommandLineActions
{ {
bool AnyPackageFilesInCommandLine(); bool AnyPackageFilesInCommandLine();
void Install(); void Install();
+2 -2
View File
@@ -3206,10 +3206,10 @@ cl /Zl /nologo /c verstub.cpp /Fo&quot;$(IntDir)&quot;\
Name="StepMania" Name="StepMania"
Filter=""> Filter="">
<File <File
RelativePath=".\ExportStrings.cpp"> RelativePath=".\CommandLineActions.cpp">
</File> </File>
<File <File
RelativePath=".\ExportStrings.h"> RelativePath=".\CommandLineActions.h">
</File> </File>
<File <File
RelativePath=".\GameLoop.cpp"> RelativePath=".\GameLoop.cpp">
+5 -5
View File
@@ -32,7 +32,7 @@
#include "RageSurface.h" #include "RageSurface.h"
#include "RageSurface_Load.h" #include "RageSurface_Load.h"
#include "CatalogXml.h" #include "CatalogXml.h"
#include "ExportStrings.h" #include "CommandLineActions.h"
#if !defined(SUPPORT_OPENGL) && !defined(SUPPORT_D3D) #if !defined(SUPPORT_OPENGL) && !defined(SUPPORT_D3D)
#define SUPPORT_OPENGL #define SUPPORT_OPENGL
@@ -932,7 +932,7 @@ int main(int argc, char* argv[])
RunMode_ExportLuaInformation, RunMode_ExportLuaInformation,
}; };
RunMode runmode = RunMode_Normal; RunMode runmode = RunMode_Normal;
if( ExportStrings::AnyPackageFilesInCommandLine() ) if( CommandLineActions::AnyPackageFilesInCommandLine() )
runmode = RunMode_Install; runmode = RunMode_Install;
else if( GetCommandlineArgument("ExportNsisStrings") ) else if( GetCommandlineArgument("ExportNsisStrings") )
runmode = RunMode_ExportNsisStrings; runmode = RunMode_ExportNsisStrings;
@@ -1066,13 +1066,13 @@ int main(int argc, char* argv[])
{ {
DEFAULT_FAIL( runmode ); DEFAULT_FAIL( runmode );
case RunMode_Install: case RunMode_Install:
ExportStrings::Install(); CommandLineActions::Install();
break; break;
case RunMode_ExportNsisStrings: case RunMode_ExportNsisStrings:
ExportStrings::Nsis(); CommandLineActions::Nsis();
break; break;
case RunMode_ExportLuaInformation: case RunMode_ExportLuaInformation:
ExportStrings::LuaInformation(); CommandLineActions::LuaInformation();
break; break;
}; };
exit(0); exit(0);