cxxproject 0.5.75 → 0.5.76
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/cxxproject/buildingblocks/lint.rb +0 -5
- data/lib/cxxproject/toolchain/gcc_lint.rb +0 -52
- data/lib/cxxproject/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 927d4a566d15f86a7b32c9c2dd779f43ae4ac91a
|
4
|
+
data.tar.gz: 71f012235d6e0216ffc996f8d6ac4ee7e4b84ad9
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: f644dab5640920a2e1311c693ca3eefacc5db60057abd3f667b95e9155be0abe5eb4c867c1fc95f339ea02b3743e76acb3185944c0b6c0c4396e837ddfd9ca2d
|
7
|
+
data.tar.gz: 9973f2ed2ba0d96e443ced0e8d8da31b1c259f8ec522067a73f0e9a42bc5113ee2b994aed842fc1ab454b77ce670c91aea01dd3c722003dfacf56e6dd250bec6
|
@@ -25,8 +25,6 @@ module Cxxproject
|
|
25
25
|
|
26
26
|
def convert_to_rake()
|
27
27
|
compiler = @tcs[:COMPILER][:CPP]
|
28
|
-
lintParam = @tcs[:LINT_PARAM]
|
29
|
-
lintParam.init_vars
|
30
28
|
|
31
29
|
res = typed_file_task Rake::Task::LINT, get_task_name do
|
32
30
|
dir = @project_dir
|
@@ -51,9 +49,6 @@ module Cxxproject
|
|
51
49
|
cmd = [compiler[:COMMAND]]
|
52
50
|
cmd += compiler[:COMPILE_FLAGS]
|
53
51
|
|
54
|
-
cmd += lintParam.internalIncludes
|
55
|
-
cmd += lintParam.internalDefines
|
56
|
-
|
57
52
|
cmd += @include_string[:CPP]
|
58
53
|
cmd += @define_string[:CPP]
|
59
54
|
|
@@ -6,55 +6,6 @@ require 'cxxproject/errorparser/gcc_lint_error_parser'
|
|
6
6
|
module Cxxproject
|
7
7
|
module Toolchain
|
8
8
|
|
9
|
-
class GCC_Param
|
10
|
-
|
11
|
-
def initialize
|
12
|
-
@incs = []
|
13
|
-
@defs = []
|
14
|
-
end
|
15
|
-
|
16
|
-
def init_vars
|
17
|
-
@incs = []
|
18
|
-
@defs = []
|
19
|
-
|
20
|
-
begin
|
21
|
-
isCygwin = system("cygpath --version > /dev/null 2>&1")
|
22
|
-
|
23
|
-
incStart = false
|
24
|
-
defRegex = /^#define (\S+) (.*)/
|
25
|
-
|
26
|
-
gccString = `echo "" | g++ -x c++ -E -dM -v - 2>&1`
|
27
|
-
|
28
|
-
gccString.lines.map(&:chomp).each do |line|
|
29
|
-
if line.include?"#include <...> search starts here:"
|
30
|
-
incStart = true
|
31
|
-
elsif line.include?"End of search list."
|
32
|
-
incStart = false
|
33
|
-
elsif incStart
|
34
|
-
inc = line.strip
|
35
|
-
inc = `cygpath -w #{line.strip}`.strip if isCygwin
|
36
|
-
@incs << "--i#{inc}"
|
37
|
-
elsif regRes = line.match(defRegex)
|
38
|
-
@defs << "-D#{regRes[1]}=\"#{regRes[2]}\""
|
39
|
-
end
|
40
|
-
end
|
41
|
-
|
42
|
-
rescue Exception=>e
|
43
|
-
Printer.printError "Error: could not determine GCC's internal includes and defines"
|
44
|
-
raise
|
45
|
-
end
|
46
|
-
|
47
|
-
end
|
48
|
-
|
49
|
-
def internalIncludes
|
50
|
-
@incs
|
51
|
-
end
|
52
|
-
|
53
|
-
def internalDefines
|
54
|
-
@defs
|
55
|
-
end
|
56
|
-
end
|
57
|
-
|
58
9
|
GCCLintChain = Provider.add("GCC_Lint")
|
59
10
|
|
60
11
|
GCCLintChain[:COMPILER][:CPP].update({
|
@@ -65,9 +16,6 @@ module Cxxproject
|
|
65
16
|
})
|
66
17
|
|
67
18
|
GCCLintChain[:COMPILER][:CPP][:ERROR_PARSER] = GCCLintErrorParser.new
|
68
|
-
GCCLintChain[:LINT_PARAM] = GCC_Param.new
|
69
|
-
|
70
|
-
|
71
19
|
|
72
20
|
end
|
73
21
|
end
|
data/lib/cxxproject/version.rb
CHANGED
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: cxxproject
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.5.
|
4
|
+
version: 0.5.76
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- oliver mueller
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2014-11-
|
11
|
+
date: 2014-11-07 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: highline
|