[mapguide-commits] r8588 - in trunk/MgDev/BuildTools/WebTools/IMake: . Win32

[svn_mapguide at osgeo.org]

Author: jng
Date: 2015-03-21 07:45:47 -0700 (Sat, 21 Mar 2015)
New Revision: 8588

Modified:
   trunk/MgDev/BuildTools/WebTools/IMake/IMake.cpp
   trunk/MgDev/BuildTools/WebTools/IMake/Win32/IMake.exe
Log:
This submission updates IMake to skip over invalid \exception declarations. Wrapper APIs know nothing about std::bad_alloc or any other non-MapGuide exceptions, so such declaration should be skipped over when writing the respective .net and Java API documentation.

Modified: trunk/MgDev/BuildTools/WebTools/IMake/IMake.cpp
===================================================================
--- trunk/MgDev/BuildTools/WebTools/IMake/IMake.cpp	2015-03-21 14:38:57 UTC (rev 8587)
+++ trunk/MgDev/BuildTools/WebTools/IMake/IMake.cpp	2015-03-21 14:45:47 UTC (rev 8588)
@@ -12,7 +12,7 @@
     java
 };
 
-static char version[] = "1.2.3";
+static char version[] = "1.2.4";
 static char EXTERNAL_API_DOCUMENTATION[] = "(NOTE: This API is not officially supported and may be subject to removal in a future release without warning. Use with caution.)";
 
 static string module;
@@ -1076,20 +1076,32 @@
                     eelems.push_back(eitem);
             }
 
-            csharpDoc.append("///<exception cref=\"");
-            csharpDoc.append(nspace);
-            csharpDoc.append(".");
-            if (eelems.size() > 1) {
-                csharpDoc.append(eelems[0]);
-                csharpDoc.append("\">");
-                for (int j = 1; j < eelems.size(); j++) {
-                    csharpDoc.append(" ");
-                    csharpDoc.append(eelems[j]);
+            if (eelems.size() > 0)
+            {
+                //Skip anything that is not of the form:
+                //\exception MgExceptionType Description of cases when the exception is thrown
+                //
+                //So the first token must start with "Mg"
+                std::string t("Mg");
+                if (eelems[0].compare(0, t.length(), t) == 0)
+                {
+                    csharpDoc.append("///<exception cref=\"");
+                    csharpDoc.append(nspace);
+                    csharpDoc.append(".");
+                    if (eelems.size() > 1) {
+                        csharpDoc.append(eelems[0]);
+                        csharpDoc.append("\">");
+                        for (int j = 1; j < eelems.size(); j++) {
+                            csharpDoc.append(" ");
+                            csharpDoc.append(eelems[j]);
+                        }
+                        csharpDoc.append("</exception>\n");
+                    }
+                    else {
+                        csharpDoc.append(eelems[0]);
+                        csharpDoc.append("\"></exception>\n");
+                    }
                 }
-                csharpDoc.append("</exception>\n");
-            } else {
-                csharpDoc.append(eelems[0]);
-                csharpDoc.append("\"></exception>\n");
             }
         }
     }

Modified: trunk/MgDev/BuildTools/WebTools/IMake/Win32/IMake.exe
===================================================================
(Binary files differ)