Commit bf475ceb authored by Joseph Mirabel's avatar Joseph Mirabel Committed by Joseph Mirabel
Browse files

Merge remote-tracking branch 'origin/devel' into ubuntu-14.04

parents 19b42260 564648cf
docker login eur0c.laas.fr:4567 docker login eur0c.laas.fr:4567
docker build -t eur0c.laas.fr:4567/humanoid-path-planner/hpp-doc/ubuntu:16.04 -f .dockers/ubuntu-14.04/Dockerfile . docker build -t eur0c.laas.fr:4567/humanoid-path-planner/hpp-doc/ubuntu:14.04 -f .dockers/ubuntu-14.04/Dockerfile .
docker build -t eur0c.laas.fr:4567/humanoid-path-planner/hpp-doc/ubuntu-14.04-premade:16.04 -f .dockers/ubuntu-14.04/Dockerfile.premade . docker build -t eur0c.laas.fr:4567/humanoid-path-planner/hpp-doc/ubuntu-14.04-premade:14.04 -f .dockers/ubuntu-14.04/Dockerfile.premade .
docker push eur0c.laas.fr:4567/humanoid-path-planner/hpp-doc/ubuntu-14.04-premade:16.04 docker push eur0c.laas.fr:4567/humanoid-path-planner/hpp-doc/ubuntu-14.04-premade:14.04
...@@ -7,8 +7,9 @@ variables: ...@@ -7,8 +7,9 @@ variables:
.build_template: &build_definition .build_template: &build_definition
stage: build stage: build
script: script:
- export INSTALL_DOCUMENTATION=OFF
- cp -r /clean_workspace $DEVEL_DIR - cp -r /clean_workspace $DEVEL_DIR
- /auto-install-hpp.sh --branch devel - /auto-install-hpp.sh --branch ${CI_COMMIT_REF_NAME}
artifacts: artifacts:
paths: paths:
- workspace - workspace
...@@ -16,19 +17,20 @@ variables: ...@@ -16,19 +17,20 @@ variables:
.test_template: &test_definition .test_template: &test_definition
stage: test stage: test
script: script:
- source $DEVEL_DIR/config.sh
- cd $DEVEL_DIR/src/hpp-util/build-rel && make test - cd $DEVEL_DIR/src/hpp-util/build-rel && make test
- cd $DEVEL_DIR/src/hpp-fcl/build-rel && make test - cd $DEVEL_DIR/src/hpp-fcl/build-rel && make test
- cd $DEVEL_DIR/src/hpp-pinocchio/build-rel && make test - cd $DEVEL_DIR/src/hpp-pinocchio/build-rel && make test
- cd $DEVEL_DIR/src/hpp-statistics/build-rel && make test - cd $DEVEL_DIR/src/hpp-statistics/build-rel && make test
- cd $DEVEL_DIR/src/hpp-constraints/build-rel && make test - cd $DEVEL_DIR/src/hpp-constraints/build-rel && make test
- cd $DEVEL_DIR/src/hpp-core/build-rel && make test - cd $DEVEL_DIR/src/hpp-core/build-rel && make test
- cd $DEVEL_DIR/src/hpp-corbaserver/build-rel && make test #- cd $DEVEL_DIR/src/hpp-corbaserver/build-rel && make test
- cd $DEVEL_DIR/src/hpp-manipulation/build-rel && make test - cd $DEVEL_DIR/src/hpp-manipulation/build-rel && make test
- cd $DEVEL_DIR/src/hpp-manipulation-urdf/build-rel && make test - cd $DEVEL_DIR/src/hpp-manipulation-urdf/build-rel && make test
- cd $DEVEL_DIR/src/hpp-manipulation-corba/build-rel && make test #- cd $DEVEL_DIR/src/hpp-manipulation-corba/build-rel && make test
- cd $DEVEL_DIR/src/hpp-walkgen/build-rel && make test - cd $DEVEL_DIR/src/hpp-walkgen/build-rel && make test
- cd $DEVEL_DIR/src/hpp-wholebody-step/build-rel && make test - cd $DEVEL_DIR/src/hpp-wholebody-step/build-rel && make test
- cd $DEVEL_DIR/src/hpp-wholebody-step-corba/build-rel && make test #- cd $DEVEL_DIR/src/hpp-wholebody-step-corba/build-rel && make test
allow_failure: true allow_failure: true
artifacts: artifacts:
paths: paths:
......
...@@ -32,6 +32,7 @@ TAR=tar ...@@ -32,6 +32,7 @@ TAR=tar
GIT_QUIET=--quiet GIT_QUIET=--quiet
# Qt version should be either 4 or 5 # Qt version should be either 4 or 5
QT_VERSION=4 QT_VERSION=4
INSTALL_DOCUMENTATION=ON
hpp-fcl_branch=master hpp-fcl_branch=master
hpp-fcl_repository=${HPP_REPO} hpp-fcl_repository=${HPP_REPO}
...@@ -329,7 +330,10 @@ update: ...@@ -329,7 +330,10 @@ update:
%.configure_nodep:%.checkout %.configure_nodep:%.checkout
mkdir -p ${SRC_DIR}/$(@:.configure_nodep=)/${BUILD_FOLDER}; \ mkdir -p ${SRC_DIR}/$(@:.configure_nodep=)/${BUILD_FOLDER}; \
cd ${SRC_DIR}/$(@:.configure_nodep=)/${BUILD_FOLDER}; \ cd ${SRC_DIR}/$(@:.configure_nodep=)/${BUILD_FOLDER}; \
cmake -DCMAKE_INSTALL_PREFIX=${INSTALL_DIR} -DCMAKE_INSTALL_LIBDIR=lib -DCMAKE_BUILD_TYPE=${BUILD_TYPE} \ -DCMAKE_CXX_FLAGS_RELWITHDEBINFO="-g -O3 -DNDEBUG" ${$(@:.configure_nodep=)_extra_flags} .. cmake -DCMAKE_INSTALL_PREFIX=${INSTALL_DIR} -DCMAKE_INSTALL_LIBDIR=lib -DCMAKE_BUILD_TYPE=${BUILD_TYPE} \
-DINSTALL_DOCUMENTATION=${INSTALL_DOCUMENTATION} \
-DCMAKE_CXX_FLAGS_RELWITHDEBINFO="-g -O3 -DNDEBUG" \
${$(@:.configure_nodep=)_extra_flags} ..
%.install:%.configure %.install:%.configure
${MAKE} -C ${SRC_DIR}/$(@:.install=)/${BUILD_FOLDER} install ${MAKE} -C ${SRC_DIR}/$(@:.install=)/${BUILD_FOLDER} install
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment