Browse Source

Linux fixes, Bootstrap.cs build errors, warnings (#1010)

* Fix warnings about unused variables

* Fix linux include paths in ParserGen and CLI generator.
Remove parsing of `CppSharp.CppParser.lib` as it is not used.

* Fix build errors in CppSharp.Parser.Bootstrap target.
pull/1011/head
Rokas Kupstys 9 years ago committed by Dimitar Dobrev
parent
commit
05445f3028
  1. 2
      src/CLI/CLI.cs
  2. 2
      src/CLI/Generator.cs
  3. 16
      src/CppParser/Bootstrap/Bootstrap.cs
  4. 3
      src/CppParser/ParserGen/ParserGen.cs
  5. 2
      src/Parser/ASTConverter.cs

2
src/CLI/CLI.cs

@ -154,7 +154,7 @@ namespace CppSharp
messages.Add(string.Format("File '{0}' could not be found.", args)); messages.Add(string.Format("File '{0}' could not be found.", args));
} }
} }
catch(Exception ex) catch(Exception)
{ {
messages.Add(string.Format("Error while looking for files inside path '{0}'. Ignoring.", args)); messages.Add(string.Format("Error while looking for files inside path '{0}'. Ignoring.", args));
} }

2
src/CLI/Generator.cs

@ -212,7 +212,9 @@ namespace CppSharp
Path.Combine("usr", "include", "x86_64-linux-gnu", "c++", gccVersion), Path.Combine("usr", "include", "x86_64-linux-gnu", "c++", gccVersion),
Path.Combine("usr", "include", "c++", gccVersion, "backward"), Path.Combine("usr", "include", "c++", gccVersion, "backward"),
Path.Combine("usr", "lib", "gcc", "x86_64-linux-gnu", gccVersion, "include"), Path.Combine("usr", "lib", "gcc", "x86_64-linux-gnu", gccVersion, "include"),
Path.Combine("usr", "lib", "gcc", "x86_64-pc-linux-gnu", gccVersion, "include"),
Path.Combine("usr", "include", "x86_64-linux-gnu"), Path.Combine("usr", "include", "x86_64-linux-gnu"),
Path.Combine("usr", "include", "x86_64-pc-linux-gnu"),
Path.Combine("usr", "include") Path.Combine("usr", "include")
}; };

16
src/CppParser/Bootstrap/Bootstrap.cs

@ -2,6 +2,7 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.IO; using System.IO;
using CppSharp.AST; using CppSharp.AST;
using CppSharp.Generators;
namespace CppSharp namespace CppSharp
{ {
@ -30,14 +31,13 @@ namespace CppSharp
public void Setup(Driver driver) public void Setup(Driver driver)
{ {
var options = driver.Options; driver.Options.GeneratorKind = GeneratorKind.CSharp;
options.GeneratorKind = GeneratorKind.CSharp; driver.Options.DryRun = true;
options.DryRun = true; driver.ParserOptions.SetupXcode();
options.SetupXcode(); driver.ParserOptions.MicrosoftMode = false;
options.MicrosoftMode = false; driver.ParserOptions.TargetTriple = "i686-apple-darwin12.4.0";
options.TargetTriple = "i686-apple-darwin12.4.0";
var module = driver.Options.AddModule("CppSharp");
var module = options.AddModule("CppSharp");
module.Defines.Add("__STDC_LIMIT_MACROS"); module.Defines.Add("__STDC_LIMIT_MACROS");
module.Defines.Add("__STDC_CONSTANT_MACROS"); module.Defines.Add("__STDC_CONSTANT_MACROS");

3
src/CppParser/ParserGen/ParserGen.cs

@ -63,7 +63,6 @@ namespace CppSharp
"Sources.h", "Sources.h",
"CppParser.h" "CppParser.h"
}); });
parserModule.Libraries.Add("CppSharp.CppParser.lib");
parserModule.OutputNamespace = string.Empty; parserModule.OutputNamespace = string.Empty;
if (Abi == CppAbi.Microsoft) if (Abi == CppAbi.Microsoft)
@ -116,7 +115,9 @@ namespace CppSharp
Path.Combine("usr", "include", "x86_64-linux-gnu", "c++", gccVersion), Path.Combine("usr", "include", "x86_64-linux-gnu", "c++", gccVersion),
Path.Combine("usr", "include", "c++", gccVersion, "backward"), Path.Combine("usr", "include", "c++", gccVersion, "backward"),
Path.Combine("usr", "lib", "gcc", "x86_64-linux-gnu", gccVersion, "include"), Path.Combine("usr", "lib", "gcc", "x86_64-linux-gnu", gccVersion, "include"),
Path.Combine("usr", "lib", "gcc", "x86_64-pc-linux-gnu", gccVersion, "include"),
Path.Combine("usr", "include", "x86_64-linux-gnu"), Path.Combine("usr", "include", "x86_64-linux-gnu"),
Path.Combine("usr", "include", "x86_64-pc-linux-gnu"),
Path.Combine("usr", "include") Path.Combine("usr", "include")
}; };

2
src/Parser/ASTConverter.cs

@ -1047,7 +1047,7 @@ namespace CppSharp
VisitDeclContext(decl, _decl); VisitDeclContext(decl, _decl);
} }
for (uint i = 0, j = 0; i < ctx.ClassesCount; ++i) for (uint i = 0; i < ctx.ClassesCount; ++i)
{ {
var decl = ctx.GetClasses(i); var decl = ctx.GetClasses(i);
var _decl = (AST.Class) Visit(decl); var _decl = (AST.Class) Visit(decl);

Loading…
Cancel
Save