Skip to content
Snippets Groups Projects
Commit 3fd57ef3 authored by 'mergerobot ext:(%27)'s avatar 'mergerobot ext:(%27)
Browse files

merge 'edf/intg'

parents ca6bc8ed 4e0e42e5
No related branches found
No related tags found
No related merge requests found
...@@ -95,7 +95,7 @@ update_install \ ...@@ -95,7 +95,7 @@ update_install \
--branch=${BR} --rev=${REV} \ --branch=${BR} --rev=${REV} \
--data=${REV} --validation=${REV} \ --data=${REV} --validation=${REV} \
--env=${HOME}/dev/codeaster/devtools/etc/env_${REV}.sh \ --env=${HOME}/dev/codeaster/devtools/etc/env_${REV}.sh \
--command=configure --command=install --command=install_debug \ --command=configure --command=install \
${wafoptions} \ ${wafoptions} \
--options=--use-config=${CONF} --options=--prefix=${DIR} \ --options=--use-config=${CONF} --options=--prefix=${DIR} \
--options=--install-tests \ --options=--install-tests \
...@@ -111,7 +111,7 @@ if [ -f ${HOME}/dev/codeaster-${BR}/src/waf_mpi ]; then ...@@ -111,7 +111,7 @@ if [ -f ${HOME}/dev/codeaster-${BR}/src/waf_mpi ]; then
--data=${REV} --validation=${REV} \ --data=${REV} --validation=${REV} \
--env=${HOME}/dev/codeaster/devtools/etc/env_${REV}_mpi.sh \ --env=${HOME}/dev/codeaster/devtools/etc/env_${REV}_mpi.sh \
--waf=waf_mpi --builddir=build/mpi \ --waf=waf_mpi --builddir=build/mpi \
--command=configure --command=install --command=install_debug \ --command=configure --command=install \
${wafoptions} \ ${wafoptions} \
--options=--use-config=${CONF} --options=--prefix=${DIR} \ --options=--use-config=${CONF} --options=--prefix=${DIR} \
--options=--install-tests \ --options=--install-tests \
......
...@@ -70,7 +70,7 @@ update_install \ ...@@ -70,7 +70,7 @@ update_install \
--env=${HOME}/dev/codeaster/devtools/etc/env_${NAME}${SUFFIX}.sh \ --env=${HOME}/dev/codeaster/devtools/etc/env_${NAME}${SUFFIX}.sh \
--waf=waf_${VARIANT} --builddir=${BUILD} \ --waf=waf_${VARIANT} --builddir=${BUILD} \
--command=distclean \ --command=distclean \
--command=configure --command=install --command=install_debug \ --command=configure --command=install \
${wafoptions} \ ${wafoptions} \
--options=--use-config=${CONF} --options=--prefix=${DIR} \ --options=--use-config=${CONF} --options=--prefix=${DIR} \
--options=--install-tests \ --options=--install-tests \
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment