Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
O
openstructure
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Container registry
Model registry
Analyze
Contributor 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
schwede
openstructure
Commits
8ae51dcc
Commit
8ae51dcc
authored
12 years ago
by
Valerio Mariani
Browse files
Options
Downloads
Patches
Plain Diff
Using relative rpath when creating bundles
Fixes BZDNG-385
parent
6f5b1baa
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
CMakeLists.txt
+1
-1
1 addition, 1 deletion
CMakeLists.txt
deployment/linux/create_bundle_lucid.py
+4
-1
4 additions, 1 deletion
deployment/linux/create_bundle_lucid.py
deployment/linux/create_bundle_precise.py
+4
-1
4 additions, 1 deletion
deployment/linux/create_bundle_precise.py
with
9 additions
and
3 deletions
CMakeLists.txt
+
1
−
1
View file @
8ae51dcc
...
...
@@ -256,7 +256,7 @@ if (UNIX)
SET
(
CMAKE_BUILD_WITH_INSTALL_RPATH FALSE
)
if
(
USE_RPATH
)
set
(
_USE_RPATH ON
)
SET
(
CMAKE_INSTALL_RPATH
"
$
{
CMAKE_INSTALL_PREFIX
}
/
${
LIB_DIR
}
"
)
SET
(
CMAKE_INSTALL_RPATH
"$
ORIGIN/..
/
${
LIB_DIR
}
"
)
SET
(
CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE
)
else
()
set
(
_USE_RPATH OFF
)
...
...
This diff is collapsed.
Click to expand it.
deployment/linux/create_bundle_lucid.py
+
4
−
1
View file @
8ae51dcc
...
...
@@ -73,7 +73,7 @@ subprocess.call('sed "s/\#export PYTHONHOME/ export PYTHONHOME/g" scripts/ost_co
subprocess
.
call
(
'
sed
"
s/\#export PYTHONPATH/ export PYTHONPATH/g
"
scripts/ost_config.in.prepre > scripts/ost_config.in.pre
'
,
shell
=
True
,
cwd
=
'
../../
'
)
subprocess
.
call
(
'
sed
"
s/\#export QT_PLUGIN_PATH/ export QT_PLUGIN_PATH/g
"
scripts/ost_config.in.pre > scripts/ost_config.in
'
,
shell
=
True
,
cwd
=
'
../../
'
)
print
'
Compiling Openstructure
'
subprocess
.
call
(
'
cmake ./ -DCMAKE_BUILD_TYPE=Release -DPREFIX=
'
+
directory_name
+
'
-DCOMPOUND_LIB=
'
+
chemlib_dictionary_location
+
'
-DENABLE_IMG=ON -DENABLE_GUI=ON -DENABLE_GFX=ON -DOPTIMIZE=ON
'
,
shell
=
True
,
cwd
=
'
../../
'
)
subprocess
.
call
(
'
cmake ./ -DCMAKE_BUILD_TYPE=Release -DPREFIX=
'
+
directory_name
+
'
-DCOMPOUND_LIB=
'
+
chemlib_dictionary_location
+
'
-DENABLE_IMG=ON
-DUSE_RPATH=ON
-DENABLE_GUI=ON -DENABLE_GFX=ON -DOPTIMIZE=ON
'
,
shell
=
True
,
cwd
=
'
../../
'
)
subprocess
.
call
(
'
make -j2
'
,
shell
=
True
,
cwd
=
'
../../
'
)
print
'
Removing obsolete packages and package directory
'
subprocess
.
call
(
'
rm -fr openstructure-linux*
'
,
shell
=
True
,
cwd
=
'
../../
'
)
...
...
@@ -87,6 +87,8 @@ subprocess.call('cp -pRL '+system_python_libs+' stage/'+libdir+'/',shell=True,cw
subprocess
.
call
(
'
rm -fr stage/
'
+
libdir
+
'
/
'
+
system_python_executable
+
'
/dist-packages
'
,
shell
=
True
,
cwd
=
'
../../
'
)
subprocess
.
call
(
'
cp -pRL
'
+
sip_module_location
+
'
/sip* stage/
'
+
libdir
+
'
/
'
+
system_python_executable
+
'
/
'
,
shell
=
True
,
cwd
=
'
../../
'
)
subprocess
.
call
(
'
cp -pRL
'
+
qt4_module_location
+
'
stage/
'
+
libdir
+
'
/
'
+
system_python_executable
+
'
/
'
,
shell
=
True
,
cwd
=
'
../../
'
)
print
'
Copy boost program option libraries into the stage for dependency detection
'
subprocess
.
call
(
'
cp -pRL /usr/lib/libboost_program_options.so* stage/
'
+
libdir
+
'
/
'
,
shell
=
True
,
cwd
=
'
../../
'
)
print
'
Creating new dependency list
'
so_list
=
[]
walk_list
=
os
.
walk
(
'
../../stage
'
)
...
...
@@ -138,6 +140,7 @@ subprocess.call('ln -sf bin/lddt ./lddt',shell=True,cwd='../../'+directory_name)
print
'
Copying additional libraries in the package directory structure
'
subprocess
.
call
(
'
cp
'
+
ssl_crypto_location
+
'
/libssl.so*
'
+
directory_name
+
'
/
'
+
libdir
,
shell
=
True
,
cwd
=
'
../../
'
)
subprocess
.
call
(
'
cp
'
+
ssl_crypto_location
+
'
/libcrypto.so*
'
+
directory_name
+
'
/
'
+
libdir
,
shell
=
True
,
cwd
=
'
../../
'
)
subprocess
.
call
(
'
cp -pRL /usr/lib/libboost_program_options.so*
'
+
directory_name
+
'
/
'
+
libdir
+
'
/
'
,
shell
=
True
,
cwd
=
'
../../
'
)
print
'
Copying python headers in the package directory structure
'
subprocess
.
call
(
'
mkdir -p
'
+
directory_name
+
'
/local/include/
'
,
shell
=
True
,
cwd
=
'
../../
'
)
subprocess
.
call
(
'
cp -r /usr/include/
'
+
system_python_executable
+
'
'
+
directory_name
+
'
/local/include/
'
,
shell
=
True
,
cwd
=
'
../../
'
)
...
...
This diff is collapsed.
Click to expand it.
deployment/linux/create_bundle_precise.py
+
4
−
1
View file @
8ae51dcc
...
...
@@ -73,7 +73,7 @@ subprocess.call('sed "s/\#export PYTHONHOME/ export PYTHONHOME/g" scripts/ost_co
subprocess
.
call
(
'
sed
"
s/\#export PYTHONPATH/ export PYTHONPATH/g
"
scripts/ost_config.in.prepre > scripts/ost_config.in.pre
'
,
shell
=
True
,
cwd
=
'
../../
'
)
subprocess
.
call
(
'
sed
"
s/\#export QT_PLUGIN_PATH/ export QT_PLUGIN_PATH/g
"
scripts/ost_config.in.pre > scripts/ost_config.in
'
,
shell
=
True
,
cwd
=
'
../../
'
)
print
'
Compiling Openstructure
'
subprocess
.
call
(
'
cmake ./ -DCMAKE_BUILD_TYPE=Release -DPREFIX=
'
+
directory_name
+
'
-DCOMPOUND_LIB=
'
+
chemlib_dictionary_location
+
'
-DENABLE_IMG=ON -DENABLE_GUI=ON -DENABLE_GFX=ON -DOPTIMIZE=ON
'
,
shell
=
True
,
cwd
=
'
../../
'
)
subprocess
.
call
(
'
cmake ./ -DCMAKE_BUILD_TYPE=Release -DPREFIX=
'
+
directory_name
+
'
-DCOMPOUND_LIB=
'
+
chemlib_dictionary_location
+
'
-DUSE_RPATH=ON
-DENABLE_IMG=ON -DENABLE_GUI=ON -DENABLE_GFX=ON -DOPTIMIZE=ON
'
,
shell
=
True
,
cwd
=
'
../../
'
)
subprocess
.
call
(
'
make -j2
'
,
shell
=
True
,
cwd
=
'
../../
'
)
print
'
Removing obsolete packages and package directory
'
subprocess
.
call
(
'
rm -fr openstructure-linux*
'
,
shell
=
True
,
cwd
=
'
../../
'
)
...
...
@@ -87,6 +87,8 @@ subprocess.call('cp -pRL '+system_python_libs+' stage/'+libdir+'/',shell=True,cw
subprocess
.
call
(
'
rm -fr stage/
'
+
libdir
+
'
/
'
+
system_python_executable
+
'
/dist-packages
'
,
shell
=
True
,
cwd
=
'
../../
'
)
subprocess
.
call
(
'
cp -pRL
'
+
sip_module_location
+
'
/sip* stage/
'
+
libdir
+
'
/
'
+
system_python_executable
+
'
/
'
,
shell
=
True
,
cwd
=
'
../../
'
)
subprocess
.
call
(
'
cp -pRL
'
+
qt4_module_location
+
'
stage/
'
+
libdir
+
'
/
'
+
system_python_executable
+
'
/
'
,
shell
=
True
,
cwd
=
'
../../
'
)
print
'
Copy boost program option libraries into the stage for dependency detection
'
subprocess
.
call
(
'
cp -pRL /usr/lib/libboost_program_options.so* stage/
'
+
libdir
+
'
/
'
,
shell
=
True
,
cwd
=
'
../../
'
)
print
'
Creating new dependency list
'
so_list
=
[]
walk_list
=
os
.
walk
(
'
../../stage
'
)
...
...
@@ -138,6 +140,7 @@ subprocess.call('ln -sf bin/lddt ./lddt',shell=True,cwd='../../'+directory_name)
print
'
Copying additional libraries in the package directory structure
'
subprocess
.
call
(
'
cp
'
+
ssl_crypto_location
+
'
/libssl.so*
'
+
directory_name
+
'
/
'
+
libdir
,
shell
=
True
,
cwd
=
'
../../
'
)
subprocess
.
call
(
'
cp
'
+
ssl_crypto_location
+
'
/libcrypto.so*
'
+
directory_name
+
'
/
'
+
libdir
,
shell
=
True
,
cwd
=
'
../../
'
)
subprocess
.
call
(
'
cp -pRL /usr/lib/libboost_program_options.so*
'
+
directory_name
+
'
/
'
+
libdir
+
'
/
'
,
shell
=
True
,
cwd
=
'
../../
'
)
print
'
Copying python headers in the package directory structure
'
subprocess
.
call
(
'
mkdir -p
'
+
directory_name
+
'
/local/include/
'
,
shell
=
True
,
cwd
=
'
../../
'
)
subprocess
.
call
(
'
cp -r /usr/include/
'
+
system_python_executable
+
'
'
+
directory_name
+
'
/local/include/
'
,
shell
=
True
,
cwd
=
'
../../
'
)
...
...
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