Salome HOME
projects
/
modules
/
shaper.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix for creation in GUI and unit-test for the issue #2681
[modules/shaper.git]
/
solver.sh
diff --git
a/solver.sh
b/solver.sh
index c4a2426ac76936bd66a1ad75e29f8c8c5adf5d80..98482e8ddd1f76377475c38835374989a21e9a2f 100755
(executable)
--- a/
solver.sh
+++ b/
solver.sh
@@
-2,8
+2,7
@@
#
# Modify plugins.xml to switch solver
#
# Modify plugins.xml to switch solver
-export solver=${solver:-SolveSpace}
-export PLUGINS_PATH=${PLUGINS_PATH:-${NEWGEOM_ROOT_DIR}/plugins/plugins.xml}
+export PLUGINS_PATH=${PLUGINS_PATH:-${SHAPER_ROOT_DIR}/share/salome/resources/shaper/plugins.xml}
while [[ $# > 0 ]]; do
key="$1"
while [[ $# > 0 ]]; do
key="$1"
@@
-27,6
+26,8
@@
while [[ $# > 0 ]]; do
esac
done
esac
done
+if [[ -z ${solver:-} ]]; then exit 0; fi
+
case $solver in
PlaneGCS)
export SWITCH_ON=PlaneGCSSolver
case $solver in
PlaneGCS)
export SWITCH_ON=PlaneGCSSolver
@@
-41,8
+42,9
@@
esac
echo "Switch $solver solver in ${PLUGINS_PATH}"
cat ${PLUGINS_PATH} \
echo "Switch $solver solver in ${PLUGINS_PATH}"
cat ${PLUGINS_PATH} \
- | sed -e "s/^\(<!--\)\?\(.*${SWITCH_ON}.*\/>\)\( -->\)\?/\2/" \
- | sed -e "s/^\(<!--\)\?\(.*${SWITCH_OFF}.*\/>\)\( -->\)\?/<!--\2 -->/" \
+ | tr '\n' '\r' \
+ | sed -e "s|\r <plugin library=\"[^\r]*Solver\"\/>\r<!--|\r <plugin library=\"${solver}Solver\"\/>\r<!--|" \
+ | tr '\r' '\n' \
> ${PLUGINS_PATH}_out
mv -f ${PLUGINS_PATH}_out ${PLUGINS_PATH}
cat ${PLUGINS_PATH}
> ${PLUGINS_PATH}_out
mv -f ${PLUGINS_PATH}_out ${PLUGINS_PATH}
cat ${PLUGINS_PATH}