Changeset 79360 in vbox for trunk/src/VBox/Main/glue

Timestamp:

Jun 26, 2019 1:49:48 PM (6 years ago)

Author:

vboxsync

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

131592

Message:

Main/glue/python: Include the VBox status codes from iprt/err.h and VBox/err.h in the constant.

Location:

trunk/src/VBox/Main/glue

Files:

• constants-python.xsl (modified) (5 diffs)
• vbox-err-consts.sed (copied) (copied from trunk/src/VBox/Runtime/common/err/errmsg.sed ) (4 diffs)

trunk/src/VBox/Main/glue/constants-python.xsl

@@ -25 +25 @@
   encoding="utf-8"
   indent="no"/>
+
+<xsl:param name="g_sErrHFile"/>
 
 <xsl:template match="/">
@@ -69 +71 @@
         self.__fIsSym = fIsSym
 
-    __dValues = {</xsl:text>
+    # iprt/err.h + VBox/err.h constants:
+    __dVBoxStatuses = {</xsl:text>
+    <xsl:value-of select="document($g_sErrHFile)"/>
 
+    <xsl:text disable-output-escaping="yes"><![CDATA[
+    }
+
+    __dValues = {]]></xsl:text>
     <xsl:for-each select="//enum">
         <xsl:text>
@@ -83 +91 @@
         },</xsl:text>
     </xsl:for-each>
-    <!-- hack alert: force new output element to avoid large reallocations. -->
+    <!-- VBox status codes: -->
     <xsl:text disable-output-escaping="yes"><![CDATA[
+        # iprt/err.h + VBox/err.h constants:
+        'VBoxStatus': __dVBoxStatuses,
     }
 
@@ -104 +114 @@
     }
 
-    __dValuesFlat = {]]></xsl:text>
+    __dValuesFlat = dict({]]></xsl:text>
     <xsl:for-each select="//enum">
         <xsl:variable name="ename">
@@ -124 +134 @@
         <xsl:value-of select="@value"/><xsl:text>,</xsl:text>
     </xsl:for-each>
+
     <!-- hack alert: force new output element to avoid large reallocations. -->
     <xsl:text>
-    }
+    }, **__dVBoxStatuses)
 
     __dValuesFlatSym = {</xsl:text>

trunk/src/VBox/Main/glue/vbox-err-consts.sed

@@ -1 +1 @@
 # $Id$
 ## @file
-# IPRT - SED script for converting */err.h.
+# IPRT - SED script for converting */err.h to a python dictionary.
 #
 
@@ -25 +25 @@
 #
 
+# Header and footer text:
+1i <text>
+$a </text>
+
 # Handle text inside the markers.
 /SED-START/,/SED-END/{
@@ -31 +35 @@
 /^[[:space:]]*#[[:space:]]*define/b defines
 
-# if (/**) goto description
-/\/\*\*/b description
-
 }
 
 # Everything else is deleted!
+:delete
 d
 b end
@@ -44 +46 @@
 # Convert the defines
 :defines
-s/^[[:space:]]*#[[:space:]]*define[[:space:]]*\([[:alnum:]_]*\)[[:space:]]*\(.*\)[[:space:]]*$/    "\1",\n     \1 }, /
-b end
 
-##
-# Convert descriptive comments. /** desc */
-:description
+/^[[:space:]]*#[[:space:]]*define[[:space:]]*\([[:alnum:]_]*\)[[:space:](]*\([-+]*[[:space:]]*[[:digit:]][[:digit:]]*\)[[:space:])]*$/b define_okay
+b delete
+:define_okay
+s/^[[:space:]]*#[[:space:]]*define[[:space:]]*\([[:alnum:]_]*\)[[:space:](]*\([-+]*[[:space:]]*[[:digit:]][[:digit:]]*\)[[:space:])]*$/        '\1': \2,/
 
-# Read all the lines belonging to the comment into the buffer.
-:look-for-end-of-comment
-/\*\//bend-of-comment
-N
-blook-for-end-of-comment
-:end-of-comment
-
-# anything with @{ and @} is skipped
-/@[\{\}]/d
-
-# Fix double spaces
-s/[[:space:]][[:space:]]/ /g
-
-# Fix \# sequences (doxygen needs them, we don't).
-s/\\#/#/g
-
-# insert punctuation.
-s/\([^.[:space:]]\)[[:space:]]*\*\//\1. \*\//
-
-# convert /** short. more
-s/[[:space:]]*\/\*\*[[:space:]]*/  { NULL, \"/
-s/  { NULL, \"\([^.!?"]*[.!?][.!?]*\)/  { \"\1\",\n    \"\1/
-
-# terminate the string
-s/[[:space:]]*\*\//\"\,/
-
-# translate empty lines into new-lines (only one, please).
-s/[[:space:]]*[[:space:]]\*[[:space:]][[:space:]]*\*[[:space:]][[:space:]]*/\\n/g
-
-# remove asterics.
-s/[[:space:]]*[[:space:]]\*[[:space:]][[:space:]]*/ /g
 b end