Changeset 46290 in vbox for trunk/src/VBox/Frontends

Timestamp:

May 27, 2013 3:26:15 PM (12 years ago)

Author:

vboxsync

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

86035

Message:

Main/ApplianceImplExport.cpp: rearrange handling of appliance description lists, always allow the user to override (especially important for the description of a VM, as it defaults to the VM description which some people might not want to export)
Frontends/VBoxManage: finally implement changing the VM description from command line, and also add a way to provide a VM description on export

Location:

trunk/src/VBox/Frontends/VBoxManage

Files:

• VBoxManageAppliance.cpp (modified) (5 diffs)
• VBoxManageHelp.cpp (modified) (1 diff)
• VBoxManageModifyVM.cpp (modified) (3 diffs)

trunk/src/VBox/Frontends/VBoxManage/VBoxManageAppliance.cpp

@@ -801 +801 @@
         { "--product",            'p', RTGETOPT_REQ_STRING },
         { "--producturl",         'P', RTGETOPT_REQ_STRING },
-        { "--vendor",             'd', RTGETOPT_REQ_STRING },
-        { "--vendorurl",          'D', RTGETOPT_REQ_STRING },
+        { "--vendor",             'n', RTGETOPT_REQ_STRING },
+        { "--vendorurl",          'N', RTGETOPT_REQ_STRING },
         { "--version",            'v', RTGETOPT_REQ_STRING },
+        { "--description",        'd', RTGETOPT_REQ_STRING },
         { "--eula",               'e', RTGETOPT_REQ_STRING },
         { "--eulafile",           'E', RTGETOPT_REQ_STRING },
@@ -874 +875 @@
                      break;
 
-                case 'd':   // --vendor
+                case 'n':   // --vendor
                      if (ulCurVsys == (uint32_t)-1)
                          return errorSyntax(USAGE_EXPORTAPPLIANCE, "Option \"%s\" requires preceding --vsys argument.", GetState.pDef->pszLong);
@@ -880 +881 @@
                      break;
 
-                case 'D':   // --vendorurl
+                case 'N':   // --vendorurl
                      if (ulCurVsys == (uint32_t)-1)
                          return errorSyntax(USAGE_EXPORTAPPLIANCE, "Option \"%s\" requires preceding --vsys argument.", GetState.pDef->pszLong);
@@ -890 +891 @@
                          return errorSyntax(USAGE_EXPORTAPPLIANCE, "Option \"%s\" requires preceding --vsys argument.", GetState.pDef->pszLong);
                      mapArgsMapsPerVsys[ulCurVsys]["version"] = ValueUnion.psz;
+                     break;
+
+                case 'd':   // --description
+                     if (ulCurVsys == (uint32_t)-1)
+                         return errorSyntax(USAGE_EXPORTAPPLIANCE, "Option \"%s\" requires preceding --vsys argument.", GetState.pDef->pszLong);
+                     mapArgsMapsPerVsys[ulCurVsys]["description"] = ValueUnion.psz;
                      break;
 
@@ -1010 +1017 @@
                                              Bstr(itD->second).raw(),
                                              Bstr(itD->second).raw());
+                    else if (itD->first == "description")
+                        pVSD->AddDescription(VirtualSystemDescriptionType_Description,
+                                             Bstr(itD->second).raw(),
+                                             Bstr(itD->second).raw());
                     else if (itD->first == "eula")
                         pVSD->AddDescription(VirtualSystemDescriptionType_License,

trunk/src/VBox/Frontends/VBoxManage/VBoxManageHelp.cpp

@@ -416 +416 @@
                      "                                    [--vendorurl <vendor url>]\n"
                      "                                    [--version <version info>]\n"
+                     "                                    [--description <description info>]\n"
                      "                                    [--eula <license text>]\n"
                      "                                    [--eulafile <filename>]\n"

trunk/src/VBox/Frontends/VBoxManage/VBoxManageModifyVM.cpp

@@ -51 +51 @@
     MODIFYVM_NAME = 1000,
     MODIFYVM_GROUPS,
+    MODIFYVM_DESCRIPTION,
     MODIFYVM_OSTYPE,
     MODIFYVM_MEMORY,
@@ -211 +212 @@
     { "--name",                     MODIFYVM_NAME,                      RTGETOPT_REQ_STRING },
     { "--groups",                   MODIFYVM_GROUPS,                    RTGETOPT_REQ_STRING },
+    { "--description",              MODIFYVM_DESCRIPTION,               RTGETOPT_REQ_STRING },
     { "--ostype",                   MODIFYVM_OSTYPE,                    RTGETOPT_REQ_STRING },
     { "--memory",                   MODIFYVM_MEMORY,                    RTGETOPT_REQ_UINT32 },
@@ -487 +489 @@
                 break;
             }
+            case MODIFYVM_DESCRIPTION:
+            {
+                CHECK_ERROR(machine, COMSETTER(Description)(Bstr(ValueUnion.psz).raw()));
+                break;
+            }
             case MODIFYVM_OSTYPE:
             {