Changeset 7594 in vbox for trunk

Timestamp:

Mar 27, 2008 3:20:00 PM (17 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

29094

Message:

FE/Qt3-4: openRemoteSession get the path to the executable through the environment now.

Location:

trunk/src/VBox

Files:

• Frontends/VirtualBox/src/VBoxSelectorWnd.cpp (modified) (1 diff)
• Frontends/VirtualBox4/Makefile.kmk (modified) (1 diff)
• Frontends/VirtualBox4/src/VBoxSelectorWnd.cpp (modified) (1 diff)
• Main/MachineImpl.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/VBoxSelectorWnd.cpp

@@ -929 +929 @@
 #endif
 
+#if defined (Q_WS_MAC) /* Avoid Lanuch Services confusing this with the selector by using a helper app. */
+    env += "\nVBOXGUIPATH=../Resources/VirtualBoxVM.app/Contents/MacOS/VirtualBoxVM";
+#elif defined (Q_WS_WIN)
+    env += "\nVBOXGUIPATH=VirtualBox.exe";
+#else
+    env += "\nVBOXGUIPATH=VirtualBox";
+#endif
+
     CProgress progress = vbox.OpenRemoteSession (session, id, "gui", env);
     if (!vbox.isOk())

trunk/src/VBox/Frontends/VirtualBox4/Makefile.kmk

@@ -364 +364 @@
 ifeq ($(BUILD_TARGET),darwin)
 # For the launch trick we need different inode numbers.
-VirtualBox_INST = $(INST_BIN)VirtualBox $(INST_BIN)VirtualBoxVM
+VirtualBox_INST = $(INST_BIN)VirtualBox4 $(INST_BIN)VirtualBoxVM4
 
  # For testing iChat Theater stuff change

trunk/src/VBox/Frontends/VirtualBox4/src/VBoxSelectorWnd.cpp

@@ -933 +933 @@
 #endif
 
+#if defined (Q_WS_MAC) /* Avoid Lanuch Services confusing this with the selector by using a helper app. */
+    env += "\nVBOXGUIPATH=../Resources/VirtualBoxVM.app/Contents/MacOS/VirtualBoxVM4";
+#elif defined (Q_WS_WIN)
+    env += "\nVBOXGUIPATH=VirtualBox4.exe";
+#else
+    env += "\nVBOXGUIPATH=VirtualBox4";
+#endif
+
     CProgress progress = vbox.OpenRemoteSession (session, id, "gui", env);
     if (!vbox.isOk())

trunk/src/VBox/Main/MachineImpl.cpp

@@ -3161 +3161 @@
     if (type == "gui")
     {
-#ifdef RT_OS_DARWIN /* Avoid Lanuch Services confusing this with the selector by using a helper app. */
-        const char VirtualBox_exe[] = "../Resources/VirtualBoxVM.app/Contents/MacOS/VirtualBoxVM";
-#else
-        const char VirtualBox_exe[] = "VirtualBox" HOSTSUFF_EXE;
-#endif
-        Assert (sz >= sizeof (VirtualBox_exe));
+        char VirtualBox_exe[sz];
+        size_t cchActual;
+        vrc = RTEnvGetEx (env, "VBOXGUIPATH", VirtualBox_exe, sz, &cchActual);
+        AssertRCBreakVoid (vrc);
         strcpy (cmd, VirtualBox_exe);