|
Lines 30-35
Link Here
|
| 30 |
#define DEFAULT_ARGS "" // use ide.cfg to define default arguments |
30 |
#define DEFAULT_ARGS "" // use ide.cfg to define default arguments |
| 31 |
|
31 |
|
| 32 |
#define JDK_KEY "Software\\JavaSoft\\Java Development Kit" |
32 |
#define JDK_KEY "Software\\JavaSoft\\Java Development Kit" |
|
|
33 |
#define JRE_KEY "Software\\JavaSoft\\Java Runtime Environment" |
| 33 |
#define DEFAULT_IDE_KEY "Software\\netbeans.org\\NetBeans IDE\\Dev" |
34 |
#define DEFAULT_IDE_KEY "Software\\netbeans.org\\NetBeans IDE\\Dev" |
| 34 |
#define DEFAULT_USERDIR_NAME ".netbeans\\Dev" |
35 |
#define DEFAULT_USERDIR_NAME ".netbeans\\Dev" |
| 35 |
|
36 |
|
|
Lines 112-118
Link Here
|
| 112 |
*pc = '\0'; |
113 |
*pc = '\0'; |
| 113 |
strcpy(idehome, buf); |
114 |
strcpy(idehome, buf); |
| 114 |
|
115 |
|
| 115 |
findJdkFromRegistry(JDK_KEY, jdkhome); |
116 |
if (findJdkFromRegistry(JDK_KEY, jdkhome) == 1) |
|
|
117 |
findJdkFromRegistry(JRE_KEY, jdkhome); |
| 116 |
parseCommandLine(DEFAULT_ARGS); |
118 |
parseCommandLine(DEFAULT_ARGS); |
| 117 |
parseIdeCfg(idehome); |
119 |
parseIdeCfg(idehome); |
| 118 |
parseArgs(argc - 1, argv + 1); // skip progname |
120 |
parseArgs(argc - 1, argv + 1); // skip progname |
|
Lines 335-340
Link Here
|
| 335 |
break; |
337 |
break; |
| 336 |
} |
338 |
} |
| 337 |
} |
339 |
} |
|
|
340 |
|
| 341 |
if (NULL == hJvm) { |
| 342 |
//try loading the JRE |
| 343 |
strcat(strcat(strcpy(jvmpath, jdkhome),"\\bin\\client\\"),"\\jvm.dll"); |
| 344 |
hJvm = LoadLibrary(jvmpath); |
| 345 |
} |
| 338 |
|
346 |
|
| 339 |
if (NULL == hJvm) { |
347 |
if (NULL == hJvm) { |
| 340 |
if (jvm_name != NULL) |
348 |
if (jvm_name != NULL) |
|
Lines 1383-1389
Link Here
|
| 1383 |
*pc = '\0'; |
1391 |
*pc = '\0'; |
| 1384 |
strcpy(idehome, buf); |
1392 |
strcpy(idehome, buf); |
| 1385 |
|
1393 |
|
| 1386 |
findJdkFromRegistry(JDK_KEY, jdkhome); |
1394 |
if (findJdkFromRegistry(JDK_KEY, jdkhome) == 1) |
|
|
1395 |
findJdkFromRegistry(JRE_KEY, jdkhome); |
| 1387 |
parseCommandLine(DEFAULT_ARGS); |
1396 |
parseCommandLine(DEFAULT_ARGS); |
| 1388 |
parseIdeCfg(idehome); |
1397 |
parseIdeCfg(idehome); |
| 1389 |
parseArgs(__argc - 1, __argv + 1); // skip progname |
1398 |
parseArgs(__argc - 1, __argv + 1); // skip progname |