Attachment 313878 Details for Bug 458538 – redesigned and cleaned up patch (w/o -g part)

[patch] redesigned and cleaned up patch (w/o -g part)

eclipse-3.3.2-alt-launcher-set-install-dir-and-shared-config.patch (text/plain), 1.36 KB, created by Igor Vlasenko on 2008-08-09 14:18:12 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Igor Vlasenko

Created: 2008-08-09 14:18:12 UTC

Size: 1.36 KB

patch

obsolete

>Index: features/org.eclipse.equinox.executable/library/eclipse.c
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.equinox.executable/library/eclipse.c,v
>retrieving revision 1.20
>diff -u -r1.20 eclipse.c
>--- library/eclipse.c	8 Feb 2007 16:57:15 -0000	1.20
>+++ library/eclipse.c	1 Mar 2007 03:44:19 -0000
>@@ -331,8 +331,9 @@
> 
> /* Define the required VM arguments (all platforms). */
> static _TCHAR*  cp = NULL;
> static _TCHAR*  cpValue = NULL;					
>-static _TCHAR** reqVMarg[] = { &cp, &cpValue, NULL };	/* required VM args */
>+static _TCHAR* sharedConfigurationDir = _T_ECLIPSE("-Dosgi.sharedConfiguration.area=/usr/lib/eclipse/configuration");
>+static _TCHAR** reqVMarg[] = { &sharedConfigurationDir, &cp, &cpValue, NULL };	/* required VM args */
> static _TCHAR** userVMarg  = NULL;	     				/* user specific args for the Java VM  */
> static _TCHAR** eeVMarg = NULL;							/* vm args specified in ee file */
> static int nEEargs = 0;
>@@ -941,9 +942,10 @@
> {
> 	_TCHAR*  ch;
> 	_TCHAR*  programDir;
>+	_TCHAR* temp = _T_ECLIPSE("/usr/share/eclipse/");
> 
>-    programDir = malloc( (_tcslen( program ) + 1) * sizeof(_TCHAR) );
>-    _tcscpy( programDir, program );
>+	programDir = malloc( (_tcslen( temp ) + 1) * sizeof(_TCHAR) );
>+	_tcscpy( programDir, temp );
>     ch = _tcsrchr( programDir, dirSeparator );
>         if (ch != NULL)
>     {

Actions: View | Diff

Attachments on bug 458538: 313878 | 313879