From: VMware, Inc <>
Date: Tue, 17 Nov 2009 21:46:11 +0000 (-0800)
Subject: Re-organize the Tools Core public headers (1/2).
X-Git-Tag: 2009.11.16-210370~27
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6b37760a4f32ea768fc9dfc4db21b9aa8b19c895;p=thirdparty%2Fopen-vm-tools.git

Re-organize the Tools Core public headers (1/2).

These headers will form the base of the public Tools Core interface, so
they need to be moved to the "fully qualified" location.

This change just moves the headers to the new location. (For the
perforce-minded folks, I am branching / editing the new files, so
history is kept as far as where the contents come from.)

Signed-off-by: Marcelo Vanzin <mvanzin@vmware.com>
---

diff --git a/open-vm-tools/docs/api/Makefile.am b/open-vm-tools/docs/api/Makefile.am
index aee120fa2..84f84ff55 100644
--- a/open-vm-tools/docs/api/Makefile.am
+++ b/open-vm-tools/docs/api/Makefile.am
@@ -18,10 +18,7 @@
 DOXYGEN_INPUT =
 DOXYGEN_INPUT += $(top_srcdir)/docs/api
 DOXYGEN_INPUT += $(top_srcdir)/docs/api/services
-DOXYGEN_INPUT += $(top_srcdir)/lib/include/rpcChannel.h
-DOXYGEN_INPUT += $(top_srcdir)/lib/include/vmtoolsApp.h
-DOXYGEN_INPUT += $(top_srcdir)/lib/include/vmtools.h
-DOXYGEN_INPUT += $(top_srcdir)/lib/include/vmrpcdbg.h
+DOXYGEN_INPUT += $(top_srcdir)/lib/include/vmware/tools
 DOXYGEN_INPUT += $(top_srcdir)/libvmtools
 DOXYGEN_INPUT += $(top_srcdir)/tests/vmrpcdbg
 
@@ -32,6 +29,8 @@ DOXYGEN_CPP_PREDEFINED += G_LOG_DOMAIN=
 DOXYGEN_CPP_EXPAND =
 
 DOXYGEN_EXTRA_PATTERNS =
+DOXYGEN_EXTRA_PATTERNS += *.c
+DOXYGEN_EXTRA_PATTERNS += *.h
 DOXYGEN_EXTRA_PATTERNS += *.txt
 
 # This rule has no dependencies, so it's executed every time. Not optimal,
diff --git a/open-vm-tools/lib/include/rpcChannel.h b/open-vm-tools/lib/include/vmware/tools/guestrpc.h
similarity index 98%
rename from open-vm-tools/lib/include/rpcChannel.h
rename to open-vm-tools/lib/include/vmware/tools/guestrpc.h
index 65939fd59..c26c588c6 100644
--- a/open-vm-tools/lib/include/rpcChannel.h
+++ b/open-vm-tools/lib/include/vmware/tools/guestrpc.h
@@ -16,11 +16,11 @@
  *
  *********************************************************/
 
-#ifndef _RPCCHANNEL_H_
-#define _RPCCHANNEL_H_
+#ifndef _VMWARE_TOOLS_GUESTRPC_H_
+#define _VMWARE_TOOLS_GUESTRPC_H_
 
 /**
- * @file rpcChannel.h
+ * @file guestrpc.h
  *
  *    Defines the interface between applications and the underlying GuestRPC
  *    channel. The goal is to have an abstraction so applications can run over
@@ -41,7 +41,7 @@
 #endif
 
 #include <glib.h>
-#include "vmtools.h"
+#include "vmware/tools/utils.h"
 
 /** Alias for RpcChannel_SetRetVals. */
 #define RPCIN_SETRETVALS RpcChannel_SetRetVals
