Changeset 69280 in vbox for trunk/src/bldprogs

Timestamp:

Oct 25, 2017 10:59:32 AM (7 years ago)

Author:

vboxsync

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

118601

Message:

scm: Added --license-ose-cddl

Location:

trunk/src/bldprogs

Files:

• scm.cpp (modified) (5 diffs)
• scm.h (modified) (1 diff)
• scmrw.cpp (modified) (3 diffs)

trunk/src/bldprogs/scm.cpp

@@ -84 +84 @@
     SCMOPT_LICENSE_OSE_GPL,
     SCMOPT_LICENSE_OSE_DUAL_GPL_CDDL,
+    SCMOPT_LICENSE_OSE_CDDL,
     SCMOPT_LICENSE_LGPL,
     SCMOPT_LICENSE_MIT,
@@ -204 +205 @@
     { "--license-ose-gpl",                  SCMOPT_LICENSE_OSE_GPL,                 RTGETOPT_REQ_NOTHING },
     { "--license-ose-dual",                 SCMOPT_LICENSE_OSE_DUAL_GPL_CDDL,       RTGETOPT_REQ_NOTHING },
+    { "--license-ose-cddl",                 SCMOPT_LICENSE_OSE_CDDL,                RTGETOPT_REQ_NOTHING },
     { "--license-lgpl",                     SCMOPT_LICENSE_LGPL,                    RTGETOPT_REQ_NOTHING },
     { "--license-mit",                      SCMOPT_LICENSE_MIT,                     RTGETOPT_REQ_NOTHING },
@@ -622 +624 @@
         case SCMOPT_LICENSE_OSE_DUAL_GPL_CDDL:
             pSettings->enmUpdateLicense = kScmLicense_OseDualGplCddl;
+            return VINF_SUCCESS;
+        case SCMOPT_LICENSE_OSE_CDDL:
+            pSettings->enmUpdateLicense = kScmLicense_OseCddl;
             return VINF_SUCCESS;
         case SCMOPT_LICENSE_LGPL:
@@ -1918 +1923 @@
                          "  %s,\n"
                          "  %s,\n"
+                         "  %s,\n"
                          "  %s\n",
                          paOpts[i].pszLong,
@@ -1923 +1929 @@
                          paOpts[i + 2].pszLong,
                          paOpts[i + 3].pszLong,
-                         paOpts[i + 4].pszLong);
-                cExtraAdvance = 4;
+                         paOpts[i + 4].pszLong,
+                         paOpts[i + 5].pszLong);
+                cExtraAdvance = 5;
             }
         }

trunk/src/bldprogs/scm.h

@@ -238 +238 @@
     kScmLicense_OseGpl,             /**< VBox OSE GPL if public. */
     kScmLicense_OseDualGplCddl,     /**< VBox OSE dual GPL & CDDL if public. */
+    kScmLicense_OseCddl,            /**< VBox OSE CDDL if public. */
     kScmLicense_Lgpl,               /**< LGPL if public. */
     kScmLicense_Mit,                /**< MIT if public. */

trunk/src/bldprogs/scmrw.cpp

@@ -48 +48 @@
     kScmLicenseType_OseGpl,
     kScmLicenseType_OseDualGplCddl,
+    kScmLicenseType_OseCddl,
     kScmLicenseType_VBoxLgpl,
     kScmLicenseType_Mit,
@@ -145 +146 @@
     "You may elect to license modified versions of this file under the\n"
     "terms and conditions of either the GPL or the CDDL or both.\n";
+
+/** --license-ose-cddl   */
+static const char g_szVBoxOseCddl[] =
+    "This file is part of VirtualBox Open Source Edition (OSE), as\n"
+    "available from http://www.virtualbox.org. This file is free software;\n"
+    "you can redistribute it and/or modify it under the terms of the Common\n"
+    "Development and Distribution License Version 1.0 (CDDL) only, as it\n"
+    "comes in the \"COPYING.CDDL\" file of the VirtualBox OSE distribution.\n"
+    "VirtualBox OSE is distributed in the hope that it will be useful, but\n"
+    "WITHOUT ANY WARRANTY of any kind.\n";
 
 /** --license-lgpl */
@@ -268 +279 @@
     { kScmLicenseType_OseGpl,           kScmLicense_OseGpl,         RT_STR_TUPLE(g_szVBoxOseGpl)},
     { kScmLicenseType_OseDualGplCddl,   kScmLicense_OseDualGplCddl, RT_STR_TUPLE(g_szVBoxOseDualGplCddl) },
+    { kScmLicenseType_OseCddl,          kScmLicense_OseCddl,        RT_STR_TUPLE(g_szVBoxOseCddl) },
     { kScmLicenseType_VBoxLgpl,         kScmLicense_Lgpl,           RT_STR_TUPLE(g_szVBoxLgpl)},
     { kScmLicenseType_Confidential,     kScmLicense_End,            RT_STR_TUPLE(g_szOracleConfidential) },