Changeset 69388 in vbox for trunk/src/VBox

Timestamp:

Oct 26, 2017 5:02:54 PM (7 years ago)

Author:

vboxsync

Message:

Main: More scm updates

Location:

trunk/src/VBox/Main

Files:

• .scm-settings (modified) (2 diffs)
• cbinding/VBoxCAPIGlue.h.in (modified) (2 diffs)
• cbinding/makefile.tstCAPIGlue (modified) (2 diffs)
• glue/tests/TestVBox.java (modified) (3 diffs)
• glue/tests/TestVBoxNATEngine.java (modified) (8 diffs)
• testcase/makefile.tstVBoxAPIWin (modified) (7 diffs)
• testcase/makefile.tstVBoxAPIXPCOM (modified) (2 diffs)

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

@@ -17 +17 @@
 
 # cbindings have different licences.
-/cbinding/*.h: --license-lgpl
-/cbinding/VBoxCAPIGlue.c: --license-mit
+/cbinding/*.h:                          --license-lgpl
+/cbinding/VBoxCAPIGlue.c:               --license-mit
+/cbinding/VBoxCAPIGlue.h.in:            --license-mit --treat-as .h
+/cbinding/makefile.tstCAPIGlue:         --license-mit --treat-as Makefile
 
 # The Python bindings is licensed under dual GPL and CDDL.
-/glue/vboxapi.py: --license-ose-dual
+/glue/vboxapi.py:                       --license-ose-dual
+/glue/tests/*.java:                     --treat-as .c
 
+# Source dirs.
 --filter-out-files /src-all/VBoxAPI-end.d
 --filter-out-files /src-client/README.testing
+--filter-out-files /src-server/custom.ids
+--filter-out-files /src-server/usb.ids
 
-/idl/VirtualBox.xidl: --treat-as .xml
-/idl/VirtualBox.dtd:  --treat-as .xml
+# IDL and XML
+/idl/VirtualBox.xidl:                   --treat-as .xml
+/idl/VirtualBox.dtd:                    --treat-as .xml
 
-/xml/VirtualBox-settings.xsd: --treat-as .xml
+/xml/VirtualBox-settings.xsd:           --treat-as .xml
 --filter-out-files /xml/samples/*.xml
 
@@ -35 +42 @@
 # Exploint --external-copyright to check that this remains the case.
 # This does not imply anything wrt to the copyright status of the files.
-/UnattendedTemplates/*.cfg: --external-copyright --treat-as .sh
-/UnattendedTemplates/*.sif: --external-copyright
-/UnattendedTemplates/*.xml: --dont-set-svn-eol --no-convert-eol
+/UnattendedTemplates/*.cfg:             --external-copyright --treat-as .sh
+/UnattendedTemplates/*.sif:             --external-copyright
+/UnattendedTemplates/*.xml:             --dont-set-svn-eol --no-convert-eol
 
 # The webservice is fun.
-/webservice/Makefile.webtest: --treat-as Makefile
---filter-out-files /webservice/types.txt:
+/webservice/Makefile.webtest:           --treat-as Makefile
+--filter-out-files /webservice/types.txt
 --filter-out-files /webservice/MANIFEST.MF.in
 --filter-out-dirs  /webservice/jaxlibs/.
 
 # The webservice samples are MIT and need some hacks to handle unusual file types.
-/webservice/samples/*:                   --license-mit
-/webservice/samples/*.java:              --treat-as .c
-/webservice/samples/*/Makefile.glue:     --treat-as Makefile
-/webservice/samples/php/clienttest.php:  --treat-as .c
+/webservice/samples/*:                  --license-mit
+/webservice/samples/*.java:             --treat-as .c
+/webservice/samples/*/Makefile.glue:    --treat-as Makefile
+/webservice/samples/php/clienttest.php: --treat-as .c
 
