Changeset 32728 in vbox

Timestamp:

Sep 23, 2010 2:40:29 PM (14 years ago)

Author:

vboxsync

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

66162

Message:

backed out accidental changes

Location:

trunk/src/VBox/Main

Files:

• Makefile.kmk (modified) (3 diffs)
• webservice/websrv-shared.inc.xsl (modified) (1 diff)

trunk/src/VBox/Main/Makefile.kmk

@@ -73 +73 @@
 VBOX_IDL_TYPELIB.XPCOM = $(PATH_BIN)/components/VirtualBox_XPCOM.xpt
 VBOX_IDL_HEADER.XPCOM  = $(VBOX_PATH_SDK)/bindings/xpcom/include/VirtualBox_XPCOM.h
-
-OTHERS = $(PATH_TARGET)/VirtualBoxAPIClasses.tmp
 
 # The MS COM specific stuff.
@@ -156 +154 @@
 docs:                $(PATH_TARGET)/docs.Main
 endif
-
-
-#
-# Generate class definitions from the XIDL file.
-#
-$(PATH_TARGET)/VirtualBoxAPIClasses.tmp: \
-                $(VBOX_XIDL_FILE) \
-                $(VBOX_PATH_MAIN_SRC)/api-classgen.xsl \
-                | $$(dir $$@)
-        $(VBOX_XSLTPROC) -o $(PATH_TARGET)/VirtualBoxAPIClasses.tmp $(VBOX_PATH_MAIN_SRC)/api-classgen.xsl $<
 
 
@@ -477 +465 @@
         $(QUIET)$(VBOX_XSLTPROC)  --stringparam mode define  -o $@ $(VBOX_XML_SCHEMADEFS_XSL) $(VBOX_XML_SCHEMA.$(KBUILD_TARGET))
 
-OTHER_CLEAN += $(VBOX_XML_SCHEMADEFS_H) $(VBOX_XML_SCHEMADEFS_CPP) $(PATH_TARGET)/VirtualBoxAPIClasses.tmp
+OTHER_CLEAN += $(VBOX_XML_SCHEMADEFS_H) $(VBOX_XML_SCHEMADEFS_CPP)
 
 

trunk/src/VBox/Main/webservice/websrv-shared.inc.xsl

@@ -158 +158 @@
 
 <xsl:variable name="G_aSharedTypes">
-  <type idlname="octet"              xmlname="unsignedByte"  cname="unsigned char"    gluename="BYTE"    gluefmt="%RU8"      javaname="byte" />
-  <type idlname="boolean"            xmlname="boolean"       cname="bool"             gluename="BOOL"    gluefmt="%RTbool"   javaname="Boolean" />
-  <type idlname="short"              xmlname="short"         cname="short"            gluename="SHORT"   gluefmt="%RI16"     javaname="Short" />
-  <type idlname="unsigned short"     xmlname="unsignedShort" cname="unsigned short"   gluename="USHORT"  gluefmt="%RU16"     javaname="Integer" />
-  <type idlname="long"               xmlname="int"           cname="int"              gluename="LONG"    gluefmt="%RI32"     javaname="Integer" />
-  <type idlname="unsigned long"      xmlname="unsignedInt"   cname="unsigned int"     gluename="ULONG"   gluefmt="%RU32"     javaname="Long" />
-  <type idlname="long long"          xmlname="long"          cname="LONG64"           gluename="LONG64"  gluefmt="%RI64"     javaname="Long" />
-  <type idlname="unsigned long long" xmlname="unsignedLong"  cname="ULONG64"          gluename="ULONG64" gluefmt="%RU64"     javaname="BigInteger" />
-  <type idlname="double"             xmlname="double"        cname="double"           gluename="DOUBLE"  gluefmt="%#RX64"    javaname="Double" />
-  <type idlname="float"              xmlname="float"         cname="float"            gluename="FLOAT"   gluefmt="%#RX32"    javaname="Float" />
-  <type idlname="wstring"            xmlname="string"        cname="std::string"      gluename="BSTR"    gluefmt="%ls"       javaname="String" />
-  <type idlname="uuid"               xmlname="string"        cname="std::string"      gluename="BSTR"    gluefmt="%ls"       javaname="String" />
-  <type idlname="result"             xmlname="unsignedInt"   cname="unsigned int"     gluename="HRESULT" gluefmt="%Rhrc"     javaname="Long" />
+  <type idlname="octet"              xmlname="unsignedByte"  cname="unsigned char"    gluename="BYTE"    javaname="byte" />
+  <type idlname="boolean"            xmlname="boolean"       cname="bool"             gluename="BOOL"    javaname="Boolean" />
+  <type idlname="short"              xmlname="short"         cname="short"            gluename="SHORT"   javaname="Short" />
+  <type idlname="unsigned short"     xmlname="unsignedShort" cname="unsigned short"   gluename="USHORT"  javaname="Integer" />
+  <type idlname="long"               xmlname="int"           cname="int"              gluename="LONG"    javaname="Integer" />
+  <type idlname="unsigned long"      xmlname="unsignedInt"   cname="unsigned int"     gluename="ULONG"   javaname="Long" />
+  <type idlname="long long"          xmlname="long"          cname="LONG64"           gluename="LONG64"  javaname="Long" />
+  <type idlname="unsigned long long" xmlname="unsignedLong"  cname="ULONG64"          gluename="ULONG64" javaname="BigInteger" />
+  <type idlname="double"             xmlname="double"        cname="double"           gluename=""        javaname="Double" />
+  <type idlname="float"              xmlname="float"         cname="float"            gluename=""        javaname="Float" />
+  <type idlname="wstring"            xmlname="string"        cname="std::string"      gluename=""        javaname="String" />
+  <type idlname="uuid"               xmlname="string"        cname="std::string"      gluename=""        javaname="String" />
+  <type idlname="result"             xmlname="unsignedInt"   cname="unsigned int"     gluename="HRESULT" javaname="Long" />
 </xsl:variable>