Commit 03cd7398 authored by Arnaud Blanchard's avatar Arnaud Blanchard
Browse files

Merge branch 'master' of framagit.org:blaar/blaar

parents 815f098b 81d7ca96
![etis](logo_etis.png)
![logo](logo_blaar.png)
Basic Libraries and Applications for Robotics
=============================================
......
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="64.046234mm"
height="28.956619mm"
viewBox="0 0 226.93547 102.60219"
id="svg2"
version="1.1"
inkscape:version="0.91 r13725"
sodipodi:docname="blaar_logo.svg">
<defs
id="defs4" />
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="0.98994949"
inkscape:cx="117.19703"
inkscape:cy="-127.9662"
inkscape:document-units="px"
inkscape:current-layer="layer1"
showgrid="false"
inkscape:window-width="1436"
inkscape:window-height="855"
inkscape:window-x="4"
inkscape:window-y="1"
inkscape:window-maximized="1"
fit-margin-top="0.1"
fit-margin-left="0.1"
fit-margin-right="0.1"
fit-margin-bottom="0.1" />
<metadata
id="metadata7">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<g
inkscape:label="Calque 1"
inkscape:groupmode="layer"
id="layer1"
transform="translate(-258.57951,-522.55338)">
<text
xml:space="preserve"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:40px;line-height:125%;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
x="258.79712"
y="566.64795"
id="text4136"
sodipodi:linespacing="125%"><tspan
sodipodi:role="line"
id="tspan4138"
x="258.79712"
y="566.64795"
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:60px;line-height:125%;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Bold';text-align:start;writing-mode:lr-tb;text-anchor:start">BL<tspan
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:60px;line-height:125%;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Bold';text-align:start;writing-mode:lr-tb;text-anchor:start;fill:#00ffff"
id="tspan4140">A</tspan>AR</tspan><tspan
sodipodi:role="line"
x="258.79712"
y="599.28613"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:17.5px;line-height:125%;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';text-align:start;writing-mode:lr-tb;text-anchor:start"
id="tspan4142">Basic Libraries And</tspan><tspan
sodipodi:role="line"
x="258.79712"
y="621.16113"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:17.5px;line-height:125%;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';text-align:start;writing-mode:lr-tb;text-anchor:start"
id="tspan4146">Applications for Robotoics</tspan></text>
<text
xml:space="preserve"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:40px;line-height:125%;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
x="342.44171"
y="713.96112"
id="text4156"
sodipodi:linespacing="125%"><tspan
sodipodi:role="line"
id="tspan4158"
x="342.44171"
y="713.96112" /></text>
<flowRoot
xml:space="preserve"
id="flowRoot4168"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:40px;line-height:125%;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"><flowRegion
id="flowRegion4170"><rect
id="rect4172"
width="360.62445"
height="273.75134"
x="164.65486"
y="495.76816" /></flowRegion><flowPara
id="flowPara4174"></flowPara></flowRoot> <text
xml:space="preserve"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:40px;line-height:125%;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
x="95.944946"
y="962.54657"
id="text4197"
sodipodi:linespacing="125%"><tspan
sodipodi:role="line"
id="tspan4199"
x="95.944946"
y="962.54657" /></text>
</g>
</svg>
......@@ -6,7 +6,7 @@
#As a counterpart to the access to the source code and rights to copy, modify and redistribute granted by the license, users are provided only with a limited warranty and the software's author, the holder of the economic rights, and the successive licensors have only limited liability.
#In this respect, the user's attention is drawn to the risks associated with loading, using, modifying and/or developing or reproducing the software by the user in light of its specific status of free software, that may mean that it is complicated to manipulate, and that also therefore means that it is reserved for developers and experienced professionals having in-depth computer knowledge.
#Users are therefore encouraged to load and test the software's suitability as regards their requirements in conditions enabling the security of their systems and/or data to be ensured and, more generally, to use and operate it in the same conditions as regards security.
#The fact that you are presently reading this means that you have had knowledge of the CeCILL v2.1 license and that you accept its terms. *
#The fact that you are presently reading this means that you have had knowledge of the CeCILL v2.1 license and that you accept its terms.
#
#Author: Arnaud Blanchard
#Date: April 2015
......@@ -24,9 +24,9 @@ usage
exit 1;
fi
project_dir="$PWD/$1"
current_dir="$PWD"
blaar_build_dir="${PWD}_build"
project_dir="$current_dir/$1"
blaar_build_dir="${current_dir}_build"
if [ "$2" ]; then
case "$2" in
......@@ -36,15 +36,22 @@ esac
else build_type="Release"
fi
build_dir="$blaar_build_dir/${build_type}/build/$1"
if [ ! $3 ]; then
target=`basename $1`
else
target=`basename $3`
fi
build_dir="$blaar_build_dir/${build_type}/$1"
mkdir -p ${blaar_build_dir}/doc/$1
mkdir -p $build_dir
[ -d build ] || ln -s "$blaar_build_dir" build
cd $build_dir
[ $project_dir/CMakeLists.txt -nt Makefile ] && cmake $project_dir -DCMAKE_BUILD_TYPE=${build_type} -DBLAAR_DIR="$current_dir" -DLIBRARY_OUTPUT_PATH="${blaar_build_dir}/${build_type}/lib" -DEXECUTABLE_OUTPUT_PATH="${blaar_build_dir}/${build_type}/bin" -DCMAKE_LIBRARY_PATH="${blaar_build_dir}/${build_type}/lib"
make --jobs `basename $3`
#[ $project_dir/CMakeLists.txt -nt Makefile ] &&
cmake $project_dir -DCMAKE_BUILD_TYPE=${build_type} -DBLAAR_DIR="$current_dir" -DLIBRARY_OUTPUT_PATH="${blaar_build_dir}/${build_type}/lib" -DEXECUTABLE_OUTPUT_PATH="${blaar_build_dir}/${build_type}/bin" -DCMAKE_LIBRARY_PATH="${blaar_build_dir}/${build_type}/lib"
make --jobs $target
result=$?
cd $current_dir
......
......@@ -26,6 +26,13 @@ mkdir -p "$build_dir"
cd "$build_dir" && cmake -G"$generator" "$current_dir/$1" -DCMAKE_BUILD_TYPE="Debug" -DLIBRARY_OUTPUT_PATH=${blaar_build_dir}/Debug/lib -DBLAAR_DIR="$current_dir" -DCMAKE_LIBRARY_PATH="${blaar_build_dir}/Debug/lib" -DEXECUTABLE_OUTPUT_PATH=${blaar_build_dir}/Debug/bin
ERROR=$?
if [ ! $ERROR ]; then
echo
echo "Project created in $build_dir"
echo
fi
exit $ERROR
......@@ -23,8 +23,7 @@ echo "Usage : xcode_project project_directory"
exit 1
fi
developer_tools/create_project.sh $1 $build_dir eclipse
developer_tools/create_project.sh $1 $build_dir eclipse && echo "eclipse -> file -> import -> general -> existing project -> root directory -> browse\n -> $build_dir/eclipse/$1"
echo "eclipse -> file -> import -> general -> existing project -> root directory -> browse -> $build_dir/eclipse/$1"
echo
#!/bin/sh
command -v apt-get && apt-get install ruby-dev
gem install gollum
command -v apt-get &&
{
apt-get install ruby-dev
gem install gollum
}||command -v brew && brew install gollum
#!/bin/sh
#BLARR - Basic Librairies And Applications for Robotics
#Copyright ETIS — ENSEA, Université de Cergy-Pontoise, CNRS (2015 - 2016
#This software is governed by the CeCILL v2.1 license under French law and abiding by the rules of distribution of free software.
#You can use, modify and/ or redistribute the software under the terms of the CeCILL v2.1 license as circulated by CEA, CNRS and INRIA at the following URL "http://www.cecill.info".
#As a counterpart to the access to the source code and rights to copy, modify and redistribute granted by the license, users are provided only with a limited warranty and the software's author, the holder of the economic rights, and the successive licensors have only limited liability.
#In this respect, the user's attention is drawn to the risks associated with loading, using, modifying and/or developing or reproducing the software by the user in light of its specific status of free software, that may mean that it is complicated to manipulate, and that also therefore means that it is reserved for developers and experienced professionals having in-depth computer knowledge.
#Users are therefore encouraged to load and test the software's suitability as regards their requirements in conditions enabling the security of their systems and/or data to be ensured and, more generally, to use and operate it in the same conditions as regards security.
#The fact that you are presently reading this means that you have had knowledge of the CeCILL v2.1 license and that you accept its terms. *
#
#Author: Arnaud Blanchard
#Date: April 2015
usage()
{
echo "usage: reset.sh <project> [Release|Debug|RelWithDebugInfo|MinSizeRel] [<target>]" >&2
exit 1
}
if [ ! $1 ]; then
echo "You need to precise the project directory to reset it.";
usage
exit 1;
fi
current_dir="$PWD"
project_dir="$current_dir/$1"
blaar_build_dir="${current_dir}_build"
if [ "$2" ]; then
case "$2" in
Release|Debug|RelWithDebugInfo|MinSizeRel) build_type="$2";;
*)echo "Unknown build type '$2'">&2; usage;;
esac
else build_type="Release"
fi
if [ ! $3 ]; then
target=`basename $1`
else
target=`basename $3`
fi
build_dir="$blaar_build_dir/${build_type}/$1"
cd $build_dir
rm CMakeCache.txt
make reset
result=$?
cd $current_dir
exit $result
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