diff --git a/open-vm-tools/lib/include/vmtoolsApp.h b/open-vm-tools/lib/include/vmware/tools/plugin.h
similarity index 98%
rename from open-vm-tools/lib/include/vmtoolsApp.h
rename to open-vm-tools/lib/include/vmware/tools/plugin.h
index ea35df76c..76d86bdb1 100644
--- a/open-vm-tools/lib/include/vmtoolsApp.h
+++ b/open-vm-tools/lib/include/vmware/tools/plugin.h
@@ -16,11 +16,11 @@
  *
  *********************************************************/
 
-#ifndef _VMTOOLSAPP_H_
-#define _VMTOOLSAPP_H_
+#ifndef _VMWARE_TOOLS_PLUGIN_H_
+#define _VMWARE_TOOLS_PLUGIN_H_
 
 /**
- * @file vmtoolsApp.h
+ * @file plugin.h
  *
  *    Defines the interface between the core tools services and the plugins
  *    that are dynamically loaded into the service.
@@ -34,8 +34,8 @@
 #  include <windows.h>
 #  include <objbase.h>
 #endif
-#include "rpcChannel.h"
 #include "vmware/guestrpc/capabilities.h"
+#include "vmware/tools/guestrpc.h"
 
 /**
  * Error reporting macro. Call this if the app encounters an error
@@ -432,5 +432,5 @@ typedef ToolsPluginData *(*ToolsPluginOnLoad)(ToolsAppCtx *ctx);
 
 /** @} */
 
-#endif /* _VMTOOLSAPP_H_ */
+#endif /* _VMWARE_TOOLS_PLUGIN_H_ */
 
diff --git a/open-vm-tools/lib/include/vmrpcdbg.h b/open-vm-tools/lib/include/vmware/tools/rpcdebug.h
similarity index 96%
rename from open-vm-tools/lib/include/vmrpcdbg.h
rename to open-vm-tools/lib/include/vmware/tools/rpcdebug.h
index 9b1d17c75..d229ac0b5 100644
--- a/open-vm-tools/lib/include/vmrpcdbg.h
+++ b/open-vm-tools/lib/include/vmware/tools/rpcdebug.h
@@ -16,11 +16,11 @@
  *
  *********************************************************/
 
-#ifndef _VMRPCDBG_H_
-#define _VMRPCDBG_H_
+#ifndef _VMWARE_TOOLS_RPCDEBUG_H_
+#define _VMWARE_TOOLS_RPCDEBUG_H_
 
 /**
- * @file vmrpcdbg.h
+ * @file rpcdebug.h
  *
  * Defines the public API for the "GuestRPC Debug Channel" implementation, and
  * the interface between the debug library and debug plugins.
@@ -29,7 +29,7 @@
  * @{
  */
 
-#include "vmtoolsApp.h"
+#include "vmware/tools/plugin.h"
 
 struct RpcDebugPlugin;
 
@@ -163,5 +163,5 @@ RpcDebug_Shutdown(ToolsAppCtx *ctx,
 
 /** @} */
 
-#endif /* _VMRPCDBG_H_ */
+#endif /* _VMWARE_TOOLS_RPCDEBUG_H_ */
 
diff --git a/open-vm-tools/lib/include/vmtools.h b/open-vm-tools/lib/include/vmware/tools/utils.h
similarity index 97%
rename from open-vm-tools/lib/include/vmtools.h
rename to open-vm-tools/lib/include/vmware/tools/utils.h
index 37bcd053e..6f59ababa 100644
--- a/open-vm-tools/lib/include/vmtools.h
+++ b/open-vm-tools/lib/include/vmware/tools/utils.h
@@ -16,11 +16,11 @@
  *
  *********************************************************/
 
-#ifndef _VMTOOLS_H_
-#define _VMTOOLS_H_
+#ifndef _VMWARE_TOOLS_UTILS_H_
+#define _VMWARE_TOOLS_UTILS_H_
 
 /**
- * @file vmtools.h
+ * @file utils.h
  *
  *    Public functions from the VMTools shared library.
  *
@@ -149,5 +149,5 @@ VMTools_WrapArray(gconstpointer data,
 
 /** @} */
 
-#endif /* _VMTOOLS_H_ */
+#endif /* _VMWARE_TOOLS_UTILS_H_ */