Changeset 39180 in vbox

Timestamp:

Nov 2, 2011 8:59:30 PM (13 years ago)

Author:

vboxsync

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

74659

Message:

ExtPack: Adding a 'edition' attribute to the Version tag and cleaning up the version string validation confusion. Currently hacking the edition into the version property of IExtPack, adding a property later.

Location:

trunk/src/VBox/Main

Files:

• include/ExtPackUtil.h (modified) (2 diffs)
• src-all/ExtPackManagerImpl.cpp (modified) (3 diffs)
• src-all/ExtPackUtil.cpp (modified) (7 diffs)

trunk/src/VBox/Main/include/ExtPackUtil.h

@@ -90 +90 @@
     /** The version string. */
     RTCString               strVersion;
+    /** The edition string. */
+    RTCString               strEdition;
     /** The internal revision number. */
     uint32_t                uRevision;
@@ -120 +122 @@
 RTCString   *VBoxExtPackUnmangleName(const char *pszMangledName, size_t cbMax);
 int                 VBoxExtPackCalcDir(char *pszExtPackDir, size_t cbExtPackDir, const char *pszParentDir, const char *pszName);
-bool                VBoxExtPackIsValidVersionString(const char *pszName);
+bool                VBoxExtPackIsValidVersionString(const char *pszVersion);
+bool                VBoxExtPackIsValidEditionString(const char *pszEdition);
 bool                VBoxExtPackIsValidModuleString(const char *pszModule);
 

trunk/src/VBox/Main/src-all/ExtPackManagerImpl.cpp

@@ -390 +390 @@
     if (SUCCEEDED(hrc))
     {
-        Bstr str(m->Desc.strVersion);
-        str.cloneTo(a_pbstrVersion);
+        /* HACK ALERT: This is for easing backporting to 4.1. The edition stuff
+           will be changed into a separate */
+        if (m->Desc.strEdition.isEmpty())
+        {
+            Bstr str(m->Desc.strVersion);
+            str.cloneTo(a_pbstrVersion);
+        }
+        else
+        {
+            RTCString strHack(m->Desc.strVersion);
+            strHack.append('-');
+            strHack.append(m->Desc.strEdition);
+
+            Bstr str(strHack);
+            str.cloneTo(a_pbstrVersion);
+        }
     }
     return hrc;
@@ -1610 +1624 @@
     if (SUCCEEDED(hrc))
     {
-        Bstr str(m->Desc.strVersion);
-        str.cloneTo(a_pbstrVersion);
+        /* HACK ALERT: This is for easing backporting to 4.1. The edition stuff
+           will be changed into a separate */
+        if (m->Desc.strEdition.isEmpty())
+        {
+            Bstr str(m->Desc.strVersion);
+            str.cloneTo(a_pbstrVersion);
+        }
+        else
+        {
+            RTCString strHack(m->Desc.strVersion);
+            strHack.append('-');
+            strHack.append(m->Desc.strEdition);
+
+            Bstr str(strHack);
+            str.cloneTo(a_pbstrVersion);
+        }
     }
     return hrc;
@@ -3052 +3080 @@
         {
             if (pExtPackData->fUsable)
-                LogRel(("  %s (Version: %s r%u; VRDE Module: %s)\n",
+                LogRel(("  %s (Version: %s r%u%s%s; VRDE Module: %s)\n",
                         pExtPackData->Desc.strName.c_str(),
                         pExtPackData->Desc.strVersion.c_str(),
                         pExtPackData->Desc.uRevision,
+                        pExtPackData->Desc.strEdition.isEmpty() ? "" : " ",
+                        pExtPackData->Desc.strEdition.c_str(),
                         pExtPackData->Desc.strVrdeModule.c_str() ));
             else
-                LogRel(("  %s (Version: %s r%u; VRDE Module: %s unusable because of '%s')\n",
+                LogRel(("  %s (Version: %s r%u%s%s; VRDE Module: %s unusable because of '%s')\n",
                         pExtPackData->Desc.strName.c_str(),
                         pExtPackData->Desc.strVersion.c_str(),
                         pExtPackData->Desc.uRevision,
+                        pExtPackData->Desc.strEdition.isEmpty() ? "" : " ",
+                        pExtPackData->Desc.strEdition.c_str(),
                         pExtPackData->Desc.strVrdeModule.c_str(),
                         pExtPackData->strWhyUnusable.c_str() ));

trunk/src/VBox/Main/src-all/ExtPackUtil.cpp

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2010 Oracle Corporation
+ * Copyright (C) 2010-2011 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -70 +70 @@
     a_pExtPackDesc->strDescription.setNull();
     a_pExtPackDesc->strVersion.setNull();
+    a_pExtPackDesc->strEdition.setNull();
     a_pExtPackDesc->uRevision = 0;
     a_pExtPackDesc->strMainModule.setNull();
@@ -146 +147 @@
         uRevision = 0;
 
+    const char *pszEdition;
+    if (!pVersionElm->getAttributeValue("edition", pszEdition))
+        pszEdition = "";
+    if (!VBoxExtPackIsValidEditionString(pszEdition))
+        return &(new RTCString("Invalid edition string: "))->append(pszEdition);
+
     const xml::ElementNode *pMainModuleElm = pVBoxExtPackElm->findChildElement("MainModule");
     if (!pMainModuleElm)
@@ -194 +201 @@
     a_pExtPackDesc->strDescription  = pszDesc;
     a_pExtPackDesc->strVersion      = pszVersion;
+    a_pExtPackDesc->strEdition      = pszEdition;
     a_pExtPackDesc->uRevision       = uRevision;
     a_pExtPackDesc->strMainModule   = pszMainModule;
@@ -350 +358 @@
     a_pExtPackDesc->strDescription.setNull();
     a_pExtPackDesc->strVersion.setNull();
+    a_pExtPackDesc->strEdition.setNull();
     a_pExtPackDesc->uRevision = 0;
     a_pExtPackDesc->strMainModule.setNull();
@@ -573 +582 @@
     if (*pszVersion == '-' || *pszVersion == '_')
     {
+        /** @todo Should probably restrict this to known build types (alpha,
+         *        beta, rc, ++). */
         do
             pszVersion++;
@@ -581 +592 @@
     }
 
-    /* revision or nothing */
-    if (*pszVersion != '\0')
-    {
-        if (*pszVersion != 'r')
+    return *pszVersion == '\0';
+}
+
+/**
+ * Validates the extension pack edition string.
+ *
+ * @returns true if valid, false if not.
+ * @param   pszEdition          The edition string to validate.
+ */
+bool VBoxExtPackIsValidEditionString(const char *pszEdition)
+{
+    if (*pszEdition)
+    {
+        if (!RT_C_IS_UPPER(*pszEdition))
             return false;
+
         do
-            pszVersion++;
-        while (RT_C_IS_DIGIT(*pszVersion));
-    }
-
-    /* upper case string indicating the edition */
-    if (*pszVersion == '-')
-    {
-        do
-            pszVersion++;
-        while (RT_C_IS_UPPER(*pszVersion));
-    }
-
-    return *pszVersion == '\0';
+            pszEdition++;
+        while (   RT_C_IS_UPPER(*pszEdition)
+               || RT_C_IS_DIGIT(*pszEdition)
+               || *pszEdition == '-'
+               || *pszEdition == '_');
+    }
+    return *pszEdition == '\0';
 }