Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
R
rbnacl-libsodium
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
Jérome Perrin
rbnacl-libsodium
Commits
795a6987
Commit
795a6987
authored
Mar 22, 2018
by
Marc-Antoine Perennou
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
refactor sodiumlib_dir
Signed-off-by:
Marc-Antoine Perennou
<
Marc-Antoine@Perennou.com
>
parent
9288ae7b
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
5 deletions
+6
-5
lib/rbnacl/libsodium.rb
lib/rbnacl/libsodium.rb
+6
-5
No files found.
lib/rbnacl/libsodium.rb
View file @
795a6987
...
@@ -5,11 +5,12 @@ module RbNaCl
...
@@ -5,11 +5,12 @@ module RbNaCl
module
Libsodium
module
Libsodium
class
<<
self
class
<<
self
def
sodiumlib_dir
def
sodiumlib_dir
sodiumplatform32_dir
=
File
.
expand_path
(
"../../../tmp/
#{
RUBY_PLATFORM
}
/stage/vendor/libsodium/dist/lib/"
,
__FILE__
)
dist_dirs
=
[
"tmp/
#{
RUBY_PLATFORM
}
/stage/vendor/libsodium/dist"
,
"vendor/libsodium/dist"
]
sodiumplatform64_dir
=
File
.
expand_path
(
"../../../tmp/
#{
RUBY_PLATFORM
}
/stage/vendor/libsodium/dist/lib64/"
,
__FILE__
)
lib_dirs
=
%w[lib lib64]
sodiumlib32_dir
=
File
.
expand_path
(
"../../../vendor/libsodium/dist/lib/"
,
__FILE__
)
sodiumlib_dirs
=
dist_dirs
.
product
(
lib_dirs
).
map
do
|
dist_dir
,
lib_dir
|
sodiumlib64_dir
=
File
.
expand_path
(
"../../../vendor/libsodium/dist/lib64/"
,
__FILE__
)
File
.
expand_path
(
"../../../
#{
dist_dir
}
/
#{
lib_dir
}
/"
,
__FILE__
)
[
sodiumplatform32_dir
,
sodiumplatform64_dir
,
sodiumlib32_dir
,
sodiumlib64_dir
].
select
{
|
dir
|
Dir
.
exist?
(
dir
)
}.
first
end
sodiumlib_dirs
.
select
{
|
dir
|
Dir
.
exist?
(
dir
)
}.
first
end
end
def
sodiumlib_glob
def
sodiumlib_glob
...
...
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