Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
T
tarantool
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
core
tarantool
Commits
2d968193
Commit
2d968193
authored
10 years ago
by
bigbes
Browse files
Options
Downloads
Patches
Plain Diff
Fix warnings and broken spec's fields for brew test-bot
parent
b97bedcc
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
extra/tarantool.rb
+14
-11
14 additions, 11 deletions
extra/tarantool.rb
with
14 additions
and
11 deletions
extra/tarantool.rb
+
14
−
11
View file @
2d968193
...
...
@@ -10,9 +10,9 @@ class Tarantool < Formula
option
'with-tests'
,
"Run Tests after building"
stable
do
url
'https://github.com/tarantool/tarantool.git'
,
:using
=>
:git
,
:branch
=>
"stable"
url
'https://github.com/tarantool/tarantool.git'
,
:branch
=>
"stable"
,
:shallow
=>
false
depends_on
'e2fsprogs'
=>
:recommended
if
build
.
include?
'
with
-
tests'
if
build
.
with
?
'
tests'
depends_on
'python-daemon'
=>
[
:python
,
"daemon"
,
:build
]
depends_on
'pyyaml'
=>
[
:python
,
"yaml"
,
:build
]
depends_on
'pexpect'
=>
[
:python
,
"pexpect"
,
:build
]
...
...
@@ -21,9 +21,9 @@ class Tarantool < Formula
end
devel
do
url
'https://github.com/tarantool/tarantool.git'
,
:using
=>
:git
,
:branch
=>
"master"
url
'https://github.com/tarantool/tarantool.git'
,
:branch
=>
"master"
,
:shallow
=>
false
depends_on
'e2fsprogs'
=>
:build
if
build
.
include?
'
with
-
tests'
if
build
.
with
?
'
tests'
depends_on
'python-daemon'
=>
[
:python
,
"daemon"
,
:build
]
depends_on
'pyyaml'
=>
[
:python
,
"yaml"
,
:build
]
end
...
...
@@ -32,7 +32,7 @@ class Tarantool < Formula
def
install
args
=
[]
if
build
.
include?
'
with
-
debug'
if
build
.
with
?
'
debug'
ENV
.
enable_warnings
ENV
.
deparallelize
args
<<
[
"-DCMAKE_BUILD_TYPE=Debug"
]
...
...
@@ -42,11 +42,14 @@ class Tarantool < Formula
ohai
"Building with Release"
end
args
<<
"-DENABLE_CLIENT=True"
if
build
.
stable?
args
<<
"-DCMAKE_INSTALL_SYSCONFDIR=
#{
prefix
}
/etc"
args
<<
"-DCMAKE_INSTALL_LOCALSTATEDIR=
#{
prefix
}
/var"
args
+=
std_cmake_args
ohai
"Preparing"
version
=
`git -C
#{
cached_download
}
describe HEAD`
File
.
open
(
"
#{
buildpath
}
/VERSION"
,
'w'
)
{
|
file
|
file
.
write
(
version
)}
File
.
open
(
buildpath
/
"VERSION"
,
'w'
)
{
|
file
|
file
.
write
(
version
)}
ohai
"Configuring:"
system
"cmake"
,
"."
,
*
args
...
...
@@ -65,7 +68,7 @@ class Tarantool < Formula
ohai
"Installing config"
if
build
.
stable?
inreplace
etc
/
"
tarantool.cfg"
,
/^work_dir =.*/
,
"work_dir =
#{
prefix
}
/var/lib/tarantool"
inreplace
prefix
/
"
etc/tarantool.cfg"
,
/^work_dir =.*/
,
"work_dir =
#{
prefix
}
/var/lib/tarantool"
else
doc
.
install
"test/box/box.lua"
inreplace
doc
/
"box.lua"
do
|
s
|
...
...
@@ -77,13 +80,13 @@ class Tarantool < Formula
end
end
if
build
.
include?
'
with
-
tests'
if
build
.
with
?
'
tests'
ohai
"Testing Tarantool with internal test suite:"
system
"/usr/bin/env"
,
"python"
,
"
#{
buildpath
}
/test/test-run.py"
,
"--builddir"
,
"
#{
buildpath
}
"
,
"--vardir"
,
"
#{
buildpath
}
/test/var"
system
"/usr/bin/env"
,
"python"
,
buildpath
/
"
test/test-run.py"
,
"--builddir"
,
buildpath
,
"--vardir"
,
buildpath
/
"
test/var"
end
end
def
test
system
"
#{
bin
}
/tarantool"
,
"--version"
system
bin
/
"
tarantool"
,
"--version"
end
end
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment