Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
mantid
Manage
Activity
Members
Labels
Plan
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Code review 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
mantidproject
mantid
Commits
1fce8cdc
Commit
1fce8cdc
authored
10 years ago
by
Peterson, Peter
Browse files
Options
Downloads
Patches
Plain Diff
Re #11383. Filled in python launch script.
parent
f179adc7
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
Code/Mantid/Build/CMake/LinuxPackageScripts.cmake
+14
-0
14 additions, 0 deletions
Code/Mantid/Build/CMake/LinuxPackageScripts.cmake
Code/Mantid/Build/CMake/Packaging/mantidpython.in
+11
-1
11 additions, 1 deletion
Code/Mantid/Build/CMake/Packaging/mantidpython.in
with
25 additions
and
1 deletion
Code/Mantid/Build/CMake/LinuxPackageScripts.cmake
+
14
−
0
View file @
1fce8cdc
...
@@ -136,6 +136,12 @@ configure_file ( ${CMAKE_MODULE_PATH}/Packaging/launch_mantidplot.sh.in
...
@@ -136,6 +136,12 @@ configure_file ( ${CMAKE_MODULE_PATH}/Packaging/launch_mantidplot.sh.in
# Needs to be executable
# Needs to be executable
execute_process
(
COMMAND
"chmod"
"+x"
"
${
CMAKE_RUNTIME_OUTPUT_DIRECTORY
}
/launch_mantidplot.sh"
execute_process
(
COMMAND
"chmod"
"+x"
"
${
CMAKE_RUNTIME_OUTPUT_DIRECTORY
}
/launch_mantidplot.sh"
OUTPUT_QUIET ERROR_QUIET
)
OUTPUT_QUIET ERROR_QUIET
)
configure_file
(
${
CMAKE_MODULE_PATH
}
/Packaging/mantidpython.in
${
CMAKE_RUNTIME_OUTPUT_DIRECTORY
}
/mantidpython @ONLY
)
# Needs to be executable
execute_process
(
COMMAND
"chmod"
"+x"
"
${
CMAKE_RUNTIME_OUTPUT_DIRECTORY
}
/mantidpython"
OUTPUT_QUIET ERROR_QUIET
)
# Package version
# Package version
set
(
MANTIDPLOT_EXEC MantidPlot_exe
)
set
(
MANTIDPLOT_EXEC MantidPlot_exe
)
configure_file
(
${
CMAKE_MODULE_PATH
}
/Packaging/launch_mantidplot.sh.in
configure_file
(
${
CMAKE_MODULE_PATH
}
/Packaging/launch_mantidplot.sh.in
...
@@ -146,3 +152,11 @@ install ( FILES ${CMAKE_CURRENT_BINARY_DIR}/launch_mantidplot.sh.install
...
@@ -146,3 +152,11 @@ install ( FILES ${CMAKE_CURRENT_BINARY_DIR}/launch_mantidplot.sh.install
GROUP_EXECUTE GROUP_READ
GROUP_EXECUTE GROUP_READ
WORLD_EXECUTE WORLD_READ
WORLD_EXECUTE WORLD_READ
)
)
configure_file
(
${
CMAKE_MODULE_PATH
}
/Packaging/mantidpython.in
${
CMAKE_CURRENT_BINARY_DIR
}
/mantidpython.install @ONLY
)
install
(
FILES
${
CMAKE_CURRENT_BINARY_DIR
}
/mantidpython.install
DESTINATION
${
BIN_DIR
}
RENAME mantidpython
PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ
GROUP_EXECUTE GROUP_READ
WORLD_EXECUTE WORLD_READ
)
\ No newline at end of file
This diff is collapsed.
Click to expand it.
Code/Mantid/Build/CMake/Packaging/mantidpython.in
+
11
−
1
View file @
1fce8cdc
...
@@ -7,6 +7,7 @@
...
@@ -7,6 +7,7 @@
# Find out where we are
# Find out where we are
SCRIPTFILE
=
$(
readlink
-f
"
$0
"
)
SCRIPTFILE
=
$(
readlink
-f
"
$0
"
)
INSTALLDIR
=
$(
echo
$SCRIPTFILE
|
sed
-r
-e
's|^(.*)/(.*)$|\1|g'
)
#.* is greedy and eats up until the final slash
INSTALLDIR
=
$(
echo
$SCRIPTFILE
|
sed
-r
-e
's|^(.*)/(.*)$|\1|g'
)
#.* is greedy and eats up until the final slash
IPYTHON
=
$(
command
-v
ipython
)
# Define extra libraries and load paths
# Define extra libraries and load paths
LOCAL_PRELOAD
=
`
readlink
--no-newline
--canonicalize-existing
@TCMALLOC_LIBRARIES@
`
LOCAL_PRELOAD
=
`
readlink
--no-newline
--canonicalize-existing
@TCMALLOC_LIBRARIES@
`
...
@@ -20,5 +21,14 @@ else
...
@@ -20,5 +21,14 @@ else
TCM_RELEASE
=
${
TCMALLOC_RELEASE_RATE
}
TCM_RELEASE
=
${
TCMALLOC_RELEASE_RATE
}
fi
fi
# Define extra libraries for python
LOCAL_PYTHONPATH
=
@WRAPPER_PREFIX@
$INSTALLDIR
if
[
-n
"
${
PYTHONPATH
}
"
]
;
then
LOCAL_PYTHONPATH
=
${
LOCAL_PYTHONPATH
}
:
${
PYTHONPATH
}
fi
# Launch
# Launch
LD_PRELOAD
=
${
LOCAL_PRELOAD
}
TCMALLOC_RELEASE_RATE
=
${
TCM_RELEASE
}
LD_LIBRARY_PATH
=
${
LOCAL_LDPATH
}
QT_API
=
pyqt @WRAPPER_PREFIX@
$INSTALLDIR
/@MANTIDPLOT_EXEC@
$*
@WRAPPER_POSTFIX@
LD_PRELOAD
=
${
LOCAL_PRELOAD
}
TCMALLOC_RELEASE_RATE
=
${
TCM_RELEASE
}
\
LD_LIBRARY_PATH
=
${
LOCAL_LDPATH
}
QT_API
=
pyqt
\
PYTHONPATH
=
${
LOCAL_PYTHONPATH
}
\
${
IPYTHON
}
$*
@WRAPPER_POSTFIX@
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