Changeset 39885 in vbox for trunk/src/VBox

Timestamp:

Jan 26, 2012 3:02:48 PM (13 years ago)

Author:

vboxsync

Message:

Main/cbindings: update XPCOM C bindings again

Location:

trunk/src/VBox/Main/cbinding

Files:

• Makefile.kmk (modified) (6 diffs)
• VBoxCAPI_v2_2.h (modified) (1 diff)
• VBoxCAPI_v3_0.h (modified) (1 diff)
• VBoxCAPI_v3_1.h (modified) (1 diff)
• VBoxCAPI_v3_2.h (added)
• VBoxCAPI_v4_0.h (added)
• VBoxCAPI_v4_1.h (added)
• VBoxXPCOMCGlue.h (modified) (2 diffs)
• xpcidl.xsl (modified) (2 diffs)

trunk/src/VBox/Main/cbinding/Makefile.kmk

@@ -5 +5 @@
 
 #
-# Copyright (C) 2009 Oracle Corporation
+# Copyright (C) 2009-2012 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
@@ -48 +48 @@
         VBoxCAPI_v3_0.h \
         VBoxCAPI_v3_1.h \
-        $(XpComCHeaders_0_OUTDIR)/VBoxCAPI_v3_2.h
+        VBoxCAPI_v3_2.h \
+        VBoxCAPI_v4_0.h \
+        VBoxCAPI_v4_1.h \
+        $(XpComCHeaders_0_OUTDIR)/VBoxCAPI_v$(VBOX_API_VERSION).h
 
-$$(XpComCHeaders_0_OUTDIR)/VBoxCAPI_v3_2.h: \
+$$(XpComCHeaders_0_OUTDIR)/VBoxCAPI_v$(VBOX_API_VERSION).h: \
                 $(PATH_SUB_CURRENT)/xpcidl.xsl \
                 $(VBOX_XIDL_FILE) \
@@ -70 +73 @@
         VBoxXPCOMC.cpp
  VBoxXPCOMC_INTERMEDIATES = \
-        $(VBOX_PATH_SDK)/bindings/xpcom/include/VBoxCAPI_v3_2.h
+        $(VBOX_PATH_SDK)/bindings/xpcom/include/VBoxCAPI_v$(VBOX_API_VERSION).h
  endif
 
@@ -82 +85 @@
         VBoxXPCOMCGlue.c
  VBoxXPCOMCGlue_INTERMEDIATES = \
-        $(VBOX_PATH_SDK)/bindings/xpcom/include/VBoxCAPI_v3_2.h
+        $(VBOX_PATH_SDK)/bindings/xpcom/include/VBoxCAPI_v$(VBOX_API_VERSION).h
 
  if defined(VBOX_WITH_TESTCASES) && "$(KBUILD_TARGET)" != "darwin"
@@ -94 +97 @@
         $(VBOX_PATH_SDK)/bindings/xpcom/include
   tstXPCOMCGlue_INTERMEDIATES = \
-        $(VBOX_PATH_SDK)/bindings/xpcom/include/VBoxCAPI_v3_2.h
+        $(VBOX_PATH_SDK)/bindings/xpcom/include/VBoxCAPI_v$(VBOX_API_VERSION).h
   tstXPCOMCGlue_SOURCES = \
         tstXPCOMCGlue.c
@@ -109 +112 @@
         $(VBOX_PATH_SDK)/bindings/xpcom/include
    tstXPCOMCCall_INTERMEDIATES = \
-        $(VBOX_PATH_SDK)/bindings/xpcom/include/VBoxCAPI_v3_2.h
+        $(VBOX_PATH_SDK)/bindings/xpcom/include/VBoxCAPI_v$(VBOX_API_VERSION).h
    tstXPCOMCCall_SOURCES = \
         tstXPCOMCCall.c

trunk/src/VBox/Main/cbinding/VBoxCAPI_v2_2.h

@@ -15 +15 @@
  *      xpcom/include/xpcom/nsISupportsBase.h
  *
- * These files were originally triple-licensed (MPL/GPL2/LGPL2.1). Sun
+ * These files were originally triple-licensed (MPL/GPL2/LGPL2.1). Oracle
  * elects to distribute this derived work under the LGPL2.1 only.
  */
 
 /*
- * Copyright (C) 2008-2009 Oracle Corporation
+ * Copyright (C) 2008-2012 Oracle Corporation
  *
  * This file is part of a free software library; you can redistribute

trunk/src/VBox/Main/cbinding/VBoxCAPI_v3_0.h

@@ -15 +15 @@
  *      xpcom/include/xpcom/nsISupportsBase.h
  *
- * These files were originally triple-licensed (MPL/GPL2/LGPL2.1). Sun
+ * These files were originally triple-licensed (MPL/GPL2/LGPL2.1). Oracle
  * elects to distribute this derived work under the LGPL2.1 only.
  */
 
 /*
- * Copyright (C) 2008-2009 Oracle Corporation
+ * Copyright (C) 2008-2012 Oracle Corporation
  *
  * This file is part of a free software library; you can redistribute

trunk/src/VBox/Main/cbinding/VBoxCAPI_v3_1.h

@@ -15 +15 @@
  *      xpcom/include/xpcom/nsISupportsBase.h
  *
- * These files were originally triple-licensed (MPL/GPL2/LGPL2.1). Sun
+ * These files were originally triple-licensed (MPL/GPL2/LGPL2.1). Oracle
  * elects to distribute this derived work under the LGPL2.1 only.
  */
 
 /*
- * Copyright (C) 2008-2009 Oracle Corporation
+ * Copyright (C) 2008-2012 Oracle Corporation
  *
  * This file is part of a free software library; you can redistribute

trunk/src/VBox/Main/cbinding/VBoxXPCOMCGlue.h

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2008-2009 Oracle Corporation
+ * Copyright (C) 2008-2012 Oracle Corporation
  *
  * Permission is hereby granted, free of charge, to any person
@@ -32 +32 @@
 #define ___VBoxXPCOMC_cglue_h
 
-#include "VBoxCAPI_v3_2.h"
+#include "VBoxCAPI_v4_2.h"
 
 #ifdef __cplusplus

trunk/src/VBox/Main/cbinding/xpcidl.xsl

@@ -6 +6 @@
  *  from the generic interface definition expressed in XML.
 
-     Copyright (C) 2008-2010 Oracle Corporation
+     Copyright (C) 2008-2012 Oracle Corporation
 
      This file is part of VirtualBox Open Source Edition (OSE), as
@@ -116 +116 @@
  *      xpcom/include/xpcom/nsISupportsBase.h
  *
- * These files were originally triple-licensed (MPL/GPL2/LGPL2.1). Sun
+ * These files were originally triple-licensed (MPL/GPL2/LGPL2.1). Oracle
  * elects to distribute this derived work under the LGPL2.1 only.
  */
 
 /*
- * Copyright (C) 2008-2010 Oracle Corporation
+ * Copyright (C) 2008-2012 Oracle Corporation
  *
  * This file is part of a free software library; you can redistribute