+
+# Testcases.
+/testcase/makefile.tstVBoxAPIWin:       --treat-as Makefile
+/testcase/makefile.tstVBoxAPIXPCOM:     --treat-as Makefile
+--filter-out-files /testcase/ovf-dummy.vmdk
+--filter-out-files /testcase/ovf-joomla-0.9/joomla-1.1.4-ovf.ovf
+--filter-out-files /testcase/ovf-winhost-audio-nodisks/WinXP.ovf
+--filter-out-files /testcase/ovf-winxp-vbox-sharedfolders/winxp.ovf
+--filter-out-files /testcase/VBoxVBTest/TestForm.frm
+--filter-out-files /testcase/VBoxVBTest/TestForm.frx
+--filter-out-files /testcase/VBoxVBTest/VBoxVBTest.vbp
+

trunk/src/VBox/Main/cbinding/VBoxCAPIGlue.h.in

@@ -1 @@
-/* $Revision$ */
+/* $Id$ */
 /** @file VBoxCAPIGlue.h
  * Glue for dynamically linking with VBoxCAPI.
@@ -22 +22 @@
  * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
  * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * NONINFRINGEMENT.  IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
  * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
  * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING

trunk/src/VBox/Main/cbinding/makefile.tstCAPIGlue

@@ -1 @@
-# $Revision$
+# $Id$
 ## @file makefile.tstCAPIGlue
 # Makefile for sample program illustrating use of C binding for COM/XPCOM.
@@ -7 +7 @@
 # Copyright (C) 2009-2014 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.
+# Permission is hereby granted, free of charge, to any person
+# obtaining a copy of this software and associated documentation
+# files (the "Software"), to deal in the Software without
+# restriction, including without limitation the rights to use,
+# copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the
+# Software is furnished to do so, subject to the following
+# conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+# OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT.  IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+# OTHER DEALINGS IN THE SOFTWARE.
 #
 

trunk/src/VBox/Main/glue/tests/TestVBox.java

@@ -1 +1 @@
 /* $Id$ */
-
-/* Small sample/testcase which demonstrates that the same source code can
- * be used to connect to the webservice and (XP)COM APIs. */
+/*! file
+ * Small sample/testcase which demonstrates that the same source code can
+ * be used to connect to the webservice and (XP)COM APIs.
+ */
 
 /*
@@ -15 +16 @@
  * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
  */
+
 import org.virtualbox_5_0.*;
 import java.util.List;
@@ -141 +143 @@
         String name = m.getName();
         System.out.println("\nAttempting to start VM '" + name + "'");
-        
+
         ISession session = mgr.getSessionObject();
         IProgress p = m.launchVMProcess(session, "gui", "");

trunk/src/VBox/Main/glue/tests/TestVBoxNATEngine.java

@@ -1 +1 @@
 /* $Id$ */
-
-/* Small sample/testcase which demonstrates that the same source code can
- * be used to connect to the webservice and (XP)COM APIs. */
+/*!file
+ * Small sample/testcase which demonstrates that the same source code can
+ * be used to connect to the webservice and (XP)COM APIs.
+ */
 
 /*
@@ -15 +16 @@
  * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
  */
+
 import org.virtualbox_5_0.*;
 import java.util.List;
@@ -29 +31 @@
         /* different chipsets might have different number of attachments */
         ChipsetType chipsetType = vm.getChipsetType();
-        INetworkAdapter adapters[] = 
+        INetworkAdapter adapters[] =
             new INetworkAdapter[
                     vbox.getSystemProperties().getMaxNetworkAdapters(chipsetType).intValue()];
@@ -40 +42 @@
              * dump it settings
              */
