eclipse-launcher-set-install-dir-and-shared-config.patch

   1 Index: library/eclipse.c
   2 ===================================================================
   3 RCS file: /cvsroot/eclipse/org.eclipse.equinox.executable/library/eclipse.c,v
   4 retrieving revision 1.20
   5 --- library/eclipse.c   8 Feb 2007 16:57:15 -0000       1.20
   6 +++ library/eclipse.c   1 Mar 2007 03:44:19 -0000
   7 @@ -330,8 +330,9 @@
   8
   9  /* Define the required VM arguments (all platforms). */
  10  static _TCHAR*  cp = NULL;
  11 -static _TCHAR*  cpValue = NULL;
  12 -static _TCHAR** reqVMarg[] = { &cp, &cpValue, NULL };  /* required VM args */
  13 +static _TCHAR*  cpValue = NULL;
  14 +static _TCHAR* sharedConfigurationDir = _T_ECLIPSE("-Dosgi.sharedConfiguration.area=/usr/lib/eclipse/configuration");
  15 +static _TCHAR** reqVMarg[] = { &sharedConfigurationDir, &cp, &cpValue, NULL }; /* required VM args */
  16  static _TCHAR** userVMarg  = NULL;                                     /* user specific args for the Java VM  */
  17  static _TCHAR** eeVMarg = NULL;                                                        /* vm args specified in ee file */
  18  static int nEEargs = 0;
  19 @@ -915,20 +916,12 @@
  20   */
  21  _TCHAR* getProgramDir( )
  22  {
  23 -       _TCHAR*  ch;
  24         _TCHAR*  programDir;
  25 +       _TCHAR* temp = _T_ECLIPSE("/usr/share/eclipse/");
  26
  27 -    programDir = malloc( (_tcslen( program ) + 1) * sizeof(_TCHAR) );
  28 -    _tcscpy( programDir, program );
  29 -    ch = _tcsrchr( programDir, dirSeparator );
  30 -       if (ch != NULL)
  31 -    {
  32 -       *(ch+1) = _T_ECLIPSE('\0');
  33 -               return programDir;
  34 -    }
  35 -
  36 -    free( programDir );
  37 -    return NULL;
  38 +       programDir = malloc( (_tcslen( temp + 1 )) * sizeof(_TCHAR) );
  39 +       _tcscpy( programDir, temp );
  40 +       return programDir;
  41  }
  42
  43  static _TCHAR* findStartupJar(){