Commit 3863556a authored by Joseph Mirabel's avatar Joseph Mirabel Committed by Joseph Mirabel
Browse files

Update Makefile and scripts/create-tags.sh

parent b5e08885
......@@ -20,10 +20,12 @@ endif
HUMANOID=TRUE
BUILD_TYPE=Release
DISABLE_TESTS=OFF
ifeq (${BUILD_TYPE},Debug)
BUILD_FOLDER=build
else
BUILD_FOLDER=build-rel
DISABLE_TESTS=ON
endif
OSG_PACKAGE=osg-dae
......@@ -37,125 +39,114 @@ GIT_QUIET=--quiet
QT_VERSION=4
INSTALL_DOCUMENTATION=ON
hpp-fcl_branch=master
hpp-fcl_repository=${HPP_REPO}
hpp-fcl_extra_flags= -DCMAKE_BUILD_TYPE=Release
##################################
# {{{ Dependencies
pinocchio_branch=v1.3.1
pinocchio_repository=${SOT_REPO}
pinocchio_extra_flags= -DBUILD_PYTHON_INTERFACE=OFF -DBUILD_UNIT_TESTS=OFF
roboptim-core_branch=master
roboptim-core_repository=${ROBOPTIM_REPO}
roboptim-core_extra_flags= -DCMAKE_BUILD_TYPE=Release -DCXX_DISABLE_WERROR=ON
hpp-template-corba_branch=master
hpp-template-corba_repository=${HPP_REPO}
roboptim-trajectory_branch=master
roboptim-trajectory_repository=${ROBOPTIM_REPO}
roboptim-trajectory_extra_flags= -DCMAKE_BUILD_TYPE=Release -DCXX_DISABLE_WERROR=ON
# }}}
##################################
# {{{ Packages supporting HPP_VERSION
hpp-util_branch=master
# Either a version tag (e.g. v4.3.0), master or devel
HPP_VERSION=v3.4.0
HPP_EXTRA_FLAGS=-DDISABLE_TESTS=${DISABLE_TESTS}
hpp-util_branch=${HPP_VERSION}
hpp-util_repository=${HPP_REPO}
pinocchio_branch=hpp
pinocchio_repository=${SOT_REPO}
pinocchio_extra_flags= -DBUILD_PYTHON_INTERFACE=OFF
hpp-fcl_branch=${HPP_VERSION}
hpp-fcl_repository=${HPP_REPO}
hpp-fcl_extra_flags= -DCMAKE_BUILD_TYPE=Release
hpp-statistics_branch=${HPP_VERSION}
hpp-statistics_repository=${HPP_REPO}
hpp-pinocchio_branch=master
hpp-pinocchio_branch=${HPP_VERSION}
hpp-pinocchio_repository=${HPP_REPO}
hpp-pinocchio_extra_flags=-DDISABLE_TESTS=ON
hpp-pinocchio_extra_flags=${HPP_EXTRA_FLAGS}
hpp-statistics_branch=master
hpp-statistics_repository=${HPP_REPO}
hpp-constraints_branch=${HPP_VERSION}
hpp-constraints_repository=${HPP_REPO}
hpp-constraints_extra_flags=${HPP_EXTRA_FLAGS}
hpp-core_branch=master
hpp-core_branch=${HPP_VERSION}
hpp-core_repository=${HPP_REPO}
hpp-core_extra_flags=-DDISABLE_TESTS=ON
hpp-core_extra_flags=${HPP_EXTRA_FLAGS}
hpp-template-corba_branch=master
hpp-template-corba_repository=${HPP_REPO}
hpp-corbaserver_branch=master
hpp-corbaserver_branch=${HPP_VERSION}
hpp-corbaserver_repository=${HPP_REPO}
qpOASES_branch=master
qpOASES_repository=${HPP_REPO}
hpp-constraints_branch=master
hpp-constraints_repository=${HPP_REPO}
hpp-constraints_extra_flags=-DDISABLE_TESTS=ON
hpp-walkgen_branch=master
hpp-walkgen_branch=${HPP_VERSION}
hpp-walkgen_repository=${HPP_REPO}
hpp-wholebody-step_branch=master
hpp-wholebody-step_branch=${HPP_VERSION}
hpp-wholebody-step_repository=${HPP_REPO}
hpp-wholebody-step-corba_branch=master
hpp-wholebody-step-corba_branch=${HPP_VERSION}
hpp-wholebody-step-corba_repository=${HPP_REPO}
test-hpp_branch=master
test-hpp_repository=${HPP_REPO}
hrp2-14-description_branch=master
hrp2-14-description_repository=${TRAC_REPO}
hpp-hrp2_branch=master
hpp-hrp2_repository=${HPP_REPO}
robot_capsule_urdf_branch=groovy
robot_capsule_urdf_repository=${LAAS_REPO}
robot_model_py_branch=groovy
robot_model_py_repository=${LAAS_REPO}
hpp-doc_branch=master
hpp-doc_repository=${HPP_REPO}
hpp-manipulation_branch=master
hpp-manipulation_branch=${HPP_VERSION}
hpp-manipulation_repository=${HPP_REPO}
hpp-manipulation-urdf_branch=master
hpp-manipulation-urdf_branch=${HPP_VERSION}
hpp-manipulation-urdf_repository=${HPP_REPO}
hpp-manipulation-corba_branch=master
hpp-manipulation-corba_branch=${HPP_VERSION}
hpp-manipulation-corba_repository=${HPP_REPO}
iai_maps_branch=master
iai_maps_repository=${HPP_REPO}
ifeq (${HUMANOID}, TRUE)
hpp-manipulation_extra_flags=-DHPP_MANIPULATION_HAS_WHOLEBODY_STEP=TRUE
hpp-manipulation-corba_extra_flags=-DHPP_MANIPULATION_HAS_WHOLEBODY_STEP=TRUE
else
hpp-manipulation_extra_flags=-DHPP_MANIPULATION_HAS_WHOLEBODY_STEP=FALSE
hpp-manipulation-corba_extra_flags=-DHPP_MANIPULATION_HAS_WHOLEBODY_STEP=FALSE
endif
hpp_tutorial_branch=master
hpp_tutorial_branch=${HPP_VERSION}
hpp_tutorial_repository=${HPP_REPO}
hpp_benchmark_branch=master
hpp_benchmark_repository=${HPP_REPO}
hpp-gepetto-viewer_branch=${HPP_VERSION}
hpp-gepetto-viewer_repository=${HPP_REPO}
collada-dom_branch=master
collada-dom_repository=${HPP_REPO}
hpp-plot_branch=${HPP_VERSION}
hpp-plot_repository=${HPP_REPO}
osg-dae_branch=master
osg-dae_repository=${GEPETTO_REPO}
hpp-gui_branch=${HPP_VERSION}
hpp-gui_repository=${HPP_REPO}
gepetto-viewer_branch=master
gepetto-viewer_repository=${GEPETTO_REPO}
# }}}
##################################
# {{{ Robot specific package + test packages
gepetto-viewer-corba_branch=master
gepetto-viewer-corba_repository=${GEPETTO_REPO}
ifeq (${QT_VERSION}, 5)
gepetto-viewer-corba_extra_flags= -DUSE_QT4=OFF
endif
test-hpp_branch=master
test-hpp_repository=${HPP_REPO}
hpp-gepetto-viewer_branch=master
hpp-gepetto-viewer_repository=${HPP_REPO}
hrp2-14-description_branch=master
hrp2-14-description_repository=${TRAC_REPO}
pythonqt_branch=qt${QT_VERSION}
pythonqt_repository=${HPP_REPO}
pythonqt_extra_flags= -DPythonQt_Wrap_QtAll=ON -DPythonQt_Extensions=ON
hpp-hrp2_branch=master
hpp-hrp2_repository=${HPP_REPO}
qgv_branch=master
qgv_repository=${HPP_REPO}
robot_capsule_urdf_branch=groovy
robot_capsule_urdf_repository=${LAAS_REPO}
hpp-plot_branch=master
hpp-plot_repository=${HPP_REPO}
robot_model_py_branch=groovy
robot_model_py_repository=${LAAS_REPO}
hpp-gui_branch=master
hpp-gui_repository=${HPP_REPO}
iai_maps_branch=master
iai_maps_repository=${HPP_REPO}
hpp_benchmark_branch=master
hpp_benchmark_repository=${HPP_REPO}
hpp-environments_branch=master
hpp-environments_repository=${HPP_REPO}
......@@ -178,19 +169,39 @@ hpp_romeo_repository=${HPP_REPO}
romeo_branch=master
romeo_repository=${HPP_REPO}
# }}}
##################################
# {{{ Packages for gepetto-gui
collada-dom_branch=master
collada-dom_repository=${HPP_REPO}
collada-dom_extra_flags=-DBUILD_SHARED_LIBS=TRUE -DOPT_COLLADA15=FALSE
osg-dae_branch=master
osg-dae_repository=${GEPETTO_REPO}
osg-dae_extra_flags= -DCOLLADA_DYNAMIC_LIBRARY=${INSTALL_HPP_DIR}/lib/libcollada14dom.so -DCOLLADA_INCLUDE_DIR=${INSTALL_HPP_DIR}/include/collada-dom
OpenSceneGraph-3.4.0_extra_flags= -DDESIRED_QT_VERSION=${QT_VERSION} -DCOLLADA_DYNAMIC_LIBRARY=${INSTALL_HPP_DIR}/lib/libcollada14dom.so -DCOLLADA_INCLUDE_DIR=${INSTALL_HPP_DIR}/include/collada-dom -DLIB_POSTFIX=""
collada-dom_extra_flags=-DBUILD_SHARED_LIBS=TRUE -DOPT_COLLADA15=FALSE
gepetto-viewer_branch=master
gepetto-viewer_repository=${GEPETTO_REPO}
ifeq (${HUMANOID}, TRUE)
hpp-manipulation_extra_flags=-DHPP_MANIPULATION_HAS_WHOLEBODY_STEP=TRUE
hpp-manipulation-corba_extra_flags=-DHPP_MANIPULATION_HAS_WHOLEBODY_STEP=TRUE
else
hpp-manipulation_extra_flags=-DHPP_MANIPULATION_HAS_WHOLEBODY_STEP=FALSE
hpp-manipulation-corba_extra_flags=-DHPP_MANIPULATION_HAS_WHOLEBODY_STEP=FALSE
gepetto-viewer-corba_branch=master
gepetto-viewer-corba_repository=${GEPETTO_REPO}
ifeq (${QT_VERSION}, 5)
gepetto-viewer-corba_extra_flags= -DUSE_QT4=OFF
endif
pythonqt_branch=qt${QT_VERSION}
pythonqt_repository=${HPP_REPO}
pythonqt_extra_flags= -DPythonQt_Wrap_QtAll=ON -DPythonQt_Extensions=ON
qgv_branch=master
qgv_repository=${HPP_REPO}
# }}}
##################################
# {{{ High-level targets
all: hpp_tutorial.install hpp-gepetto-viewer.install
${MAKE} hpp-doc.install
......@@ -210,6 +221,10 @@ benchmark: baxter_common.install romeo.install universal_robot.install \
${MAKE} hpp_benchmark.checkout; \
${MAKE} hpp-doc.install
# }}}
##################################
# {{{ Dependencies declaration
hpp-doc.configure.dep: hpp-doc.checkout
hpp-fcl.configure.dep: hpp-fcl.checkout
hpp-walkgen.configure.dep: hpp-util.install hpp-core.install \
......@@ -289,6 +304,10 @@ hpp-baxter.configure.dep: baxter_common.install hpp-baxter.checkout
hpp_romeo.configure.dep: romeo.install hpp_romeo.checkout
romeo.configure.dep: romeo.checkout
# }}}
##################################
# {{{ Targets
status:
@for child_dir in $$(ls ${SRC_DIR}); do \
test -d "$$child_dir" || continue; \
......@@ -436,3 +455,7 @@ romeo.configure: romeo.configure.dep
romeo.install: romeo.configure
${MAKE} -C ${SRC_DIR}/romeo/romeo_description/${BUILD_FOLDER} install
# }}}
# vim: foldmethod=marker foldlevel=0
......@@ -4,55 +4,56 @@ set -e
# I (Joseph Mirabel) do not think there
# is a need to create tags for these ones.
# hpp-util
# hpp-template-corba
# hpp-statistics
# hpp-environments
# Version
if [ ! $# -eq 1 ]; then
echo "usage: $0 version"
echo "$#"
exit 1
fi
version=$1
# Packages to tag
# pinocchio
pkg_main="hpp-fcl hpp-pinocchio hpp-constraints hpp-corbaserver hpp-core \
hpp_tutorial hpp-doc \
pkg_main="hpp-util hpp-statistics hpp-fcl hpp-pinocchio \
hpp-constraints hpp-corbaserver hpp-core hpp_tutorial hpp-doc \
hpp-walkgen hpp-wholebody-step hpp-wholebody-step-corba \
hpp-manipulation hpp-manipulation-corba hpp-manipulation-urdf \
hpp-gepetto-viewer hpp-gui hpp-plot"
branch="master"
remote="origin"
c_what="\e[33m"
c_good="\e[32m"
c_bad="\e[31m"
c_reset="\e[0m"
echo "Devel directory is $DEVEL_HPP_DIR"
echo -e "${c_what}Checking that everything is good.${c_reset}"
# Check that
# - remote origin is something like https://github.com/humanoid-path-planner/...
# - there is no difference between origin/devel
# - remote ${remote} is something like https://github.com/humanoid-path-planner/...
# - there is no difference between ${remote}/${branch}
# and the current working directory.
# - working directory is clean
for pkg in ${pkg_main}; do
GIT="git -C ${DEVEL_HPP_DIR}/src/${pkg}"
remote_origin=$(${GIT} remote get-url origin)
remote_origin=$(${GIT} remote get-url ${remote})
if [[ ! "$remote_origin" =~ ^.*github.com[:/]humanoid-path-planner/${pkg}.*$ ]]; then
echo -e "${pkg}: ${c_bad}Remote 'origin' is not the main repo. Should be https://github.com/humanoid-path-planner/${pkg}${c_reset}"
echo -e "${pkg}: ${c_bad}Remote '${remote}' is not the main repo. Should be https://github.com/humanoid-path-planner/${pkg}${c_reset}"
# exit 1
fi
#current_branch=$(${GIT} rev-parse --abbrev-ref HEAD)
#if [ ! "${current_branch}" == "devel" ]; then
# echo "${pkg}: Current branch is ${current_branch}. Should be devel."
#if [ ! "${current_branch}" == "${branch}" ]; then
# echo "${pkg}: Current branch is ${current_branch}. Should be ${branch}."
# exit 1
#fi
${GIT} update-index -q --refresh
CHANGED=$(${GIT} diff-index --name-only origin/devel --)
CHANGED=$(${GIT} diff-index --name-only ${remote}/${branch} --)
if [ -n "${CHANGED}" ]; then
echo -e "${pkg}: ${c_bad}Not synchronized with origin/devel${c_reset}."
echo -e "${pkg}: ${c_bad}Not synchronized with ${remote}/${branch}${c_reset}."
exit 1
fi
......@@ -64,23 +65,21 @@ for pkg in ${pkg_main}; do
echo -e "${pkg}: ${c_good}Ok${c_reset}."
done
exit 0
# Create the tags
echo "Create tags ${version}"
echo -e "${c_what}Create tags ${version}.${c_reset}"
for pkg in ${pkg_main}; do
GIT="git -C ${DEVEL_HPP_DIR}/src/${pkg}"
${GIT} tag -a -m "Version ${version}" ${version}
${GIT} tag -a -m "Release of version ${version}" ${version}
echo -e "${pkg}: ${c_good}Ok${c_reset}."
done
# Push the tags
read -p "Push the tags ? [y/N]" answer
if [[ "${answer}" =~ ^[yY]$ ]]; then
echo "Push tags ${version} to origin"
echo -e "${c_what}Push tags ${version} to ${remote}.${c_reset}"
for pkg in ${pkg_main}; do
GIT="git -C ${DEVEL_HPP_DIR}/src/${pkg}"
${GIT} push origin ${version}
${GIT} push --quiet ${remote} ${version}
echo -e "${pkg}: ${c_good}Ok${c_reset}."
done
fi
Markdown is supported
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