+#if defined(__WIN32__)
+#define MessageBox _MessageBox
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+#undef MessageBox
+#endif
+
#ifdef ECERE_STATIC
-import static "ecere"
+public import static "ecere"
#else
-import "ecere"
+public import "ecere"
#endif
+define ecpDefaultCommand = "ecp";
+define eccDefaultCommand = "ecc";
+define ecsDefaultCommand = "ecs";
+define earDefaultCommand = "ear";
+define cppDefaultCommand = "gcc"; // As per #624 we decided to default to "gcc"...
+define ccDefaultCommand = "gcc";
+define cxxDefaultCommand = "g++";
+//define ldDefaultCommand = "gcc";
+define arDefaultCommand = "ar";
+define objectDefaultFileExt = "o";
+define outputDefaultFileExt = "";
+
import "StringsBox"
import "OldIDESettings"
define defaultCompilerName = "Default";
-define defaultObjDirExpression = "obj/$(CONFIG).$(PLATFORM)";
+define defaultObjDirExpression = "obj/$(CONFIG).$(PLATFORM)$(COMPILER_SUFFIX)$(DEBUG_SUFFIX)";
-char * settingsDirectoryNames[DirTypes] =
+const char * settingsDirectoryNames[DirTypes] =
{
"Include Files",
"Library Files",
"Executable Files"
};
+// This function cannot accept same pointer for source and output
+// todo: rename ReplaceSpaces to EscapeSpaceAndSpecialChars or something
+void ReplaceSpaces(char * output, const char * source)
+{
+ int c, dc;
+ char ch, pch = 0;
+
+ for(c = 0, dc = 0; (ch = source[c]); c++, dc++)
+ {
+ if(ch == ' ') output[dc++] = '\\';
+ if(ch == '\"') output[dc++] = '\\';
+ if(ch == '&') output[dc++] = '\\';
+ if(pch != '$')
+ {
+ if(ch == '(' || ch == ')') output[dc++] = '\\';
+ pch = ch;
+ }
+ else if(ch == ')')
+ pch = 0;
+ output[dc] = ch;
+ }
+ output[dc] = '\0';
+}
+
+
enum GlobalSettingsChange { none, editorSettings, projectOptions, compilerSettings };
-char * CopyValidateMakefilePath(char * path)
+enum PathRelationship { unrelated, identical, siblings, subPath, parentPath, insuficientInput, pathEmpty, toEmpty, pathNull, toNull, bothEmpty, bothNull };
+PathRelationship eString_PathRelated(const char * path, const char * to, char * pathDiff)
{
- const int map[] = { 0, 1, 2, 3, 4, 0, 1, 7 };
- const char * vars[] = { "$(MODULE)", "$(CONFIG)", "$(PLATFORM)", "$(COMPILER)", "$(TARGET)", "$(PROJECT)", "$(CONFIGURATION)", (char *)0 };
+ PathRelationship result;
+ if(pathDiff) *pathDiff = '\0';
+ if(path && *path && to && *to)
+ {
+ char toPart[MAX_FILENAME], toRest[MAX_LOCATION];
+ char pathPart[MAX_FILENAME], pathRest[MAX_LOCATION];
+ strcpy(toRest, to);
+ strcpy(pathRest, path);
+ for(; toRest[0] && pathRest[0];)
+ {
+ SplitDirectory(toRest, toPart, toRest);
+ SplitDirectory(pathRest, pathPart, pathRest);
+ if(!fstrcmp(pathPart, toPart)) result = siblings;
+ else break;
+ }
+ if(result == siblings)
+ {
+ if(!*toRest && !*pathRest) result = identical;
+ else if(!*pathRest) result = parentPath;
+ else result = subPath;
+ if(pathDiff && result != identical) strcpy(pathDiff, *pathRest == '\0' ? toRest : pathRest);
+ }
+ else result = unrelated;
+ }
+ else
+ {
+ if(path && to)
+ {
+ if(!*path && !*to) result = bothEmpty;
+ else if(!*path) result = pathEmpty;
+ else result = toEmpty;
+ }
+ else if(!path && !to) result = bothNull;
+ else if(!path) result = pathNull;
+ else result = toNull;
+ }
+ return result;
+}
+
+char * CopyValidateMakefilePath(const char * path)
+{
+ const int map[] = { 0, 1, 2, 3, 4, 5, 6, 0, 1, 2, 7 };
+ const char * vars[] = { "$(MODULE)", "$(CONFIG)", "$(PLATFORM)", "$(COMPILER)", "$(TARGET)", "$(COMPILER_SUFFIX)", "$(DEBUG_SUFFIX)", "$(PROJECT)", "$(CONFIGURATION)", "$(TARGET_PLATFORM)",(char *)0 };
char * copy = null;
if(path)
{
int len;
- len = strlen(path);
+ len = (int)strlen(path);
copy = CopyString(path);
if(len)
{
int c;
char * tmp = copy;
char * start = tmp;
- Array<char *> parts { };
-
+ Array<const char *> parts { };
+
for(c=0; c<len; c++)
{
if(tmp[c] == '$')
return copy;
}
-CompilerConfig MakeDefaultCompiler(char * name, bool readOnly)
+void ValidPathBufCopy(char *output, const char *input)
+{
+#ifdef __WIN32__
+ bool volumePath = false;
+#endif
+ strcpy(output, input);
+ TrimLSpaces(output, output);
+ TrimRSpaces(output, output);
+ MakeSystemPath(output);
+#ifdef __WIN32__
+ if(output[0] && output[1] == ':')
+ {
+ output[1] = '_';
+ volumePath = true;
+ }
+#endif
+ {
+ const char * chars = "*|:\",<>?";
+ char ch, * s = output, * o = output;
+ while((ch = *s++)) { if(!strchr(chars, ch)) *o++ = ch; }
+ *o = '\0';
+ }
+#ifdef __WIN32__
+ if(volumePath && output[0])
+ output[1] = ':';
+#endif
+}
+
+void RemoveTrailingPathSeparator(char *path)
+{
+ int len;
+ len = (int)strlen(path);
+ if(len>1 && path[len-1] == DIR_SEP)
+ path[--len] = '\0';
+}
+
+void BasicValidatePathBoxPath(PathBox pathBox)
+{
+ char path[MAX_LOCATION];
+ ValidPathBufCopy(path, pathBox.path);
+ RemoveTrailingPathSeparator(path);
+ pathBox.path = path;
+}
+
+CompilerConfig MakeDefaultCompiler(const char * name, bool readOnly)
{
CompilerConfig defaultCompiler
{
name,
readOnly,
gcc,
- GetRuntimePlatform(),
+ __runtimePlatform,
1,
makeDefaultCommand,
ecpDefaultCommand,
ecsDefaultCommand,
earDefaultCommand,
cppDefaultCommand,
- ccDefaultCommand
+ ccDefaultCommand,
+ cxxDefaultCommand,
+ arDefaultCommand
+ //ldDefaultCommand
};
incref defaultCompiler;
return defaultCompiler;
}
-class IDESettingsContainer : GlobalSettings
-{
#ifdef SETTINGS_TEST
- settingsName = "ecereIDESettingsTest";
+define settingsName = "ecereIDE-SettingsTest";
#else
- settingsName = "ecereIDE";
+define ideSettingsName = "ecereIDE";
#endif
+class IDESettingsContainer : GlobalSettings
+{
+ settingsName = ideSettingsName;
+
virtual void OnLoad(GlobalSettingsData data);
+ char moduleLocation[MAX_LOCATION];
+
private:
+ FileSize settingsFileSize;
+
IDESettingsContainer()
{
char path[MAX_LOCATION];
char * start;
- LocateModule(null, path);
+ LocateModule(null, moduleLocation);
+ strcpy(path, moduleLocation);
+ StripLastDirectory(moduleLocation, moduleLocation);
+ ChangeCh(moduleLocation, '\\', '/');
// PortableApps.com directory structure
if((start = strstr(path, "\\App\\EcereSDK\\bin\\ide.exe")))
{
strcpy(configFilePath, path);
PathCat(configFilePath, "Data");
- PathCat(configFilePath, "ecereIDE.ini");
+ PathCat(configFilePath, ideSettingsName);
+ ChangeExtension(configFilePath, "ini", configFilePath);
strcpy(defaultConfigFilePath, path);
PathCat(defaultConfigFilePath, "App");
PathCat(defaultConfigFilePath, "DefaultData");
- PathCat(defaultConfigFilePath, "ecereIDE.ini");
-
+ PathCat(defaultConfigFilePath, ideSettingsName);
+ ChangeExtension(defaultConfigFilePath, "ini", defaultConfigFilePath);
+
if(FileExists(defaultConfigFilePath))
{
if(!FileExists(configFilePath))
}
PathCat(path, "Data");
// the forced settings location will only be
- // used if the running ide's path matches
+ // used if the running ide's path matches
// the PortableApps.com directory structure
- // and the default ini file is found in
+ // and the default ini file is found in
// the DefaultData directory
settingsLocation = path;
portable = true;
void OnAskReloadSettings()
{
- /*if(MessageBox { type = YesNo, master = this,
- text = "Global Settings Modified Externally",
- contents = "The global settings were modified by another instance.\n"
- "Would you like to reload them?" }.Modal() == Yes)*/
+ FileSize newSettingsFileSize;
+
+ if(OpenAndLock(&newSettingsFileSize))
{
- Load();
+ if((double)settingsFileSize - (double)newSettingsFileSize < 2048)
+ Load();
+ else
+ {
+ GuiApplication app = ((GuiApplication)__thisModule.application);
+ Window w;
+ for(w = app.desktop.firstChild; w && (!w.created || !w.visible); w = w.next);
+
+ CloseAndMonitor();
+
+ MessageBox { master = w, type = ok, isModal = true,
+ text = "Global Settings Modified Externally",
+ contents = "The global settings were modified by another process and a drastic shrinking of the settings file was detected.\n"
+ "The new settings will not be loaded to prevent loss of your ide settings.\n"
+ "Please check your settings file and make sure to save this IDE's global settings if your settings file has been compromised."
+ }.Create();
+ }
}
}
- void Load()
+ SettingsIOResult Load()
{
SettingsIOResult result = GlobalSettings::Load();
IDESettings data = (IDESettings)this.data;
bool loaded;
OldIDESettings oldSettings { };
Close();
- loaded = oldSettings.Load();
+ loaded = oldSettings.Load() == success;
oldSettings.Close();
if(loaded)
{
delete data.displayDriver; data.displayDriver = CopyString(oldSettings.displayDriver);
data.projectDefaultTargetDir = oldSettings.projectDefaultTargetDir;
data.projectDefaultIntermediateObjDir = oldSettings.projectDefaultIntermediateObjDir;
-
+
Save();
result = success;
}
if(result == fileNotFound || !data)
{
data = (IDESettings)this.data;
- data.useFreeCaret = true;
+ data.useFreeCaret = false; //true;
data.showLineNumbers = true;
- data.caretFollowsScrolling = true;
+ data.caretFollowsScrolling = false; //true;
}
}
// Ensure we have a default compiler
defaultCompiler._refCount = 0;
CloseAndMonitor();
+ FileGetSize(settingsFilePath, &settingsFileSize);
if(data.compilerConfigs)
{
- for(c : data.compilerConfigs)
+ for(ccfg : data.compilerConfigs)
{
- CompilerConfig compiler = c;
- incref compiler;
- }
- }
- if(portable)
- {
- char location[MAX_LOCATION];
- LocateModule(null, location);
- StripLastDirectory(location, location);
- if(location[0] && FileExists(location).isDirectory)
- {
- if(data.portableLocation && data.portableLocation[0] && strcmp(data.portableLocation, location))
- {
- data.UpdatePortablePaths(data.portableLocation, location);
- data.portableLocation = location;
- Save();
- }
+ if(!ccfg.ecpCommand || !ccfg.ecpCommand[0])
+ ccfg.ecpCommand = ecpDefaultCommand;
+ if(!ccfg.eccCommand || !ccfg.eccCommand[0])
+ ccfg.eccCommand = eccDefaultCommand;
+ if(!ccfg.ecsCommand || !ccfg.ecsCommand[0])
+ ccfg.ecsCommand = ecsDefaultCommand;
+ if(!ccfg.earCommand || !ccfg.earCommand[0])
+ ccfg.earCommand = earDefaultCommand;
+ if(!ccfg.cppCommand || !ccfg.cppCommand[0])
+ ccfg.cppCommand = cppDefaultCommand;
+ if(!ccfg.ccCommand || !ccfg.ccCommand[0])
+ ccfg.ccCommand = ccDefaultCommand;
+ if(!ccfg.cxxCommand || !ccfg.cxxCommand[0])
+ ccfg.cxxCommand = cxxDefaultCommand;
+ /*if(!ccfg.ldCommand || !ccfg.ldCommand[0])
+ ccfg.ldCommand = ldDefaultCommand;*/
+ if(!ccfg.arCommand || !ccfg.arCommand[0])
+ ccfg.arCommand = arDefaultCommand;
+ if(!ccfg.objectFileExt || !ccfg.objectFileExt[0])
+ ccfg.objectFileExt = objectDefaultFileExt;
+ /*if(!ccfg.staticLibFileExt || !ccfg.staticLibFileExt[0])
+ ccfg.staticLibFileExt = staticLibDefaultFileExt;*/
+ /*if(!ccfg.sharedLibFileExt || !ccfg.sharedLibFileExt[0])
+ ccfg.sharedLibFileExt = sharedLibDefaultFileExt;*/
+ /*if(!ccfg.executableFileExt || !ccfg.executableFileExt[0])
+ ccfg.executableFileExt = outputDefaultFileExt;*/
+ incref ccfg;
}
}
+ if(portable && moduleLocation[0] && FileExists(moduleLocation).isDirectory)
+ data.ManagePortablePaths(moduleLocation, true);
data.ForcePathSeparatorStyle(true);
OnLoad(data);
+ return result;
}
- void Save()
+ SettingsIOResult Save()
{
+ SettingsIOResult result;
+
IDESettings data = (IDESettings)this.data;
- Platform runtimePlatform = GetRuntimePlatform();
- data.ForcePathSeparatorStyle(runtimePlatform != win32);
- if(!GlobalSettings::Save())
+ if(portable && moduleLocation[0] && FileExists(moduleLocation).isDirectory)
+ data.ManagePortablePaths(moduleLocation, false);
+ data.ForcePathSeparatorStyle(true);
+ result = GlobalSettings::Save();
+ if(result != success)
PrintLn("Error saving IDE settings");
- if(runtimePlatform == win32)
- data.ForcePathSeparatorStyle(true);
+ if(portable && moduleLocation[0] && FileExists(moduleLocation).isDirectory)
+ data.ManagePortablePaths(moduleLocation, true);
CloseAndMonitor();
+ FileGetSize(settingsFilePath, &settingsFileSize);
+ return result;
}
}
List<CompilerConfig> compilerConfigs { };
Array<String> recentFiles { };
Array<String> recentProjects { };
- property char * docDir
+ property const char * docDir
{
set { delete docDir; if(value && value[0]) docDir = CopyString(value); }
get { return docDir ? docDir : ""; }
isset { return docDir && docDir[0]; }
}
- property char * ideFileDialogLocation
+ property const char * ideFileDialogLocation
{
set { delete ideFileDialogLocation; if(value && value[0]) ideFileDialogLocation = CopyString(value); }
get { return ideFileDialogLocation ? ideFileDialogLocation : ""; }
isset { return ideFileDialogLocation && ideFileDialogLocation[0]; }
}
- property char * ideProjectFileDialogLocation
+ property const char * ideProjectFileDialogLocation
{
set { delete ideProjectFileDialogLocation; if(value && value[0]) ideProjectFileDialogLocation = CopyString(value); }
get { return ideProjectFileDialogLocation ? ideProjectFileDialogLocation : ""; }
bool showLineNumbers;
bool caretFollowsScrolling;
char * displayDriver;
-
+
// TODO: Classify settings
//EditorSettings editor { };
- property char * projectDefaultTargetDir
+ property const char * projectDefaultTargetDir
{
set { delete projectDefaultTargetDir; if(value && value[0]) projectDefaultTargetDir = CopyValidateMakefilePath(value); }
get { return projectDefaultTargetDir ? projectDefaultTargetDir : ""; }
isset { return projectDefaultTargetDir && projectDefaultTargetDir[0]; }
}
- property char * projectDefaultIntermediateObjDir
+ property const char * projectDefaultIntermediateObjDir
{
set { delete projectDefaultIntermediateObjDir; if(value && value[0]) projectDefaultIntermediateObjDir = CopyValidateMakefilePath(value); }
get { return projectDefaultIntermediateObjDir ? projectDefaultIntermediateObjDir : ""; }
isset { return projectDefaultIntermediateObjDir && projectDefaultIntermediateObjDir[0]; }
}
- property char * portableLocation
+ property const char * compilerConfigsDir
{
- set { delete portableLocation; if(value && value[0]) portableLocation = CopyString(value); }
- get { return portableLocation ? portableLocation : ""; }
- isset { return portableLocation && portableLocation[0]; }
+ set { delete compilerConfigsDir; if(value && value[0]) compilerConfigsDir = CopyString(value); }
+ get { return compilerConfigsDir ? compilerConfigsDir : ""; }
+ isset { return compilerConfigsDir && compilerConfigsDir[0]; }
}
- property char * defaultCompiler
+ property const char * defaultCompiler
{
set { delete defaultCompiler; if(value && value[0]) defaultCompiler = CopyString(value); }
get { return defaultCompiler && defaultCompiler[0] ? defaultCompiler : defaultCompilerName; }
isset { return defaultCompiler && defaultCompiler[0]; }
}
+ property const String language
+ {
+ set
+ {
+ delete language;
+ language = CopyString(value);
+ }
+ get { return language; }
+ isset { return language != null; }
+ }
+
+ property Array<NamedString> findInFileFileFilters
+ {
+ set
+ {
+ findInFileFileFilters.Free();
+ if(value)
+ {
+ delete findInFileFileFilters;
+ findInFileFileFilters = value;
+ }
+ }
+ get { return findInFileFileFilters; }
+ isset { return findInFileFileFilters.count != 0; }
+ }
+
private:
char * docDir;
char * ideFileDialogLocation;
char * ideProjectFileDialogLocation;
char * projectDefaultTargetDir;
char * projectDefaultIntermediateObjDir;
- char * portableLocation;
+ char * compilerConfigsDir;
char * defaultCompiler;
+ String language;
+ Array<NamedString> findInFileFileFilters { };
- CompilerConfig GetCompilerConfig(String compilerName)
+ CompilerConfig GetCompilerConfig(const String compilerName)
{
- char * name = compilerName && compilerName[0] ? compilerName : defaultCompilerName;
+ const char * name = compilerName && compilerName[0] ? compilerName : defaultCompilerName;
CompilerConfig compilerConfig = null;
for(compiler : compilerConfigs)
{
recentProjects.Free();
delete recentProjects;
delete docDir;
-
+
delete projectDefaultTargetDir;
delete projectDefaultIntermediateObjDir;
- delete portableLocation;
+ delete compilerConfigsDir;
delete defaultCompiler;
+ delete language;
delete ideFileDialogLocation;
delete ideProjectFileDialogLocation;
delete displayDriver;
+
+ if(findInFileFileFilters) findInFileFileFilters.Free();
}
void ForcePathSeparatorStyle(bool unixStyle)
if(projectDefaultIntermediateObjDir && projectDefaultIntermediateObjDir[0])
ChangeCh(projectDefaultIntermediateObjDir, from, to);
- if(portableLocation && portableLocation[0])
- ChangeCh(portableLocation, from, to);
+ if(compilerConfigsDir && compilerConfigsDir[0])
+ ChangeCh(compilerConfigsDir, from, to);
}
- bool UpdatePortablePaths(char * oldPath, char * newPath)
+ void ManagePortablePaths(char * location, bool makeAbsolute)
{
- int oldLen = strlen(oldPath);
- int newLen = strlen(newPath);
+ int c;
if(compilerConfigs && compilerConfigs.count)
{
for(config : compilerConfigs)
{
- DirTypes c;
- for(c = 0; c < DirTypes::enumSize; c++)
+ DirTypes t;
+ for(t = 0; t < DirTypes::enumSize; t++)
{
- Array<String> dirs;
- if(c == executables) dirs = config.executableDirs;
- else if(c == includes) dirs = config.includeDirs;
- else if(c == libraries) dirs = config.libraryDirs;
+ Array<String> dirs = null;
+ if(t == executables) dirs = config.executableDirs;
+ else if(t == includes) dirs = config.includeDirs;
+ else if(t == libraries) dirs = config.libraryDirs;
if(dirs && dirs.count)
{
- int i;
- for(i = 0; i < dirs.count; i++)
+ for(c = 0; c < dirs.count; c++)
{
- if(dirs[i] && dirs[i][0])
- dirs[i] = ReplaceInCopyString(dirs[i], oldPath, oldLen, newPath, newLen);
+ if(dirs[c] && dirs[c][0])
+ dirs[c] = UpdatePortablePath(dirs[c], location, makeAbsolute);
}
}
}
}
if(recentFiles && recentFiles.count)
{
- int c;
for(c = 0; c < recentFiles.count; c++)
{
if(recentFiles[c] && recentFiles[c][0])
- recentFiles[c] = ReplaceInCopyString(recentFiles[c], oldPath, oldLen, newPath, newLen);
+ recentFiles[c] = UpdatePortablePath(recentFiles[c], location, makeAbsolute);
}
}
if(recentProjects && recentProjects.count)
{
- int c;
for(c = 0; c < recentProjects.count; c++)
{
if(recentProjects[c] && recentProjects[c][0])
- recentProjects[c] = ReplaceInCopyString(recentProjects[c], oldPath, oldLen, newPath, newLen);
+ recentProjects[c] = UpdatePortablePath(recentProjects[c], location, makeAbsolute);
}
}
if(docDir && docDir[0])
- docDir = ReplaceInCopyString(docDir, oldPath, oldLen, newPath, newLen);
+ docDir = UpdatePortablePath(docDir, location, makeAbsolute);
if(ideFileDialogLocation && ideFileDialogLocation[0])
- ideFileDialogLocation = ReplaceInCopyString(ideFileDialogLocation, oldPath, oldLen, newPath, newLen);
+ ideFileDialogLocation = UpdatePortablePath(ideFileDialogLocation, location, makeAbsolute);
if(ideProjectFileDialogLocation && ideProjectFileDialogLocation[0])
- ideProjectFileDialogLocation = ReplaceInCopyString(ideProjectFileDialogLocation, oldPath, oldLen, newPath, newLen);
+ ideProjectFileDialogLocation = UpdatePortablePath(ideProjectFileDialogLocation, location, makeAbsolute);
if(projectDefaultTargetDir && projectDefaultTargetDir[0])
- projectDefaultTargetDir = ReplaceInCopyString(projectDefaultTargetDir, oldPath, oldLen, newPath, newLen);
+ projectDefaultTargetDir = UpdatePortablePath(projectDefaultTargetDir, location, makeAbsolute);
if(projectDefaultIntermediateObjDir && projectDefaultIntermediateObjDir[0])
- projectDefaultIntermediateObjDir = ReplaceInCopyString(projectDefaultIntermediateObjDir, oldPath, oldLen, newPath, newLen);
- return true;
+ projectDefaultIntermediateObjDir = UpdatePortablePath(projectDefaultIntermediateObjDir, location, makeAbsolute);
+
+ if(compilerConfigsDir && compilerConfigsDir[0])
+ compilerConfigsDir = UpdatePortablePath(compilerConfigsDir, location, makeAbsolute);
}
- char * ReplaceInCopyString(char * string, char * find, int lenFind, char * replace, int lenReplace)
+ char * UpdatePortablePath(char * path, const char * location, bool makeAbsolute)
{
- char * output = string;
- char * start;
- if(/*string && string[0] && */(start = strstr(string, find)))
+ char * output;
+ if(makeAbsolute)
{
- if(lenFind == lenReplace)
- strncpy(start, replace, lenReplace);
- else
+ char p[MAX_LOCATION];
+ strcpy(p, location);
+ PathCatSlash(p, path);
+ delete path;
+ output = CopyString(p);
+ }
+ else
+ {
+ PathRelationship rel = eString_PathRelated(path, location, null);
+ if(rel == subPath || rel == identical)
{
- int newLen = strlen(string) + lenReplace - lenFind + 1;
- char * newString = new char[newLen];
- start[0] = '\0';
- strcpy(newString, string);
- start += lenFind;
- strcat(newString, replace);
- strcat(newString, start);
- delete string;
- return newString;
+ char p[MAX_LOCATION];
+ MakePathRelative(path, location, p);
+ if(!*p) strcpy(p, "./");
+ else ChangeCh(p, '\\', '/');
+ delete path;
+ output = CopyString(p);
}
+ else
+ output = path;
}
return output;
}
- void AddRecentFile(char * fileName)
+ void AddRecentFile(const char * fileName)
{
int c;
char * filePath = CopyString(fileName);
//UpdateRecentMenus(owner);
}
- void AddRecentProject(char * projectName)
+ void AddRecentProject(const char * projectName)
{
int c;
char * filePath = CopyString(projectName);
static const char * compilerTypeYearString[CompilerType] = { "", "", "", "2005", "2008", "2010" };
static const char * compilerTypeProjectFileExtension[CompilerType] = { "", "", "", "vcproj", "vcproj", "vcxproj" };
// TODO: i18n with Array
-static Array<String> compilerTypeLongNames
+static Array<const String> compilerTypeLongNames
{ [
$"GNU Compiler Collection (GCC) / GNU Make",
$"Tiny C Compiler / GNU Make",
get { return this == vs8 || this == vs9 || this == vs10; }
}
- property char *
+ property const char *
{
get { return OnGetString(null, null, null); }
set
- {
+ {
if(value)
{
- Platform c;
+ CompilerType c;
for(c = firstCompilerType; c <= lastCompilerType; c++)
if(!strcmpi(value, compilerTypeNames[c]))
return c;
}
};
- property char * longName { get { return OnGetString(null, (void*)1, null); } };
- property char * versionString { get { return OnGetString(null, (void*)2, null); } };
- property char * yearString { get { return OnGetString(null, (void*)3, null); } };
- property char * projectFileExtension { get { return OnGetString(null, (void*)4, null); } };
- property char * solutionFileVersionString { get { return OnGetString(null, (void*)5, null); } };
+ property const char * longName { get { return OnGetString(null, (void*)1, null); } };
+ property const char * versionString { get { return OnGetString(null, (void*)2, null); } };
+ property const char * yearString { get { return OnGetString(null, (void*)3, null); } };
+ property const char * projectFileExtension { get { return OnGetString(null, (void*)4, null); } };
+ property const char * solutionFileVersionString { get { return OnGetString(null, (void*)5, null); } };
- char * OnGetString(char * tempString, void * fieldData, bool * needClass)
+ const char * OnGetString(char * tempString, void * fieldData, bool * needClass)
{
if(this >= firstCompilerType && this <= lastCompilerType)
{
numJobs = 1;
public:
- property char * name
+ property const char * name
{
set
{
CompilerType type;
Platform targetPlatform;
int numJobs;
- property char * makeCommand
+ property const char * makeCommand
{
set { delete makeCommand; if(value && value[0]) makeCommand = CopyString(value); }
get { return makeCommand; }
isset { return makeCommand && makeCommand[0]; }
}
- property char * ecpCommand
+ property const char * ecpCommand
{
set { delete ecpCommand; if(value && value[0]) ecpCommand = CopyString(value); }
get { return ecpCommand; }
isset { return ecpCommand && ecpCommand[0]; }
}
- property char * eccCommand
+ property const char * eccCommand
{
set { delete eccCommand; if(value && value[0]) eccCommand = CopyString(value); }
get { return eccCommand; }
isset { return eccCommand && eccCommand[0]; }
}
- property char * ecsCommand
+ property const char * ecsCommand
{
set { delete ecsCommand; if(value && value[0]) ecsCommand = CopyString(value); }
get { return ecsCommand; }
isset { return ecsCommand && ecsCommand[0]; }
}
- property char * earCommand
+ property const char * earCommand
{
set { delete earCommand; if(value && value[0]) earCommand = CopyString(value); }
get { return earCommand; }
isset { return earCommand && earCommand[0]; }
}
- property char * cppCommand
+ property const char * cppCommand
{
set { delete cppCommand; if(value && value[0]) cppCommand = CopyString(value); }
get { return cppCommand; }
isset { return cppCommand && cppCommand[0]; }
}
- property char * ccCommand
+ property const char * ccCommand
{
set { delete ccCommand; if(value && value[0]) ccCommand = CopyString(value); }
get { return ccCommand; }
isset { return ccCommand && ccCommand[0]; }
}
- property char * execPrefixCommand
+ property const char * cxxCommand
+ {
+ set { delete cxxCommand; if(value && value[0]) cxxCommand = CopyString(value); }
+ get { return cxxCommand; }
+ isset { return cxxCommand && cxxCommand[0]; }
+ }
+ property const char * arCommand
{
- set { delete execPrefixCommand; if(value && value[0]) execPrefixCommand = CopyString(value); }
- get { return execPrefixCommand; }
- isset { return execPrefixCommand && execPrefixCommand[0]; }
+ set { delete arCommand; if(value && value[0]) arCommand = CopyString(value); }
+ get { return arCommand; }
+ isset { return arCommand && arCommand[0]; }
}
+ property const char * ldCommand
+ {
+ set { delete ldCommand; if(value && value[0]) ldCommand = CopyString(value); }
+ get { return ldCommand; }
+ isset { return ldCommand && ldCommand[0]; }
+ }
+ bool noStripTarget;
+ property const char * objectFileExt
+ {
+ set { delete objectFileExt; if(value && value[0]) objectFileExt = CopyString(value); }
+ get { return objectFileExt && objectFileExt[0] ? objectFileExt : objectDefaultFileExt ; }
+ isset { return objectFileExt && objectFileExt[0] && strcmp(objectFileExt, objectDefaultFileExt); }
+ }
+ property const char * staticLibFileExt
+ {
+ set { delete staticLibFileExt; if(value && value[0]) staticLibFileExt = CopyString(value); }
+ get { return staticLibFileExt; }
+ isset { return staticLibFileExt && staticLibFileExt[0]; }
+ }
+ property const char * sharedLibFileExt
+ {
+ set { delete sharedLibFileExt; if(value && value[0]) sharedLibFileExt = CopyString(value); }
+ get { return sharedLibFileExt; }
+ isset { return sharedLibFileExt && sharedLibFileExt[0]; }
+ }
+ property const char * executableFileExt
+ {
+ set { delete executableFileExt; if(value && value[0]) executableFileExt = CopyString(value); }
+ get { return executableFileExt; }
+ isset { return executableFileExt && executableFileExt[0]; }
+ }
+ property const char * executableLauncher
+ {
+ set { delete executableLauncher; if(value && value[0]) executableLauncher = CopyString(value); }
+ get { return executableLauncher; }
+ isset { return executableLauncher && executableLauncher[0]; }
+ }
+ // TODO: implement CompilerConfig::windresCommand
bool ccacheEnabled;
bool distccEnabled;
- property char * distccHosts
+ // deprecated
+ property bool supportsBitDepth { set { } get { return true; } isset { return false; } }
+
+ property const char * distccHosts
{
set { delete distccHosts; if(value && value[0]) distccHosts = CopyString(value); }
get { return distccHosts; }
isset { return distccHosts && distccHosts[0]; }
}
+ property const char * gnuToolchainPrefix
+ {
+ set { delete gnuToolchainPrefix; if(value && value[0]) gnuToolchainPrefix = CopyString(value); }
+ get { return gnuToolchainPrefix; }
+ isset { return gnuToolchainPrefix && gnuToolchainPrefix[0]; }
+ }
+ property const char * sysroot
+ {
+ set { delete sysroot; if(value && value[0]) sysroot = CopyString(value); }
+ get { return sysroot; }
+ isset { return sysroot && sysroot[0]; }
+ }
property Array<String> includeDirs
{
set
get { return environmentVars; }
isset { return environmentVars.count != 0; }
}
+ property Array<String> prepDirectives
+ {
+ set
+ {
+ prepDirectives.Free();
+ if(value)
+ {
+ delete prepDirectives;
+ prepDirectives = value;
+ }
+ }
+ get { return prepDirectives; }
+ isset { return prepDirectives.count != 0; }
+ }
+ property Array<String> excludeLibs
+ {
+ set
+ {
+ excludeLibs.Free();
+ if(value)
+ {
+ delete excludeLibs;
+ excludeLibs = value;
+ }
+ }
+ get { return excludeLibs; }
+ isset { return excludeLibs.count != 0; }
+ }
+ property Array<String> eCcompilerFlags
+ {
+ set
+ {
+ eCcompilerFlags.Free();
+ if(value)
+ {
+ delete eCcompilerFlags;
+ eCcompilerFlags = value;
+ }
+ }
+ get { return eCcompilerFlags; }
+ isset { return eCcompilerFlags.count != 0; }
+ }
+ property Array<String> compilerFlags
+ {
+ set
+ {
+ compilerFlags.Free();
+ if(value)
+ {
+ delete compilerFlags;
+ compilerFlags = value;
+ }
+ }
+ get { return compilerFlags; }
+ isset { return compilerFlags.count != 0; }
+ }
+ property Array<String> linkerFlags
+ {
+ set
+ {
+ linkerFlags.Free();
+ if(value)
+ {
+ delete linkerFlags;
+ linkerFlags = value;
+ }
+ }
+ get { return linkerFlags; }
+ isset { return linkerFlags.count != 0; }
+ }
+ // json backward compatibility
+ property const char * gccPrefix
+ {
+ set { delete gnuToolchainPrefix; if(value && value[0]) gnuToolchainPrefix = CopyString(value); }
+ get { return gnuToolchainPrefix; }
+ isset { return false; }
+ }
+ property const char * execPrefixCommand
+ {
+ set { delete executableLauncher; if(value && value[0]) executableLauncher = CopyString(value); }
+ get { return executableLauncher; }
+ isset { return false; }
+ }
+ property const char * outputFileExt
+ {
+ set { delete executableFileExt; if(value && value[0]) executableFileExt = CopyString(value); }
+ get { return executableFileExt; }
+ isset { return false; }
+ }
+ // utility
+ property bool hasDocumentOutput
+ {
+ get
+ {
+ bool result = executableFileExt && executableFileExt[0] &&
+ (!strcmpi(executableFileExt, "htm") || !strcmpi(executableFileExt, "html"));
+ return result;
+ }
+ isset { return false; }
+ }
private:
Array<String> includeDirs { };
Array<String> libraryDirs { };
// TODO: Can JSON parse and serialize maps?
//EnvironmentVariables { };
Array<NamedString> environmentVars { };
+ Array<String> prepDirectives { };
+ Array<String> excludeLibs { };
+ Array<String> eCcompilerFlags { };
+ Array<String> compilerFlags { };
+ Array<String> linkerFlags { };
char * name;
char * makeCommand;
char * ecpCommand;
char * earCommand;
char * cppCommand;
char * ccCommand;
- char * execPrefixCommand;
+ char * cxxCommand;
+ char * ldCommand;
+ char * arCommand;
+ char * objectFileExt;
+ char * staticLibFileExt;
+ char * sharedLibFileExt;
+ char * executableFileExt;
+ char * executableLauncher;
char * distccHosts;
+ char * gnuToolchainPrefix;
+ char * sysroot;
/*union
{
struct { Array<String> includes, libraries, executables; };
delete earCommand;
delete cppCommand;
delete ccCommand;
+ delete cxxCommand;
+ delete ldCommand;
+ delete arCommand;
+ delete objectFileExt;
+ delete staticLibFileExt;
+ delete sharedLibFileExt;
+ delete executableFileExt;
delete makeCommand;
- delete execPrefixCommand;
+ delete executableLauncher;
delete distccHosts;
+ delete gnuToolchainPrefix;
+ delete sysroot;
if(environmentVars) environmentVars.Free();
if(includeDirs) { includeDirs.Free(); }
if(libraryDirs) { libraryDirs.Free(); }
if(executableDirs) { executableDirs.Free(); }
+ if(prepDirectives) { prepDirectives.Free(); }
+ if(excludeLibs) { excludeLibs.Free(); }
+ if(compilerFlags) { compilerFlags.Free(); }
+ if(eCcompilerFlags) { eCcompilerFlags.Free(); }
+ if(linkerFlags) { linkerFlags.Free(); }
}
+
+public:
CompilerConfig Copy()
{
CompilerConfig copy
earCommand,
cppCommand,
ccCommand,
- execPrefixCommand,
+ cxxCommand,
+ arCommand,
+ ldCommand,
+ noStripTarget,
+ objectFileExt,
+ staticLibFileExt,
+ sharedLibFileExt,
+ executableFileExt,
+ executableLauncher,
ccacheEnabled,
distccEnabled,
- distccHosts
+ false,
+ distccHosts,
+ gnuToolchainPrefix,
+ sysroot
};
for(s : includeDirs) copy.includeDirs.Add(CopyString(s));
for(s : libraryDirs) copy.libraryDirs.Add(CopyString(s));
for(s : executableDirs) copy.executableDirs.Add(CopyString(s));
for(ns : environmentVars) copy.environmentVars.Add(NamedString { name = ns.name, string = ns.string });
+ for(s : prepDirectives) copy.prepDirectives.Add(CopyString(s));
+ for(s : excludeLibs) copy.excludeLibs.Add(CopyString(s));
+ for(s : compilerFlags) copy.compilerFlags.Add(CopyString(s));
+ for(s : eCcompilerFlags) copy.eCcompilerFlags.Add(CopyString(s));
+ for(s : linkerFlags) copy.linkerFlags.Add(CopyString(s));
incref copy;
return copy;
}
}
+
+struct LanguageOption
+{
+ const String name;
+ const String bitmap;
+ const String code;
+ BitmapResource res;
+
+ const char * OnGetString(char * tempString, void * fieldData, bool * needClass)
+ {
+ return name;
+ }
+
+ void OnDisplay(Surface surface, int x, int y, int width, void * data, Alignment alignment, DataDisplayFlags flags)
+ {
+ Bitmap icon = res ? res.bitmap : null;
+ int w = 8 + 16;
+ if(icon)
+ surface.Blit(icon, x + (16 - icon.width) / 2,y+2,0,0, icon.width, icon.height);
+ class::OnDisplay(surface, x + w, y, width - w, null, alignment, flags);
+ }
+};
+
+Array<LanguageOption> languages
+{ [
+ { "English", ":countryCode/gb.png", "" },
+ { "汉语", ":countryCode/cn.png", "zh_CN" },
+ { "Español", ":countryCode/es.png", "es" },
+ { "Português (Brazil)", ":countryCode/br.png", "pt_BR" },
+ { "Русский (43%)", ":countryCode/ru.png", "ru" },
+ { "Nederlandse (13%)", ":countryCode/nl.png", "nl" },
+ { "Tiếng Việt (12%)", ":countryCode/vn.png", "vi" },
+ { "मराठी (10%)", ":countryCode/in.png", "mr" },
+ { "Hebrew (8%)", ":countryCode/il.png", "he" },
+ { "Magyar (8%)", ":countryCode/hu.png", "hu" }
+] };
+
+const String GetLanguageString()
+{
+ char * dot, * colon;
+ static char lang[256];
+ const String language = getenv("ECERE_LANGUAGE");
+ if(!language) language = getenv("LANGUAGE");
+ if(!language) language = getenv("LC_ALL");
+ if(!language) language = getenv("LC_MESSAGES");
+ if(!language) language = getenv("LANG");
+ if(!language) language = "";
+ if(language && (colon = strchr(language, ':')))
+ {
+ if(lang != language)
+ strncpy(lang, language, sizeof(lang));
+ lang[sizeof(lang)-1] = 0;
+ lang[colon - language] = 0;
+ language = lang;
+ }
+ if(language && (dot = strchr(language, '.')))
+ {
+ if(lang != language)
+ strncpy(lang, language, sizeof(lang));
+ lang[sizeof(lang)-1] = 0;
+ lang[dot - language] = 0;
+ language = lang;
+ }
+ return language;
+}
+
+bool LanguageRestart(const char * code, Application app, IDESettings settings, IDESettingsContainer settingsContainer, Window ide, Window projectView, bool wait)
+{
+ bool restart = true;
+ String command = null;
+ int arg0Len = (int)strlen(app.argv[0]);
+ int len = arg0Len;
+ int j;
+ char ch;
+
+ if(ide)
+ {
+ Window w;
+
+ if(projectView)
+ {
+ Window w;
+ for(w = ide.firstChild; w; w = w.next)
+ {
+ if(w.isActiveClient && w.isDocument)
+ {
+ if(!w.CloseConfirmation(true))
+ {
+ restart = false;
+ break;
+ }
+ }
+ }
+ if(restart)
+ {
+ if(!projectView.CloseConfirmation(true))
+ restart = false;
+ if(projectView.fileName)
+ {
+ const char * name = projectView.fileName;
+ if(name)
+ {
+ for(j = 0; (ch = name[j]); j++)
+ len += (ch == ' ' || ch == '\"' || ch == '&' || ch == '$' || ch == '(' || ch == ')') ? 2 : 1;
+ }
+ }
+
+ command = new char[len + 1];
+
+ strcpy(command, app.argv[0]);
+ len = arg0Len;
+ if(projectView.fileName)
+ {
+ strcat(command, " ");
+ len++;
+ ReplaceSpaces(command + len, projectView.fileName);
+ }
+ }
+ if(restart)
+ {
+ for(w = ide.firstChild; w; w = w.next)
+ if(w.isActiveClient && w.isDocument)
+ w.modifiedDocument = false;
+ projectView.modifiedDocument = false;
+ }
+ }
+ else
+ {
+ for(w = ide.firstChild; w; w = w.next)
+ {
+ if(w.isActiveClient && w.isDocument)
+ {
+ if(!w.CloseConfirmation(true))
+ {
+ restart = false;
+ break;
+ }
+ if(w.fileName)
+ {
+ const char * name = w.fileName;
+ len++;
+ for(j = 0; (ch = name[j]); j++)
+ len += (ch == ' ' || ch == '\"' || ch == '&' || ch == '$' || ch == '(' || ch == ')') ? 2 : 1;
+ }
+ }
+ }
+
+ if(restart)
+ {
+ command = new char[len + 1];
+ strcpy(command, app.argv[0]);
+ len = arg0Len;
+
+ for(w = ide.firstChild; w; w = w.next)
+ {
+ if(w.isActiveClient && w.isDocument)
+ {
+ const char * name = w.fileName;
+ if(name)
+ {
+ strcat(command, " ");
+ len++;
+ ReplaceSpaces(command + len, name);
+ len = (int)strlen(command);
+ }
+ }
+ }
+ }
+ if(restart)
+ {
+ for(w = ide.firstChild; w; w = w.next)
+ if(w.isActiveClient && w.isDocument)
+ w.modifiedDocument = false;
+ }
+ }
+ if(restart)
+ {
+ settings.language = code;
+ settingsContainer.Save();
+
+#if defined(__WIN32__)
+ // Set LANGUAGE environment variable
+ {
+ HKEY key = null;
+ uint16 wLanguage[256];
+ DWORD status;
+ wLanguage[0] = 0;
+
+ RegCreateKeyEx(HKEY_CURRENT_USER, "Environment", 0, NULL, REG_OPTION_NON_VOLATILE, KEY_ALL_ACCESS, null, &key, &status);
+ if(key)
+ {
+ UTF8toUTF16Buffer(code, wLanguage, sizeof(wLanguage) / sizeof(uint16));
+ RegSetValueExW(key, L"ECERE_LANGUAGE", 0, REG_EXPAND_SZ, (byte *)wLanguage, (uint)(wcslen(wLanguage)+1) * 2);
+ RegCloseKey(key);
+ }
+ }
+#endif
+
+ if(eClass_IsDerived(app._class, class(GuiApplication)))
+ {
+ GuiApplication guiApp = (GuiApplication)app;
+ guiApp.desktop.Destroy(0);
+ }
+ }
+ }
+ else
+ {
+ int i;
+ for(i = 1; i < app.argc; i++)
+ {
+ const char * arg = app.argv[i];
+ len++;
+ for(j = 0; (ch = arg[j]); j++)
+ len += (ch == ' ' || ch == '\"' || ch == '&' || ch == '$' || ch == '(' || ch == ')') ? 2 : 1;
+ }
+
+ command = new char[len + 1];
+ strcpy(command, app.argv[0]);
+ len = arg0Len;
+ for(i = 1; i < app.argc; i++)
+ {
+ strcat(command, " ");
+ len++;
+ ReplaceSpaces(command + len, app.argv[i]);
+ len = (int)strlen(command);
+ }
+ }
+
+ if(restart)
+ {
+ SetEnvironment("ECERE_LANGUAGE", code);
+ if(wait)
+ ExecuteWait(command);
+ else
+ Execute(command);
+ }
+ delete command;
+ return restart;
+}
Ecere Software / sdk / blobdiff