Changeset 69241 in vbox for trunk

Timestamp:

Oct 24, 2017 4:13:48 PM (7 years ago)

Author:

vboxsync

Message:

Main: scm updates

Location:

trunk/src/VBox/Main

Files:

• .scm-settings (modified) (1 diff)
• Makefile.kmk (modified) (1 diff)
• glue/GetVBoxUserHomeDirectory.cpp (modified) (1 diff)
• glue/vboxapi.py (modified) (1 diff)
• testcase/msiDarwinDescriptorDecoder.cpp (modified) (1 diff)

trunk/src/VBox/Main/.scm-settings

@@ -20 +20 @@
 /cbinding/VBoxCAPIGlue.c: --license-mit
 
+# The Python bindings is licensed under dual GPL and CDDL.
+/glue/vboxapi.py: --license-ose-dual
+

trunk/src/VBox/Main/Makefile.kmk

@@ -128 +128 @@
         $(VBOX_PATH_SDK)/bindings/xpcom/idl \
         $(VBOX_PATH_SDK)/bindings/xpcom/include
- # disable VBoxSDS for XPCOM    
+ # disable VBoxSDS for XPCOM
  override VBOX_WITH_SDS =
 endif # xpcom

trunk/src/VBox/Main/glue/GetVBoxUserHomeDirectory.cpp

@@ -15 +15 @@
  * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
  */
+
 
 /*********************************************************************************************************************************

trunk/src/VBox/Main/glue/vboxapi.py

@@ -6 +6 @@
 
 __copyright__ = \
-    """
-    Copyright (C) 2009-2016 Oracle Corporation
-
-    This file is part of VirtualBox Open Source Edition (OSE), as
-    available from http://www.virtualbox.org. This file is free software;
-    you can redistribute it and/or modify it under the terms of the GNU
-    General Public License (GPL) as published by the Free Software
-    Foundation, in version 2 as it comes in the "COPYING" file of the
-    VirtualBox OSE distribution. VirtualBox OSE is distributed in the
-    hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
-
-    The contents of this file may alternatively be used under the terms
-    of the Common Development and Distribution License Version 1.0
-    (CDDL) only, as it comes in the "COPYING.CDDL" file of the
-    VirtualBox OSE distribution, in which case the provisions of the
-    CDDL are applicable instead of those of the GPL.
-
-    You may elect to license modified versions of this file under the
-    terms and conditions of either the GPL or the CDDL or both.
-    """
+"""
+Copyright (C) 2009-2016 Oracle Corporation
+
+This file is part of VirtualBox Open Source Edition (OSE), as
+available from http://www.virtualbox.org. This file is free software;
+you can redistribute it and/or modify it under the terms of the GNU
+General Public License (GPL) as published by the Free Software
+Foundation, in version 2 as it comes in the "COPYING" file of the
+VirtualBox OSE distribution. VirtualBox OSE is distributed in the
+hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
+
+The contents of this file may alternatively be used under the terms
+of the Common Development and Distribution License Version 1.0
+(CDDL) only, as it comes in the "COPYING.CDDL" file of the
+VirtualBox OSE distribution, in which case the provisions of the
+CDDL are applicable instead of those of the GPL.
+
+You may elect to license modified versions of this file under the
+terms and conditions of either the GPL or the CDDL or both.
+"""
 __version__ = "$Revision$"
 

trunk/src/VBox/Main/testcase/msiDarwinDescriptorDecoder.cpp

@@ -70 +70 @@
 }
 
-