equal
deleted
inserted
replaced
103 if (running != wanted) { |
103 if (running != wanted) { |
104 JLI_ReportErrorMessage(JRE_ERROR2, wanted); |
104 JLI_ReportErrorMessage(JRE_ERROR2, wanted); |
105 exit(1); |
105 exit(1); |
106 } |
106 } |
107 |
107 |
108 /* Do this before we read jvm.cfg */ |
|
109 EnsureJreInstallation(jrepath); |
|
110 |
|
111 /* Find out where the JRE is that we will be using. */ |
108 /* Find out where the JRE is that we will be using. */ |
112 if (!GetJREPath(jrepath, so_jrepath)) { |
109 if (!GetJREPath(jrepath, so_jrepath)) { |
113 JLI_ReportErrorMessage(JRE_ERROR1); |
110 JLI_ReportErrorMessage(JRE_ERROR1); |
114 exit(2); |
111 exit(2); |
115 } |
112 } |
|
113 |
|
114 /* Do this before we read jvm.cfg and after jrepath is initialized */ |
|
115 EnsureJreInstallation(jrepath); |
116 |
116 |
117 /* Find the specified JVM type */ |
117 /* Find the specified JVM type */ |
118 if (ReadKnownVMs(jrepath, (char*)GetArch(), JNI_FALSE) < 1) { |
118 if (ReadKnownVMs(jrepath, (char*)GetArch(), JNI_FALSE) < 1) { |
119 JLI_ReportErrorMessage(CFG_ERROR7); |
119 JLI_ReportErrorMessage(CFG_ERROR7); |
120 exit(1); |
120 exit(1); |
211 if (JLI_StrCmp(GetArch(), "i386") != 0 ) { |
211 if (JLI_StrCmp(GetArch(), "i386") != 0 ) { |
212 return; |
212 return; |
213 } |
213 } |
214 /* Does our bundle directory exist ? */ |
214 /* Does our bundle directory exist ? */ |
215 JLI_Snprintf(tmpbuf, sizeof(tmpbuf), "%s\\lib\\bundles", jrepath); |
215 JLI_Snprintf(tmpbuf, sizeof(tmpbuf), "%s\\lib\\bundles", jrepath); |
|
216 JLI_TraceLauncher("EnsureJreInstallation: %s\n", tmpbuf); |
216 if (stat(tmpbuf, &s) != 0) { |
217 if (stat(tmpbuf, &s) != 0) { |
217 return; |
218 return; |
218 } |
219 } |
219 /* Does our jkernel dll exist ? */ |
220 /* Does our jkernel dll exist ? */ |
220 JLI_Snprintf(tmpbuf, sizeof(tmpbuf), "%s\\bin\\jkernel.dll", jrepath); |
221 JLI_Snprintf(tmpbuf, sizeof(tmpbuf), "%s\\bin\\jkernel.dll", jrepath); |