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
c2bf1f28
Commit
c2bf1f28
authored
9 years ago
by
Roman Tsisyk
Browse files
Options
Downloads
Patches
Plain Diff
Remove hard-coded paths from tarantoolctl
Use values generated by cmake. Needed for homebrew.
parent
c5a0528c
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
.gitignore
+1
-0
1 addition, 0 deletions
.gitignore
cmake/pod2man.cmake
+3
-0
3 additions, 0 deletions
cmake/pod2man.cmake
extra/dist/CMakeLists.txt
+6
-5
6 additions, 5 deletions
extra/dist/CMakeLists.txt
extra/dist/tarantoolctl.in
+1
-3
1 addition, 3 deletions
extra/dist/tarantoolctl.in
with
11 additions
and
8 deletions
.gitignore
+
1
−
0
View file @
c2bf1f28
...
@@ -25,6 +25,7 @@ RPM
...
@@ -25,6 +25,7 @@ RPM
tags
tags
extra/txt2c
extra/txt2c
extra/bin2c
extra/bin2c
extra/dist/tarantoolctl
extra/dist/tarantoolctl.1
extra/dist/tarantoolctl.1
extra/dist/tarantool.logrotate
extra/dist/tarantool.logrotate
extra/dist/tarantool.service
extra/dist/tarantool.service
...
...
This diff is collapsed.
Click to expand it.
cmake/pod2man.cmake
+
3
−
0
View file @
c2bf1f28
...
@@ -11,6 +11,9 @@ endif(NOT POD2MAN)
...
@@ -11,6 +11,9 @@ endif(NOT POD2MAN)
macro
(
pod2man PODFILE NAME SECTION CENTER
)
macro
(
pod2man PODFILE NAME SECTION CENTER
)
set
(
PODFILE_FULL
"
${
CMAKE_CURRENT_SOURCE_DIR
}
/
${
PODFILE
}
"
)
set
(
PODFILE_FULL
"
${
CMAKE_CURRENT_SOURCE_DIR
}
/
${
PODFILE
}
"
)
set
(
MANFILE_FULL
"
${
CMAKE_CURRENT_BINARY_DIR
}
/
${
NAME
}
.
${
SECTION
}
"
)
set
(
MANFILE_FULL
"
${
CMAKE_CURRENT_BINARY_DIR
}
/
${
NAME
}
.
${
SECTION
}
"
)
if
(
NOT EXISTS
${
PODFILE_FULL
}
)
set
(
PODFILE_FULL
"
${
CMAKE_CURRENT_BINARY_DIR
}
/
${
PODFILE
}
"
)
endif
(
NOT EXISTS
${
PODFILE_FULL
}
)
if
(
NOT EXISTS
${
PODFILE_FULL
}
)
if
(
NOT EXISTS
${
PODFILE_FULL
}
)
message
(
FATAL ERROR
"Could not find pod file
${
PODFILE_FULL
}
to generate man page"
)
message
(
FATAL ERROR
"Could not find pod file
${
PODFILE_FULL
}
to generate man page"
)
endif
(
NOT EXISTS
${
PODFILE_FULL
}
)
endif
(
NOT EXISTS
${
PODFILE_FULL
}
)
...
...
This diff is collapsed.
Click to expand it.
extra/dist/CMakeLists.txt
+
6
−
5
View file @
c2bf1f28
...
@@ -32,7 +32,8 @@ else()
...
@@ -32,7 +32,8 @@ else()
set
(
SYSCONFIG_DEFAULT
"sysconfig"
)
set
(
SYSCONFIG_DEFAULT
"sysconfig"
)
endif
()
endif
()
configure_file
(
default/tarantool.in default/tarantool @ONLY
)
configure_file
(
default/tarantool.in default/tarantool @ONLY
)
install
(
FILES
${
PROJECT_BINARY_DIR
}
/extra/dist/default/tarantool DESTINATION
configure_file
(
tarantoolctl.in tarantoolctl @ONLY
)
install
(
FILES
${
CMAKE_CURRENT_BINARY_DIR
}
/default/tarantool DESTINATION
${
CMAKE_INSTALL_SYSCONFDIR
}
/
${
SYSCONFIG_DEFAULT
}
/
${
CMAKE_INSTALL_SYSCONFDIR
}
/
${
SYSCONFIG_DEFAULT
}
/
PERMISSIONS
PERMISSIONS
OWNER_READ OWNER_WRITE
OWNER_READ OWNER_WRITE
...
@@ -40,7 +41,7 @@ install (FILES ${PROJECT_BINARY_DIR}/extra/dist/default/tarantool DESTINATION
...
@@ -40,7 +41,7 @@ install (FILES ${PROJECT_BINARY_DIR}/extra/dist/default/tarantool DESTINATION
WORLD_READ
)
WORLD_READ
)
# tarantoolctl itself
# tarantoolctl itself
install
(
FILES tarantoolctl DESTINATION
${
CMAKE_INSTALL_BINDIR
}
install
(
FILES
${
CMAKE_CURRENT_BINARY_DIR
}
/
tarantoolctl DESTINATION
${
CMAKE_INSTALL_BINDIR
}
PERMISSIONS
PERMISSIONS
OWNER_READ OWNER_WRITE OWNER_EXECUTE
OWNER_READ OWNER_WRITE OWNER_EXECUTE
GROUP_READ GROUP_EXECUTE
GROUP_READ GROUP_EXECUTE
...
@@ -74,7 +75,7 @@ install(DIRECTORY DESTINATION ${TARANTOOL_RUNDIR})
...
@@ -74,7 +75,7 @@ install(DIRECTORY DESTINATION ${TARANTOOL_RUNDIR})
if
(
NOT TARGET_OS_FREEBSD
)
if
(
NOT TARGET_OS_FREEBSD
)
# logrotate files
# logrotate files
configure_file
(
tarantool.logrotate.in tarantool.logrotate @ONLY
)
configure_file
(
tarantool.logrotate.in tarantool.logrotate @ONLY
)
install
(
FILES
${
PROJEC
T_BINARY_DIR
}
/
extra/dist/
tarantool.logrotate
install
(
FILES
${
CMAKE_CURREN
T_BINARY_DIR
}
/tarantool.logrotate
DESTINATION
${
CMAKE_INSTALL_SYSCONFDIR
}
/logrotate.d/
DESTINATION
${
CMAKE_INSTALL_SYSCONFDIR
}
/logrotate.d/
RENAME
"tarantool"
RENAME
"tarantool"
PERMISSIONS
PERMISSIONS
...
@@ -101,14 +102,14 @@ if (WITH_SYSTEMD)
...
@@ -101,14 +102,14 @@ if (WITH_SYSTEMD)
set
(
SYSV_INITD_DIR
${
CMAKE_INSTALL_PREFIX
}
/lib/tarantool
)
set
(
SYSV_INITD_DIR
${
CMAKE_INSTALL_PREFIX
}
/lib/tarantool
)
configure_file
(
"tarantool@.service.in"
"tarantool@.service"
@ONLY
)
configure_file
(
"tarantool@.service.in"
"tarantool@.service"
@ONLY
)
install
(
FILES
${
PROJEC
T_BINARY_DIR
}
/
extra/dist/
tarantool@.service
install
(
FILES
${
CMAKE_CURREN
T_BINARY_DIR
}
/tarantool@.service
DESTINATION
${
SYSTEMD_UNIT_DIR
}
DESTINATION
${
SYSTEMD_UNIT_DIR
}
PERMISSIONS
PERMISSIONS
OWNER_READ OWNER_WRITE
OWNER_READ OWNER_WRITE
GROUP_READ GROUP_READ
GROUP_READ GROUP_READ
WORLD_READ WORLD_READ
)
WORLD_READ WORLD_READ
)
configure_file
(
tarantool.tmpfiles.conf.in tarantool.tmpfiles.conf @ONLY
)
configure_file
(
tarantool.tmpfiles.conf.in tarantool.tmpfiles.conf @ONLY
)
install
(
FILES
"
${
PROJEC
T_BINARY_DIR
}
/
extra/dist/
tarantool.tmpfiles.conf"
install
(
FILES
"
${
CMAKE_CURREN
T_BINARY_DIR
}
/tarantool.tmpfiles.conf"
DESTINATION
"
${
SYSTEMD_TMPFILES_DIR
}
"
DESTINATION
"
${
SYSTEMD_TMPFILES_DIR
}
"
RENAME
"tarantool.conf"
RENAME
"tarantool.conf"
PERMISSIONS
PERMISSIONS
...
...
This diff is collapsed.
Click to expand it.
extra/dist/tarantoolctl
→
extra/dist/tarantoolctl
.in
+
1
−
3
View file @
c2bf1f28
...
@@ -238,9 +238,7 @@ local function find_default_file()
...
@@ -238,9 +238,7 @@ local function find_default_file()
--
--
usermode
=
false
usermode
=
false
local
config_list
=
{
local
config_list
=
{
'/etc/sysconfig/tarantool'
,
'@CMAKE_INSTALL_FULL_SYSCONFDIR@/@SYSCONFIG_DEFAULT@/tarantool'
'/etc/default/tarantool'
,
'/usr/local/etc/tarantool/default/tarantool'
,
}
}
for
_
,
c
in
pairs
(
config_list
)
do
for
_
,
c
in
pairs
(
config_list
)
do
if
fio
.
stat
(
c
)
then
if
fio
.
stat
(
c
)
then
...
...
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