Commit bb75a4c1 authored by Arnaud Blanchard's avatar Arnaud Blanchard

Merge branch 'master' of https://promethe.u-cergy.fr/blaar/blaar

parents f33483dc 076692fc
......@@ -7,10 +7,10 @@ You need Xcode or a C/C++ compilation (clang, g++, ..).
Copy past this line in a terminal
curl -sS https://framagit.org/blaar/blaar/raw/master/developer_tools/clone_and_install_blaar_osx.sh | bash &&
curl -sS https://promethe.u-cergy.fr/blaar/blaar/raw/master/developer_tools/clone_and_install_blaar_osx.sh | bash &&
cd blaar
You can do [**step by step**](https://framagit.org/blaar/blaar/blob/master/developer_tools/clone_and_install_blaar_osx.sh) copying command line by command line. This may be useful to better understand and in case where the installer crash.
You can do [**step by step**](https://promethe.u-cergy.fr/blaar/blaar/blob/master/developer_tools/clone_and_install_blaar_osx.sh) copying command line by command line. This may be useful to better understand and in case where the installer crash.
If you have a problem at compile time it may be due to a bad configuration of your compiler [**see how to install command line tools mac os x**](http://osxdaily.com/2014/02/12/install-command-line-tools-mac-os-x/)
\ No newline at end of file
......@@ -3,11 +3,11 @@ Install blaar on Ubuntu
Copy past this line in a terminal
wget -q -O/tmp/blaar_install.sh https://framagit.org/blaar/blaar/raw/master/developer_tools/clone_and_install_blaar_ubuntu.sh &&
wget -q -O/tmp/blaar_install.sh https://promethe.u-cergy.fr/blaar/blaar/raw/master/developer_tools/clone_and_install_blaar_ubuntu.sh &&
bash /tmp/blaar_install.sh; rm /tmp/blaar_install.sh; cd blaar
You will be requested at some point to enter your admin password to make the installation.
You can do [**step by step**](https://framagit.org/blaar/blaar/blob/master/developer_tools/clone_and_install_blaar_ubuntu.sh) copying command line by command line. This may be useful to better understand and in case where the installer crash.
You can do [**step by step**](https://promethe.u-cergy.fr/blaar/blaar/blob/master/developer_tools/clone_and_install_blaar_ubuntu.sh) copying command line by command line. This may be useful to better understand and in case where the installer crash.
[![logo](logo_blaar.png)](http://blaar.org)
Basic Libraries And Applications for Robotics
......@@ -9,15 +8,15 @@ BLAAR is still in active development. It is **not stable yet** and will evolve.
Basic Libraries for C/C++
-------------------------
- [blc_core](https://framagit.org/blibs/blc_core) : Generic helpers in C or C++ used by all other blaar projects
- [blc_channel](https://framagit.org/blibs/blc_channel) : Tools to use shared memory in synchrone ( in test) and asynchrone mode
- [blc_image](https://framagit.org/blibs/blc_image) : Manipulate blc_array as images. Can load and save them as png files
- [blc_program](https://framagit.org/blibs/blc_program) : Parse arguments and interacts with user in commandline.
- [blc_core](https://promethe.u-cergy.fr/blibs/blc_core) : Generic helpers in C or C++ used by all other blaar projects
- [blc_channel](https://promethe.u-cergy.fr/blibs/blc_channel) : Tools to use shared memory in synchrone ( in test) and asynchrone mode
- [blc_image](https://promethe.u-cergy.fr/blibs/blc_image) : Manipulate blc_array as images. Can load and save them as png files
- [blc_program](https://promethe.u-cergy.fr/blibs/blc_program) : Parse arguments and interacts with user in commandline.
Standard blaar applications
---------------------------
- [bapps](https://framagit.org/blaar/bapps.git) : Generic executables to manipulate blc_channels (find max, generate oscillators, ...)
- [bapps](https://promethe.u-cergy.fr/blaar/bapps.git) : Generic executables to manipulate blc_channels (find max, generate oscillators, ...)
In `scripts/` you have bash scripts which combine applications to produce higher level functionalities. They may require you add optional modules.
......@@ -25,7 +24,7 @@ Install
=======
* [Mac OSX](INSTALL_OSX.md)
* [Ubuntu](INSTALL_UBUNTU.md)
* [Ubuntu/Raspbian](INSTALL_UBUNTU.md)
Adding submodules
-----------------
......
......@@ -38,7 +38,7 @@ brew install git cmake ninja doxygen libpng libjpeg gnuplot --with-qt fftw libsn
echo
echo "Download blaar sources"
echo
git clone https://framagit.org/blaar/blaar
git clone https://promethe.u-cergy.fr/blaar/blaar.git
echo
cd blaar
echo
......@@ -46,8 +46,8 @@ developer_tools/clone_standard_modules.sh
echo
echo "Clone specific modules"
echo
git submodule add https://framagit.org/blaar/coreaudio.git
git submodule add https://framagit.org/blaar/i_AV_camera.git
git submodule add https://promethe.u-cergy.fr/blaar/coreaudio.git
git submodule add https://promethe.u-cergy.fr/blaar/i_AV_camera.git
echo
echo "Install and test each module"
......
......@@ -28,11 +28,11 @@ echo
echo
echo "Install required packages"
echo
sudo apt-get install git g++ cmake ninja-build doxygen libpng-dev libjpeg-dev gnuplot fftw3-dev libsndfile1-dev libasound2-dev libv4l-dev libgtk-3-dev #Only git g++ cmake ninja-build are really required
sudo apt-get install git g++ cmake ninja-build doxygen lsof libpng-dev libjpeg-dev gnuplot fftw3-dev libsndfile1-dev libasound2-dev libv4l-dev libgtk-3-dev #Only git g++ cmake ninja-build are really required
echo
echo "Download sources"
echo
git clone https://framagit.org/blaar/blaar
git clone https://promethe.u-cergy.fr/blaar/blaar.git
echo
cd blaar
echo
......@@ -40,8 +40,8 @@ developer_tools/clone_standard_modules.sh
echo
echo Clone specific modules
echo
git submodule add https://framagit.org/blaar/asound.git
git submodule add https://framagit.org/blaar/i_v4l2_camera.git
git submodule add https://promethe.u-cergy.fr/blaar/asound.git
git submodule add https://promethe.u-cergy.fr/blaar/i_v4l2_camera.git
echo
echo "Install and check each project"
echo
......
......@@ -18,8 +18,8 @@ source scripts/blaar.sh
#blc_core has to be first. It is used by all others projects
#blc_program has to be before blc_processes ( not nice dependecy)
lib_website=https://framagit.org/blibs
module_website=https://framagit.org/blaar
lib_website=https://promethe.u-cergy.fr/blibs
module_website=https://promethe.u-cergy.fr/blaar
basic_libs="blc_core blc_channel blc_network blc_program blc_process blc_image"
standard_modules="blc_channels bapps gnuplot fftw sndfile png gtk"
......
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