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
259fcf2e
Commit
259fcf2e
authored
Jul 16, 2013
by
Yukihiro "Matz" Matsumoto
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #1384 from xxuejie/customize-build-dir
Allow programmers to specify build path manually
parents
6ee9858b
122770d1
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
8 deletions
+5
-8
tasks/mruby_build.rake
tasks/mruby_build.rake
+2
-5
tasks/mruby_build_gem.rake
tasks/mruby_build_gem.rake
+3
-3
No files found.
tasks/mruby_build.rake
View file @
259fcf2e
...
...
@@ -43,7 +43,7 @@ module MRuby
end
include
Rake
::
DSL
include
LoadGems
attr_accessor
:name
,
:bins
,
:exts
,
:file_separator
attr_accessor
:name
,
:bins
,
:exts
,
:file_separator
,
:build_dir
attr_reader
:libmruby
,
:gems
COMPILERS
=
%w(cc cxx objc asm)
...
...
@@ -63,6 +63,7 @@ module MRuby
end
@file_separator
=
'/'
@build_dir
=
"
#{
MRUBY_ROOT
}
/build/
#{
@name
}
"
@cc
=
Command
::
Compiler
.
new
(
self
,
%w(.c)
)
@cxx
=
Command
::
Compiler
.
new
(
self
,
%w(.cc .cxx .cpp)
)
@objc
=
Command
::
Compiler
.
new
(
self
,
%w(.m)
)
...
...
@@ -95,10 +96,6 @@ module MRuby
MRUBY_ROOT
end
def
build_dir
"
#{
MRUBY_ROOT
}
/build/
#{
self
.
name
}
"
end
def
mrbcfile
MRuby
.
targets
[
'host'
].
exefile
(
"
#{
MRuby
.
targets
[
'host'
].
build_dir
}
/bin/mrbc"
)
end
...
...
tasks/mruby_build_gem.rake
View file @
259fcf2e
...
...
@@ -39,7 +39,7 @@ module MRuby
gemdir
=
"
#{
root
}
/mrbgems/
#{
params
[
:core
]
}
"
elsif
params
[
:git
]
url
=
params
[
:git
]
gemdir
=
"
build
/mrbgems/
#{
url
.
match
(
/([-\w]+)(\.[-\w]+|)$/
).
to_a
[
1
]
}
"
gemdir
=
"
#{
build_dir
}
/mrbgems/
#{
url
.
match
(
/([-\w]+)(\.[-\w]+|)$/
).
to_a
[
1
]
}
"
if
File
.
exists?
(
gemdir
)
if
$pull_gems
...
...
@@ -50,7 +50,7 @@ module MRuby
else
options
=
[
params
[
:options
]]
||
[]
options
<<
"--branch
\"
#{
params
[
:branch
]
}
\"
"
if
params
[
:branch
]
FileUtils
.
mkdir_p
"
build
/mrbgems"
FileUtils
.
mkdir_p
"
#{
build_dir
}
/mrbgems"
git
.
run_clone
gemdir
,
url
,
options
end
else
...
...
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