diff options
| author | Pascal Rapicault | 2015-04-23 00:51:56 +0000 |
|---|---|---|
| committer | Arun Thondapu | 2015-04-23 12:35:36 +0000 |
| commit | 843c763c69e71aa3f1e4d510e01a7cfeb462ee98 (patch) | |
| tree | d9c42c82b619fb866148d808a7f2d25b3c2c2381 /features | |
| parent | 94ebf5d41617a207763816faedc652844a40d990 (diff) | |
| download | rt.equinox.framework-843c763c69e71aa3f1e4d510e01a7cfeb462ee98.tar.gz rt.equinox.framework-843c763c69e71aa3f1e4d510e01a7cfeb462ee98.tar.xz rt.equinox.framework-843c763c69e71aa3f1e4d510e01a7cfeb462ee98.zip | |
Bug 461728 - [Mac] Allow users to specify values in eclipse.ini outside of the installation
Pass protect flag to java
Change-Id: I44ecfa968b542cd258e8d9e877af3de73aa81947
Diffstat (limited to 'features')
| -rw-r--r-- | features/org.eclipse.equinox.executable.feature/library/eclipse.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/features/org.eclipse.equinox.executable.feature/library/eclipse.c b/features/org.eclipse.equinox.executable.feature/library/eclipse.c index d9db6606d..ca6891f20 100644 --- a/features/org.eclipse.equinox.executable.feature/library/eclipse.c +++ b/features/org.eclipse.equinox.executable.feature/library/eclipse.c @@ -1125,7 +1125,7 @@ static void getVMCommand( int launchMode, int argc, _TCHAR* argv[], _TCHAR **vmA * VMARGS + vmArg + requiredVMargs * + NULL) */ - totalProgArgs = 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 1 + argc + 2 + 1 + nVMarg + nEEargs + nReqVMarg + 1; + totalProgArgs = 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 1 + argc + 2 + 1 + nVMarg + nEEargs + nReqVMarg + 1; *progArgv = malloc( totalProgArgs * sizeof( _TCHAR* ) ); dst = 0; @@ -1165,6 +1165,12 @@ static void getVMCommand( int launchMode, int argc, _TCHAR* argv[], _TCHAR **vmA (*progArgv)[ dst++ ] = STARTUP; (*progArgv)[ dst++ ] = jarFile; + /* the protect mode */ + if (protectMode) { + (*progArgv)[ dst++ ] = PROTECT; + (*progArgv)[ dst++ ] = protectMode; + } + /* override or append vm args */ (*progArgv)[ dst++ ] = appendVmargs ? APPEND_VMARGS : OVERRIDE_VMARGS; |