Changeset 85737 in vbox

Timestamp:

Aug 12, 2020 9:17:50 PM (5 years ago)

Author:

vboxsync

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

139885

Message:

Main/HostUpdateImpl.cpp: Only enable the core code when we build with libcurl (VBOX_WITH_HOST_UPDATE_CHECK) as not all OEMs includes cURL. bugref:7983

Location:

trunk/src/VBox/Main

Files:

• Makefile.kmk (modified) (1 diff)
• include/HostUpdateImpl.h (modified) (2 diffs)
• src-server/HostUpdateImpl.cpp (modified) (9 diffs)

trunk/src/VBox/Main/Makefile.kmk ¶

@@ -477 +477 @@
         $(if $(VBOX_USB_WITH_INOTIFY),VBOX_USB_WITH_INOTIFY,) \
         $(if $(VBOX_WITH_NAT_SERVICE),VBOX_WITH_NAT_SERVICE,) \
+        $(if $(VBOX_WITH_LIBCURL),VBOX_WITH_HOST_UPDATE_CHECK,) \
         $(if-expr defined(VBOX_WITH_SDS),VBOX_WITH_SDS,)
 ifdef VBOX_WITH_USB

trunk/src/VBox/Main/include/HostUpdateImpl.h ¶

@@ -49 +49 @@
     /** @} */
 
+#ifdef VBOX_WITH_HOST_UPDATE_CHECK
     Utf8Str i_platformInfo();
     class UpdateCheckTask;
@@ -55 +56 @@
     HRESULT i_checkForVBoxUpdateInner(RTHTTP hHttp, com::Utf8Str const &strUrl, com::Utf8Str const &strUserAgent,
                                       ComPtr<ISystemProperties> const &ptrSystemProperties);
+#endif
 
     /** @name Data members.

trunk/src/VBox/Main/src-server/HostUpdateImpl.cpp ¶

@@ -52 +52 @@
 ////////////////////////////////////////////////////////////////////////////////
 
+#ifdef VBOX_WITH_HOST_UPDATE_CHECK
 
 class HostUpdate::UpdateCheckTask : public ThreadTask
@@ -95 +96 @@
     Utf8Str strPlatform;
 
-#if defined (RT_OS_WINDOWS)
+# if defined (RT_OS_WINDOWS)
     strPlatform = "win";
-#elif defined (RT_OS_LINUX)
+# elif defined (RT_OS_LINUX)
     strPlatform = "linux";
-#elif defined (RT_OS_DARWIN)
+# elif defined (RT_OS_DARWIN)
     strPlatform = "macosx";
-#elif defined (RT_OS_OS2)
+# elif defined (RT_OS_OS2)
     strPlatform = "os2";
-#elif defined (RT_OS_FREEBSD)
+# elif defined (RT_OS_FREEBSD)
     strPlatform = "freebsd";
-#elif defined (RT_OS_SOLARIS)
+# elif defined (RT_OS_SOLARIS)
     strPlatform = "solaris";
-#else
+# else
     strPlatform = "unknown";
-#endif
+# endif
 
     /* The format is <system>.<bitness>: */
@@ -116 +117 @@
     /* Add more system information: */
     int vrc;
-#ifdef RT_OS_LINUX
+# ifdef RT_OS_LINUX
     // WORKAROUND:
     // On Linux we try to generate information using script first of all..
@@ -224 +225 @@
 
     if (RT_FAILURE(vrc))
-#endif /* RT_OS_LINUX */
+# endif /* RT_OS_LINUX */
     {
         /* Use RTSystemQueryOSInfo: */
@@ -493 +494 @@
                     hrc = i_checkForVBoxUpdate();
                     break;
-#if 0
+# if 0
                 case UpdateCheckType_ExtensionPack:
                     hrc = i_checkForExtPackUpdate();
@@ -501 +502 @@
                     hrc = i_checkForGuestAdditionsUpdate();
                     break;
-#endif
+# endif
                 default:
                     hrc = setError(E_FAIL, tr("Update check type %d is not implemented"), pTask->m_checkType);
@@ -522 +523 @@
 }
 
+#endif /* VBOX_WITH_HOST_UPDATE_CHECK */
+
+
 ////////////////////////////////////////////////////////////////////////////////
 //
@@ -573 +577 @@
                                 ComPtr<IProgress> &aProgress)
 {
+#ifdef VBOX_WITH_HOST_UPDATE_CHECK
     /* Validate input */
     switch (aCheckType)
@@ -632 +637 @@
 
     return rc;
+#else  /* !VBOX_WITH_HOST_UPDATE_CHECK */
+    return setError(E_NOTIMPL, tr("Update checking support was not compiled into this VirtualBox build"));
+#endif /* !VBOX_WITH_HOST_UPDATE_CHECK */
 }