Commit ea97ca11 authored by Oliver Bock's avatar Oliver Bock

Merge branch 'master' of ssh://boinc.berkeley.edu/boinc

parents c312dfd6 1915da2e
......@@ -7819,3 +7819,13 @@ Charlie 20 Dec 2012
lib/
gui_rpc_client.h
gui_rpc_client_ops.cpp
Rom 20 Dec 2012
- VBOX: Initialize the PATH variable before attempting to check to see if
the system is ready.
samples\vboxwrapper\
vbox.cpp, .h
vboxwrapper.cpp
win_build\
vboxwrapper.vcproj
......@@ -202,9 +202,6 @@ int VBOX_VM::initialize() {
int VBOX_VM::run(double elapsed_time) {
int retval;
retval = initialize();
if (retval) return retval;
if (!is_registered()) {
if (is_hdd_registered()) {
// Handle the case where a previous instance of the same projects VM
......
......@@ -397,6 +397,17 @@ int main(int argc, char** argv) {
vboxwrapper_msg_prefix(buf, sizeof(buf))
);
retval = vm.initialize();
if (retval) {
fprintf(
stderr,
"%s failed to initialize VM Hypervisor environment: %d\n",
vboxwrapper_msg_prefix(buf, sizeof(buf)),
retval
);
boinc_finish(retval);
}
// Check to see if the system is in a state in which we expect to be able to run
// VirtualBox successfully. Sometimes the system is in a wierd state after a
// reboot and the system needs a little bit of time.
......
......@@ -4,6 +4,7 @@
Version="8.00"
Name="vboxwrapper"
ProjectGUID="{F243B93C-73CB-44E7-9BDC-847BB95C27CA}"
RootNamespace="vboxwrapper"
>
<Platforms>
<Platform
......@@ -81,13 +82,13 @@
<Tool
Name="VCLinkerTool"
AdditionalDependencies="libcmt.lib libcpmt.lib kernel32.lib user32.lib gdi32.lib ole32.lib wsock32.lib psapi.lib"
OutputFile=".\Build\$(PlatformName)\$(ConfigurationName)\vboxwrapper_26013_windows_intelx86.exe"
OutputFile=".\Build\$(PlatformName)\$(ConfigurationName)\vboxwrapper_26014_windows_intelx86.exe"
LinkIncremental="0"
SuppressStartupBanner="true"
IgnoreAllDefaultLibraries="true"
DelayLoadDLLs=""
GenerateDebugInformation="true"
ProgramDatabaseFile=".\Build\$(PlatformName)\$(ConfigurationName)\vboxwrapper_26013_windows_intelx86.pdb"
ProgramDatabaseFile=".\Build\$(PlatformName)\$(ConfigurationName)\vboxwrapper_26014_windows_intelx86.pdb"
SubSystem="2"
TargetMachine="1"
/>
......@@ -182,13 +183,13 @@
<Tool
Name="VCLinkerTool"
AdditionalDependencies="libcmt.lib libcpmt.lib kernel32.lib user32.lib gdi32.lib ole32.lib wsock32.lib psapi.lib"
OutputFile=".\Build\$(PlatformName)\$(ConfigurationName)\vboxwrapper_26013_windows_x86_64.exe"
OutputFile=".\Build\$(PlatformName)\$(ConfigurationName)\vboxwrapper_26014_windows_x86_64.exe"
LinkIncremental="0"
SuppressStartupBanner="true"
IgnoreAllDefaultLibraries="true"
DelayLoadDLLs=""
GenerateDebugInformation="true"
ProgramDatabaseFile=".\Build\$(PlatformName)\$(ConfigurationName)\vboxwrapper_26013_windows_x86_64.pdb"
ProgramDatabaseFile=".\Build\$(PlatformName)\$(ConfigurationName)\vboxwrapper_26014_windows_x86_64.pdb"
SubSystem="2"
TargetMachine="17"
/>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment