Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
mruby
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Libraries
mruby
Commits
b6ab216f
Commit
b6ab216f
authored
Aug 26, 2013
by
take_cheeze
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
support file extension .cpp/.cxx in mrbgem and tool
parent
bc843ed9
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
6 deletions
+6
-6
Rakefile
Rakefile
+2
-2
tasks/mrbgem_spec.rake
tasks/mrbgem_spec.rake
+4
-4
No files found.
Rakefile
View file @
b6ab216f
...
@@ -41,7 +41,7 @@ depfiles = MRuby.targets['host'].bins.map do |bin|
...
@@ -41,7 +41,7 @@ depfiles = MRuby.targets['host'].bins.map do |bin|
FileUtils
.
rm_f
t
.
name
,
{
:verbose
=>
$verbose
}
FileUtils
.
rm_f
t
.
name
,
{
:verbose
=>
$verbose
}
FileUtils
.
cp
t
.
prerequisites
.
first
,
t
.
name
,
{
:verbose
=>
$verbose
}
FileUtils
.
cp
t
.
prerequisites
.
first
,
t
.
name
,
{
:verbose
=>
$verbose
}
end
end
install_path
install_path
end
end
...
@@ -53,7 +53,7 @@ MRuby.each_target do |target|
...
@@ -53,7 +53,7 @@ MRuby.each_target do |target|
gem
.
bins
.
each
do
|
bin
|
gem
.
bins
.
each
do
|
bin
|
exec
=
exefile
(
"
#{
build_dir
}
/bin/
#{
bin
}
"
)
exec
=
exefile
(
"
#{
build_dir
}
/bin/
#{
bin
}
"
)
objs
=
Dir
.
glob
(
"
#{
current_dir
}
/tools/
#{
bin
}
/*.
c
"
).
map
{
|
f
|
objfile
(
f
.
pathmap
(
"
#{
current_build_dir
}
/tools/
#{
bin
}
/%n"
))
}
objs
=
Dir
.
glob
(
"
#{
current_dir
}
/tools/
#{
bin
}
/*.
{c,cpp,cxx}
"
).
map
{
|
f
|
objfile
(
f
.
pathmap
(
"
#{
current_build_dir
}
/tools/
#{
bin
}
/%n"
))
}
file
exec
=>
objs
+
[
libfile
(
"
#{
build_dir
}
/lib/libmruby"
)]
do
|
t
|
file
exec
=>
objs
+
[
libfile
(
"
#{
build_dir
}
/lib/libmruby"
)]
do
|
t
|
gem_flags
=
gems
.
map
{
|
g
|
g
.
linker
.
flags
}
gem_flags
=
gems
.
map
{
|
g
|
g
.
linker
.
flags
}
...
...
tasks/mrbgem_spec.rake
View file @
b6ab216f
...
@@ -6,7 +6,7 @@ module MRuby
...
@@ -6,7 +6,7 @@ module MRuby
class
<<
self
class
<<
self
attr_accessor
:current
attr_accessor
:current
end
end
LinkerConfig
=
Struct
.
new
(
:libraries
,
:library_paths
,
:flags
,
:flags_before_libraries
,
:flags_after_libraries
)
LinkerConfig
=
Struct
.
new
(
:libraries
,
:library_paths
,
:flags
,
:flags_before_libraries
,
:flags_after_libraries
)
class
Specification
class
Specification
include
Rake
::
DSL
include
Rake
::
DSL
...
@@ -53,13 +53,13 @@ module MRuby
...
@@ -53,13 +53,13 @@ module MRuby
@linker
=
LinkerConfig
.
new
([],
[],
[],
[])
@linker
=
LinkerConfig
.
new
([],
[],
[],
[])
@rbfiles
=
Dir
.
glob
(
"
#{
dir
}
/mrblib/*.rb"
).
sort
@rbfiles
=
Dir
.
glob
(
"
#{
dir
}
/mrblib/*.rb"
).
sort
@objs
=
Dir
.
glob
(
"
#{
dir
}
/src/*.{c,cpp,m,asm,S}"
).
map
do
|
f
|
@objs
=
Dir
.
glob
(
"
#{
dir
}
/src/*.{c,cpp,
cxx,
m,asm,S}"
).
map
do
|
f
|
objfile
(
f
.
relative_path_from
(
@dir
).
to_s
.
pathmap
(
"
#{
build_dir
}
/%X"
))
objfile
(
f
.
relative_path_from
(
@dir
).
to_s
.
pathmap
(
"
#{
build_dir
}
/%X"
))
end
end
@objs
<<
objfile
(
"
#{
build_dir
}
/gem_init"
)
@objs
<<
objfile
(
"
#{
build_dir
}
/gem_init"
)
@test_rbfiles
=
Dir
.
glob
(
"
#{
dir
}
/test/*.rb"
)
@test_rbfiles
=
Dir
.
glob
(
"
#{
dir
}
/test/*.rb"
)
@test_objs
=
Dir
.
glob
(
"
#{
dir
}
/test/*.{c,cpp,m,asm,S}"
).
map
do
|
f
|
@test_objs
=
Dir
.
glob
(
"
#{
dir
}
/test/*.{c,cpp,
cxx,
m,asm,S}"
).
map
do
|
f
|
objfile
(
f
.
relative_path_from
(
dir
).
to_s
.
pathmap
(
"
#{
build_dir
}
/%X"
))
objfile
(
f
.
relative_path_from
(
dir
).
to_s
.
pathmap
(
"
#{
build_dir
}
/%X"
))
end
end
@test_preload
=
'test/assert.rb'
@test_preload
=
'test/assert.rb'
...
@@ -211,7 +211,7 @@ module MRuby
...
@@ -211,7 +211,7 @@ module MRuby
end
end
# ~> compare algorithm
# ~> compare algorithm
#
#
# Example:
# Example:
# ~> 2.2 means >= 2.2.0 and < 3.0.0
# ~> 2.2 means >= 2.2.0 and < 3.0.0
# ~> 2.2.0 means >= 2.2.0 and < 2.3.0
# ~> 2.2.0 means >= 2.2.0 and < 2.3.0
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment