diff options
Diffstat (limited to 'features/org.eclipse.equinox.executable.feature/library/eclipse.c')
| -rw-r--r-- | features/org.eclipse.equinox.executable.feature/library/eclipse.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/features/org.eclipse.equinox.executable.feature/library/eclipse.c b/features/org.eclipse.equinox.executable.feature/library/eclipse.c index 25d6757f0..444c89b88 100644 --- a/features/org.eclipse.equinox.executable.feature/library/eclipse.c +++ b/features/org.eclipse.equinox.executable.feature/library/eclipse.c @@ -122,7 +122,10 @@ * The launcher gets arguments from the command line and/or from a configuration file. * The configuration file must have the same name and location as the launcher executable * and the extension .ini. For example, the eclipse.ini configuration file must be - * in the same folder as the eclipse.exe or eclipse executable. + * in the same folder as the eclipse.exe or eclipse executable (except in the case of + * Mac OS X where the eclipse.ini can be read from a Mac specific configuration folder + * recommended by the OS, see bugs 461725 and 461728 for more details). + * * The format of the ini file matches that of the command line arguments - one * argument per line. * In general, the settings of the config file are expected to be overriden by the @@ -285,7 +288,7 @@ static _TCHAR* timeoutString = NULL; /* timeout value for opening a file */ static _TCHAR* defaultAction = NULL; /* default action for non '-' command line arguments */ static _TCHAR* iniFile = NULL; /* the launcher.ini file set if --launcher.ini was specified */ static _TCHAR* gtkVersionString = NULL; /* GTK+ version specified by --launcher.GTK_version */ -static _TCHAR* protectMode = NULL; /* Process -protectMode to trigger the reading of the eclipse.ini in the configuration (at this point mac specific) */ +static _TCHAR* protectMode = NULL; /* Process protectMode specified via -protect, to trigger the reading of eclipse.ini in the configuration (Mac specific currently) */ /* variables for ee options */ static _TCHAR* eeExecutable = NULL; |