Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
otb
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
211
Issues
211
List
Boards
Labels
Milestones
Merge Requests
9
Merge Requests
9
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Container Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Main Repositories
otb
Commits
aeb44f09
Commit
aeb44f09
authored
Jul 27, 2017
by
Rashad Kanavath
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
PKG: loader regex EOL char must be global or redudant
parent
75ca48d6
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
7 additions
and
11 deletions
+7
-11
Packaging/CMakeLists.txt
Packaging/CMakeLists.txt
+1
-1
Packaging/PackageGlobals.cmake
Packaging/PackageGlobals.cmake
+1
-0
Packaging/configure_loader.cmake
Packaging/configure_loader.cmake
+3
-4
Packaging/installer_files.cmake
Packaging/installer_files.cmake
+1
-1
Packaging/process_file_recurse.cmake
Packaging/process_file_recurse.cmake
+1
-5
No files found.
Packaging/CMakeLists.txt
View file @
aeb44f09
...
...
@@ -27,8 +27,8 @@ include(CMakeDetermineSystem)
include
(
GetPrerequisites
)
include
(
CTest
)
#setting this variable prints a lot of debug information
set
(
PKG_DEBUG OFF
)
#setting this variable. prints a lot of debug information
#set( PKG_DEBUG 1)
set
(
CMAKE_BUILD_TYPE Release
)
...
...
Packaging/PackageGlobals.cmake
View file @
aeb44f09
...
...
@@ -18,6 +18,7 @@
# limitations under the License.
#
set
(
LOADER_REGEX_EOL
"E"
)
set
(
DEST_BIN_DIR bin
)
set
(
DEST_APP_DIR lib/otb/applications
)
...
...
Packaging/configure_loader.cmake
View file @
aeb44f09
function
(
configure_loader loader_pgm_result loader_args_result loader_regex_result
)
set
(
loader_PATHS
)
set
(
eol_char
"E"
)
if
(
MSVC
)
set
(
loader_PATHS
)
set
(
loader_names
"dumpbin"
)
set
(
loader_args
"/DEPENDENTS"
)
set
(
loader_regex
"^ ([^ ].*[Dd][Ll][Ll])
${
eol_char
}
$"
)
set
(
loader_regex
"^ ([^ ].*[Dd][Ll][Ll])
${
LOADER_REGEX_EOL
}
$"
)
elseif
(
APPLE
)
set
(
loader_PATHS
)
set
(
loader_names otool
)
set
(
loader_args
"-l"
)
set
(
loader_regex
".*name.*([ ].*dylib ).*
${
eol_char
}
$"
)
set
(
loader_regex
".*name.*([ ].*dylib ).*
${
LOADER_REGEX_EOL
}
$"
)
elseif
(
"
${
CMAKE_SYSTEM_NAME
}
"
MATCHES
"Linux"
)
set
(
loader_PATHS
)
set
(
loader_names objdump
)
set
(
loader_args
"-p"
)
set
(
loader_regex
"^..NEEDED.*([ ].*so.*)
${
eol_char
}
$"
)
set
(
loader_regex
"^..NEEDED.*([ ].*so.*)
${
LOADER_REGEX_EOL
}
$"
)
else
()
message
(
FATAL_ERROR
"find_loader_and_args: Unknown platform"
)
endif
()
...
...
Packaging/installer_files.cmake
View file @
aeb44f09
...
...
@@ -115,7 +115,7 @@ macro(installer_files)
#install all required files to perform uninstall
install
(
FILES
Files/uninstall_otb
.
${
SCRIPT_EXT
}
Files/uninstall_otb
${
SCRIPT_EXT
}
${
CMAKE_BINARY_DIR
}
/install_manifest_otb.txt
${
CMAKE_BINARY_DIR
}
/cmake_uninstall_otb.cmake
DESTINATION
${
PKG_STAGE_DIR
}
)
...
...
Packaging/process_file_recurse.cmake
View file @
aeb44f09
...
...
@@ -2,7 +2,6 @@ function(process_file_recurse input_file)
set
(
input_file_full_path
)
search_library
(
${
input_file
}
PKG_SEARCHDIRS input_file_full_path
)
if
(
NOT input_file_full_path
)
if
(
LINUX
)
setif_value_in_list
(
is_gtk_lib
"
${
input_file
}
"
ALLOWED_SYSTEM_DLLS
)
...
...
@@ -23,7 +22,6 @@ function(process_file_recurse input_file)
message
(
"Processing
${
input_file_full_path
}
"
)
endif
()
install_rule
(
${
input_file_full_path
}
)
set
(
raw_items
)
...
...
@@ -40,7 +38,7 @@ function(process_file_recurse input_file)
endif
()
string
(
REPLACE
";"
"
\\
;"
candidates
"
${
loader_ov
}
"
)
string
(
REPLACE
"
\n
"
"
${
eol_char
}
;"
candidates
"
${
candidates
}
"
)
string
(
REPLACE
"
\n
"
"
${
LOADER_REGEX_EOL
}
;"
candidates
"
${
candidates
}
"
)
get_filename_component
(
bn_name
${
input_file_full_path
}
NAME
)
set
(
${
bn_name
}
_USED TRUE CACHE INTERNAL
""
)
...
...
@@ -57,7 +55,6 @@ function(process_file_recurse input_file)
if
(
NOT
"
${
candidate
}
"
MATCHES
"
${
LOADER_REGEX
}
"
)
continue
()
endif
()
string
(
REGEX REPLACE
"
${
LOADER_REGEX
}
"
"
\\
1"
raw_item
"
${
candidate
}
"
)
if
(
NOT raw_item
)
...
...
@@ -67,7 +64,6 @@ function(process_file_recurse input_file)
string
(
STRIP
${
raw_item
}
raw_item
)
set
(
is_system FALSE
)
setif_value_in_list
(
is_system
"
${
raw_item
}
"
SYSTEM_DLLS
)
if
(
APPLE AND NOT is_system
)
if
(
"
${
raw_item
}
"
MATCHES
"@rpath"
)
string
(
REGEX REPLACE
"@rpath."
""
raw_item
"
${
raw_item
}
"
)
...
...
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