[SharpGen] Execute CastXML instead of gccxml

jwollen · jwollen · commit 8431c754b061 · 2015-08-29T15:19:21.000+09:00
diff --git a/Source/Tools/SharpGen/Parser/GccXml.cs b/Source/Tools/SharpGen/Parser/GccXml.cs
@@ -175,13 +175,10 @@ public void Preprocess(string headerFile, DataReceivedEventHandler handler)
                                 WorkingDirectory = Environment.CurrentDirectory
                             };
 
-                        File.WriteAllText(GccXmlGccOptionsFile, "-dDI -E");
+                        var arguments = "";
+                        arguments += " --castxml-gccxml";
+                        arguments += " -x c++ -std=c++11 -E -dD";
 
-                        var arguments = ""; // "--gccxml-gcc-options " + GccXmlGccOptionsFile;
-                        // Overrides settings for gccxml for compiling Win8 version
-                        arguments += " --gccxml-config \"" + Path.Combine(Path.GetDirectoryName(ExecutablePath), @"..\share\gccxml-0.9\vc" + vsVersion + @"\gccxml_config") + "\"";
-                        
-                        arguments += " -E --gccxml-gcc-options " + GccXmlGccOptionsFile;
                         foreach (var directory in GetIncludePaths())
                             arguments += " " + directory;
 
@@ -260,7 +257,7 @@ private List<string> GetIncludePaths()
 
                 if (directory.IsOverride)
                 {
-                    paths.Add("-iwrapper\"" + path.TrimEnd('\\') + "\"");
+                    paths.Add("-I\"" + path.TrimEnd('\\') + "\"");
                 }
                 else
                 {
@@ -371,12 +368,11 @@ public StreamReader Process(string headerFile)
                     // Delete any previously generated xml file
                     File.Delete(xmlFile);
 
-                    var arguments = ""; // "--gccxml-gcc-options " + GccXmlGccOptionsFile;
-
-                    // Overrides settings for gccxml for compiling Win8 version
-                    arguments += " --gccxml-config \"" + Path.Combine(Path.GetDirectoryName(ExecutablePath), @"..\share\gccxml-0.9\vc" + vsVersion + @"\gccxml_config") + "\"";
+                    var arguments = "";
+                    arguments += " --castxml-gccxml";
+                    arguments += " -x c++ -std=c++11 -fmsc-version=1800 -fms-extensions -fms-compatibility -Wno-microsoft-enum-value -Wno-macro-redefined";
+                    arguments += " -o " + xmlFile;
 
-                    arguments += " -fxml=" + xmlFile;
                     foreach (var directory in GetIncludePaths())
                         arguments += " " + directory;
 
diff --git a/Source/Tools/SharpGen/RunGenerator.bat b/Source/Tools/SharpGen/RunGenerator.bat
@@ -4,7 +4,7 @@ setlocal
 pushd "%~dp0\Bin\%1"
 ECHO "%~dp0msdndoc.zip"
 xcopy /D /Y "%~dp0MSDNDoc.zip" .
-SharpGen.exe --doc --gccxml ..\..\..\..\..\External\gccxml\bin\gccxml.exe ..\..\..\..\Mapping.xml
+SharpGen.exe --doc --gccxml ..\..\..\..\..\External\castxml\bin\castxml.exe ..\..\..\..\Mapping.xml
 set LOCALERROR = %ERRORLEVEL%
 xcopy /D /Y MSDNDoc.zip %~dp0
 exit /B %LOCALERROR%
