github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-07-11 22:03:01 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

.developing umk

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@3756 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2011-08-08 11:38:39 +00:00
parent 4e71ffdc56
commit 3ba846a2a2
4 changed files with 29 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

12
uppsrc/ide/Builders/Build.cpp
View file

@ -4,18 +4,6 @@
#define LDUMP(x) // DUMP(x)
String MakeBuild::GetDefaultMethod()
{
return LoadFile(ConfigFile("default_method"));
}
VectorMap<String, String> MakeBuild::GetMethodVars(const String& method)
{
VectorMap<String, String> map;
LoadVarFile(ConfigFile((String)~method + ".bm"), map);
return map;
}
MakeBuild::MakeBuild()
{
targetmode = 0;

2
uppsrc/ide/Builders/Build.h
View file

@ -40,8 +40,6 @@ struct MakeBuild {
virtual void ReQualifyCodeBase() = 0;
virtual void SetErrorEditor() = 0;
virtual String GetMain() = 0;
virtual String GetDefaultMethod();
virtual VectorMap<String, String> GetMethodVars(const String& method);
struct TransferFileInfo
{

23
uppsrc/ide/Core/Core.cpp
View file

@ -97,6 +97,29 @@ const Workspace& GetIdeWorkspace()
return x;
}
String IdeContext::GetDefaultMethod()
{
return LoadFile(ConfigFile("default_method"));
}
VectorMap<String, String> IdeContext::GetMethodVars(const String& method)
{
VectorMap<String, String> map;
LoadVarFile(ConfigFile((String)~method + ".bm"), map);
return map;
}
String GetDefaultMethod()
{
return the_ide ? the_ide->GetDefaultMethod() : String();
}
VectorMap<String, String> GetMethodVars(const String& method)
{
return the_ide ? the_ide->GetMethodVars(method) : VectorMap<String, String>();
}
bool IdeIsBuilding()
{
return the_ide && the_ide->IdeIsBuilding();

6
uppsrc/ide/Core/Core.h
View file

@ -74,6 +74,9 @@ public:
virtual String IdeGetFileName() = 0;
virtual String IdeGetNestFolder() = 0;
virtual String GetDefaultMethod();
virtual VectorMap<String, String> GetMethodVars(const String& method);
virtual ~IdeContext() {}
};
@ -98,6 +101,9 @@ void IdeConsoleEndGroup();
bool IdeConsoleWait();
void IdeGotoCodeRef(String s);
String GetDefaultMethod();
VectorMap<String, String> GetMethodVars(const String& method);
bool IdeIsDebug();
void IdeEndDebug();
void IdeSetBottom(Ctrl& ctrl);