rakepp 0.1.6.1 → 0.1.6.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- data/Rakefile +1 -1
- data/lib/rakepp/gcccompiler.rb +8 -8
- data/lib/rakepp/gccwin32compiler.rb +1 -1
- data/lib/rakepp/libhelper.rb +2 -2
- data/lib/rakepp/linuxcompiler.rb +1 -1
- data/lib/rakepp/objectfile.rb +3 -1
- data/lib/rakepp/osxcompiler.rb +4 -4
- metadata +11 -25
data/Rakefile
CHANGED
data/lib/rakepp/gcccompiler.rb
CHANGED
@@ -6,7 +6,7 @@ class GccCompiler < Compiler
|
|
6
6
|
def addObjectTasks(artifact)
|
7
7
|
outName = File.join(artifact.targetDir, artifact.source.to_o)
|
8
8
|
artifact.outFile = outName
|
9
|
-
depFile = artifact.
|
9
|
+
depFile = artifact.dep_file
|
10
10
|
|
11
11
|
depFileTask = file depFile => artifact.source.fullPath do | task |
|
12
12
|
calcDependencies(artifact, depFile)
|
@@ -88,12 +88,12 @@ class GccCompiler < Compiler
|
|
88
88
|
raise 'cannot calc dependencies'
|
89
89
|
end
|
90
90
|
deps = deps.gsub(/\\\n/,'').split()[1..-1]
|
91
|
-
File.open(artifact.
|
91
|
+
File.open(artifact.dep_file, 'wb') do |f|
|
92
92
|
f.write(deps.to_yaml)
|
93
93
|
end
|
94
94
|
end
|
95
95
|
|
96
|
-
def
|
96
|
+
def start_of_source_lib_command(outName, artifact)
|
97
97
|
return "ar -r #{outName}"
|
98
98
|
end
|
99
99
|
|
@@ -111,7 +111,7 @@ class GccCompiler < Compiler
|
|
111
111
|
artifact.outFile = outName
|
112
112
|
desc "Create SourceLib #{outName}"
|
113
113
|
theTask = file outName => objects do | task |
|
114
|
-
command =
|
114
|
+
command = start_of_source_lib_command(outName, artifact)
|
115
115
|
objects.each do | o |
|
116
116
|
command += " #{o}"
|
117
117
|
end
|
@@ -132,11 +132,11 @@ def addSharedLibTasks(artifact)
|
|
132
132
|
objects << ObjectFile.new(self, source, outDir, artifact.tr_includes, artifact.privateDefines).outFile
|
133
133
|
end
|
134
134
|
libsName = File.join(@targetDir, 'libs')
|
135
|
-
outName = File.join(libsName, "#{artifact.name}.#{
|
135
|
+
outName = File.join(libsName, "#{artifact.name}.#{shared_extension()}")
|
136
136
|
artifact.outFile = outName
|
137
137
|
desc "Create SharedLib #{outName}"
|
138
138
|
theTask = file outName => objects do | task |
|
139
|
-
command =
|
139
|
+
command = start_of_shared_lib_command(outName, artifact)
|
140
140
|
objects.each do |o|
|
141
141
|
command += " #{o}"
|
142
142
|
end
|
@@ -189,7 +189,7 @@ def addExeTasks(artifact)
|
|
189
189
|
command += endOfLibs
|
190
190
|
|
191
191
|
sh command
|
192
|
-
|
192
|
+
do_additional_work_for_exe(artifact)
|
193
193
|
end
|
194
194
|
|
195
195
|
addTransitiveLibraryPrerequisites(theTask, artifact)
|
@@ -204,7 +204,7 @@ end
|
|
204
204
|
def endOfLibs
|
205
205
|
return ''
|
206
206
|
end
|
207
|
-
def
|
207
|
+
def do_additional_work_for_exe(artifact)
|
208
208
|
end
|
209
209
|
|
210
210
|
def addTransitiveLibraryPrerequisites(theTask, artifact)
|
data/lib/rakepp/libhelper.rb
CHANGED
data/lib/rakepp/linuxcompiler.rb
CHANGED
data/lib/rakepp/objectfile.rb
CHANGED
data/lib/rakepp/osxcompiler.rb
CHANGED
@@ -6,11 +6,11 @@ class OsxCompiler < GccCompiler
|
|
6
6
|
@gui = gui
|
7
7
|
end
|
8
8
|
|
9
|
-
def
|
9
|
+
def start_of_source_lib_command(outname, artifact)
|
10
10
|
return "libtool -static -arch_only #{@architecture} -o #{outname}"
|
11
11
|
end
|
12
12
|
|
13
|
-
def
|
13
|
+
def start_of_shared_lib_command(libName, artifact)
|
14
14
|
name = artifact.options[:name]
|
15
15
|
if name == nil
|
16
16
|
name = File.basename(libName)
|
@@ -18,7 +18,7 @@ class OsxCompiler < GccCompiler
|
|
18
18
|
return "g++ -arch #{@architecture} -dynamiclib -install_name #{name}"
|
19
19
|
end
|
20
20
|
|
21
|
-
def
|
21
|
+
def shared_extension()
|
22
22
|
return 'so'
|
23
23
|
end
|
24
24
|
|
@@ -30,7 +30,7 @@ class OsxCompiler < GccCompiler
|
|
30
30
|
end
|
31
31
|
end
|
32
32
|
|
33
|
-
def
|
33
|
+
def do_additional_work_for_exe(artifact)
|
34
34
|
if @gui
|
35
35
|
sh "/Developer/Tools/Rez -o #{artifact.outFile} appResources.r"
|
36
36
|
end
|
metadata
CHANGED
@@ -1,13 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: rakepp
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
|
5
|
-
segments:
|
6
|
-
- 0
|
7
|
-
- 1
|
8
|
-
- 6
|
9
|
-
- 1
|
10
|
-
version: 0.1.6.1
|
4
|
+
version: 0.1.6.2
|
11
5
|
platform: ruby
|
12
6
|
authors:
|
13
7
|
- Christian Koestlin
|
@@ -20,19 +14,15 @@ default_executable:
|
|
20
14
|
dependencies:
|
21
15
|
- !ruby/object:Gem::Dependency
|
22
16
|
name: progressbar
|
23
|
-
|
24
|
-
|
17
|
+
type: :runtime
|
18
|
+
version_requirement:
|
19
|
+
version_requirements: !ruby/object:Gem::Requirement
|
25
20
|
requirements:
|
26
21
|
- - ">="
|
27
22
|
- !ruby/object:Gem::Version
|
28
|
-
segments:
|
29
|
-
- 0
|
30
|
-
- 0
|
31
|
-
- 3
|
32
23
|
version: 0.0.3
|
33
|
-
|
34
|
-
|
35
|
-
description: " Some more high level building blocks for cpp projects.\n"
|
24
|
+
version:
|
25
|
+
description: Some more high level building blocks for cpp projects.
|
36
26
|
email: gizmoATflopcodeDOTcom
|
37
27
|
executables: []
|
38
28
|
|
@@ -61,10 +51,8 @@ files:
|
|
61
51
|
- lib/rakepp/sourcelib.rb
|
62
52
|
- lib/rakepp.rb
|
63
53
|
- Rakefile
|
64
|
-
has_rdoc:
|
54
|
+
has_rdoc: false
|
65
55
|
homepage: http://www.flopcode.com
|
66
|
-
licenses: []
|
67
|
-
|
68
56
|
post_install_message:
|
69
57
|
rdoc_options: []
|
70
58
|
|
@@ -74,22 +62,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
74
62
|
requirements:
|
75
63
|
- - ">="
|
76
64
|
- !ruby/object:Gem::Version
|
77
|
-
segments:
|
78
|
-
- 0
|
79
65
|
version: "0"
|
66
|
+
version:
|
80
67
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
81
68
|
requirements:
|
82
69
|
- - ">="
|
83
70
|
- !ruby/object:Gem::Version
|
84
|
-
segments:
|
85
|
-
- 0
|
86
71
|
version: "0"
|
72
|
+
version:
|
87
73
|
requirements: []
|
88
74
|
|
89
75
|
rubyforge_project: rakepp
|
90
|
-
rubygems_version: 1.3.
|
76
|
+
rubygems_version: 1.3.1
|
91
77
|
signing_key:
|
92
|
-
specification_version:
|
78
|
+
specification_version: 2
|
93
79
|
summary: Cpp Support for Rake.
|
94
80
|
test_files: []
|
95
81
|
|