-                
+
             for (int nidx = 0; nidx < adapters.length; ++nidx)
             {
@@ -46 +48 @@
                 adapters[nidx] = vm.getNetworkAdapter(new Long(nidx));
                 INetworkAdapter n = adapters[nidx];
-                    
+
                 if (n == null)
                     continue;
@@ -67 +69 @@
                         /* name,proto,hostip,host,hostport,guestip,guestport */
                         nat.removeRedirect(pfAttributes[0]);
-                        nat.addRedirect("", 
+                        nat.addRedirect("",
                                         NATProtocol.fromValue(new Integer(pfAttributes[1]).longValue()),
                                         pfAttributes[2],
@@ -78 +80 @@
                 }
             }
-                
+
         }
         catch (VBoxException e)
@@ -84 +86 @@
             name = "<inaccessible>";
             inaccessible = true;
-        }            
+        }
 
         // process system event queue

trunk/src/VBox/Main/testcase/makefile.tstVBoxAPIWin

@@ -1 @@
-#
+# $Id$
+## @file
 # tstVBoxAPILinux makefile
 #
+
 #
 # Copyright (C) 2006-2016 Oracle Corporation
@@ -13 +15 @@
 # hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
 #
+
+#
 # Several assumptions and propositions:
 # - Visual Studio has already installed on machine or you already have nmake.exe, cl.exe, link.exe
@@ -20 +24 @@
 # - cl is cl.exe - Windows compiler
 # - link is link.exe - Windows linker
-# - all needed paths have been set in working environment. It means that when you type "cl" from the console, 
+# - all needed paths have been set in working environment. It means that when you type "cl" from the console,
 #   Windows shall find cl.exe by using enviroment variable PATH or something similar.
 #
-# The best way to accomplish it is to run a script vcvars32.bat located in the Visual studio "bin" directory. 
+# The best way to accomplish it is to run a script vcvars32.bat located in the Visual studio "bin" directory.
 # This script installs needed paths in your working environment.
 # Important!!!
 # Script vcvars32.bat sets up needed paths only for local console session.
-# For permanent using, needed paths must be added globally. 
+# For permanent using, needed paths must be added globally.
 #
 # Several possible examples of paths:
@@ -41 +45 @@
 LINK = link
 PATH_MSCOM     = ../../../bindings/mscom
-INCS_MSCOM     = $(PATH_MSCOM)/include 
+INCS_MSCOM     = $(PATH_MSCOM)/include
 LIBS_MSCOM     = $(PATH_MSCOM)/lib
 
@@ -49 +53 @@
 tstVBoxAPIWin_DEPS     = $(INCS_MSCOM)
 
-COMPILER_CMDLINE = /Zi /nologo /W3 /WX- /Od /Oy- /Gm /EHsc /RTC1 /GS /fp:precise /Gd /analyze- /errorReport:queue 
+COMPILER_CMDLINE = /Zi /nologo /W3 /WX- /Od /Oy- /Gm /EHsc /RTC1 /GS /fp:precise /Gd /analyze- /errorReport:queue
 
 LINKER_CMDLINE = /INCREMENTAL /DEBUG /SUBSYSTEM:CONSOLE
@@ -57 +61 @@
         $(LINK) /out:tstVBoxAPIWin.exe $** $(LIBS_DEPS)
 
-#   default compilation 
+#   default compilation
 tstVBoxAPIWin.obj:
         $(CXX) /c /I$(INCS_MSCOM) tstVBoxAPIWin.cpp
@@ -85 +89 @@
 #       $(CXX) /c /I$(INCS_MSCOM) /I$(WIN_SDK_INCLUDE_PATH) /I$(VS_INCLUDE_PATH) $(tstVBoxAPIWin_SOURCES)
 
-

trunk/src/VBox/Main/testcase/makefile.tstVBoxAPIXPCOM

@@ -1 @@
-#
+# $Id$
+## @file
 # tstVBoxAPIXPCOM makefile
 #
+
 #
 # Copyright (C) 2006-2014 Oracle Corporation
@@ -51 +53 @@
 clean:
         rm -f tstVBoxAPIXPCOM tstVBoxAPIXPCOM.o
+