Commit 47d2efaf authored by Arnaud Blanchard's avatar Arnaud Blanchard

Update news hosting i.e. git.u-cergy.fr

parent 5093b40a
Pipeline #42 canceled with stage
......@@ -7,10 +7,10 @@ You need Xcode or a C/C++ compilation (clang, g++, ..).
Copy past this line in a terminal
curl -sS https://promethe.u-cergy.fr/blaar/blaar/raw/master/developer_tools/clone_and_install_blaar_osx.sh | bash &&
curl -sS https://git.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://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.
You can do [**step by step**](https://git.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 or Raspbian (rasperry pi)
Copy past this line in a terminal
wget -q -O/tmp/blaar_install.sh https://promethe.u-cergy.fr/blaar/blaar/raw/master/developer_tools/clone_and_install_blaar_ubuntu.sh &&
wget -q -O/tmp/blaar_install.sh https://git.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://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.
You can do [**step by step**](https://git.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.
......@@ -9,7 +9,7 @@ The modules are minimalist in purpose. If you want more you are advised to use s
BLAAR is **open source** CeCILL v2.1 (compatible GPL v2).
**BLAAR** should work on **POSIX** systems. GNU/Linux (**Ubuntu/Raspbian**), Darwin (**Mac OSX**) and Bionic (**Android** not usable yet).
**BLAAR** is still under development, it is **not stable yet** but feel free to [ask improvement or notify issues](https://promethe.u-cergy.fr/blaar/blaar/issues).
**BLAAR** is still under development, it is **not stable yet** but feel free to [ask improvement or notify issues](https://git.u-cergy.fr/blaar/blaar/issues).
Install
=======
......@@ -22,36 +22,36 @@ Modules
Most of these modules are installed by default (otherwise see below for installation)
- [bapps](https://promethe.u-cergy.fr/blaar/bapps.git): Basic Applications for C/C++ with no dependency to manipulate blc_channels (find max, generate oscillators, ...). (no requirement)
- [gnuplot](https://promethe.u-cergy.fr/blaar/gnuplot.git) Allows to make graphs from data of blc_channels (require gnuplot)
- [gtk](https://promethe.u-cergy.fr/blaar/gtk.git) Provides a graphical user interface. For now, it displays images. (require gtk)
- [png](https://promethe.u-cergy.fr/blaar/png.git) Saves and loads png images. (require libpng)
- [sndfile](https://promethe.u-cergy.fr/blaar/sndfile.git) Reads and writes sound files in with many sound formats (require libsndfile)
- [bapps](https://git.u-cergy.fr/blaar/bapps.git): Basic Applications for C/C++ with no dependency to manipulate blc_channels (find max, generate oscillators, ...). (no requirement)
- [gnuplot](https://git.u-cergy.fr/blaar/gnuplot.git) Allows to make graphs from data of blc_channels (require gnuplot)
- [gtk](https://git.u-cergy.fr/blaar/gtk.git) Provides a graphical user interface. For now, it displays images. (require gtk)
- [png](https://git.u-cergy.fr/blaar/png.git) Saves and loads png images. (require libpng)
- [sndfile](https://git.u-cergy.fr/blaar/sndfile.git) Reads and writes sound files in with many sound formats (require libsndfile)
Specific Linux
--------------
- [asound](https://promethe.u-cergy.fr/blaar/asound.git) Acquire or produce sound using Advanced Linux Sound Architecture library (require libasounddev).
- [i_v4l2_camera](https://promethe.u-cergy.fr/blaar/i_v4l2_camera.git) Acquire images from a camera using Video 4 Linux library (require libv4l2dev).
- [asound](https://git.u-cergy.fr/blaar/asound.git) Acquire or produce sound using Advanced Linux Sound Architecture library (require libasounddev).
- [i_v4l2_camera](https://git.u-cergy.fr/blaar/i_v4l2_camera.git) Acquire images from a camera using Video 4 Linux library (require libv4l2dev).
Specific Mac OSX
----------------
- [coreaudio](https://promethe.u-cergy.fr/blaar/asound.git) Acquire or produce sound using Apple Core Audio Frameworks
- [i_AV_camera](https://promethe.u-cergy.fr/blaar/i_AV_camera.git) Acquire images from cameras using Audio Video Foundation
- [coreaudio](https://git.u-cergy.fr/blaar/asound.git) Acquire or produce sound using Apple Core Audio Frameworks
- [i_AV_camera](https://git.u-cergy.fr/blaar/i_AV_camera.git) Acquire images from cameras using Audio Video Foundation
Specific raspberry pi
---------------------
The Linux of raspberry (raspbian) can be used like ubuntu but it has more functionalities to manage input outputs that why there is a specific package.
- [raspi](https://promethe.u-cergy.fr/blaar/raspi.git)
- [raspinobo](https://promethe.u-cergy.fr/blaar/raspinobo.git) Specific for the robotic head
- [raspi](https://git.u-cergy.fr/blaar/raspi.git)
- [raspinobo](https://git.u-cergy.fr/blaar/raspinobo.git) Specific for the robotic head
In development
--------------
- [blc_server](https://promethe.u-cergy.fr/blaar/blc_server.git) Create a server to monitor **blc_channels**
- [blc_server](https://git.u-cergy.fr/blaar/blc_server.git) Create a server to monitor **blc_channels**
Usage
=====
......@@ -98,10 +98,10 @@ You can freely mix blibs and low level C/C++ functions.
### blc are basic libraries for C/C++ with no specific requirement
- [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.
- [blc_core](https://git.u-cergy.fr/blaar/blibs/blc_core) : Generic helpers in C or C++ used by all other blaar projects
- [blc_channel](https://git.u-cergy.fr/blaar/blibs/blc_channel) : Tools to use shared memory in synchrone ( in test) and asynchrone mode
- [blc_image](https://git.u-cergy.fr/blaar/blibs/blc_image) : Manipulate blc_array as images. Can load and save them as png files
- [blc_program](https://git.u-cergy.fr/blaar/blibs/blc_program) : Parse arguments and interacts with user in commandline.
To get details about compilation and documentation of the functions, see [developement](DEVELOPMENT.md).
......
......@@ -38,7 +38,7 @@ brew install git cmake ninja doxygen libpng libjpeg gnuplot fftw libsndfile || b
echo
echo "Download blaar sources"
echo
git clone https://promethe.u-cergy.fr/blaar/blaar.git
git clone https://git.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://promethe.u-cergy.fr/blaar/coreaudio.git
git submodule add https://promethe.u-cergy.fr/blaar/i_AV_camera.git
git submodule add https://git.u-cergy.fr/blaar/coreaudio.git
git submodule add https://git.u-cergy.fr/blaar/i_AV_camera.git
echo
echo "Install and test each module"
......
......@@ -32,7 +32,7 @@ sudo apt-get install git g++ cmake ninja-build doxygen lsof libpng-dev libjpeg-d
echo
echo "Download sources"
echo
git clone https://promethe.u-cergy.fr/blaar/blaar.git
git clone https://git.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://promethe.u-cergy.fr/blaar/asound.git
git submodule add https://promethe.u-cergy.fr/blaar/i_v4l2_camera.git
git submodule add https://git.u-cergy.fr/blaar/asound.git
git submodule add https://git.u-cergy.fr/blaar/i_v4l2_camera.git
echo
echo "Install and check each project"
echo
......
......@@ -18,23 +18,12 @@ 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://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"
# We do not use function in purpose as 'set -o errexit' has no effect in it
for lib in $basic_libs
do
echo "Cloning '$lib':"
commandline="git submodule add $lib_website/$lib.git blibs/$lib"
$commandline &> $TMP_DIR/clone_$lib.log || { echo "Fail cloning '$lib' executing: '$commandline'"; cat $TMP_DIR/clone_$lib.log; echo ; }
done
website=https://git.u-cergy.fr/blaar
standard_modules="blibs/blc_core blibs/blc_channel blibs/blc_network blibs/blc_program blibs/blc_process blibs/blc_image blc_channels bapps gnuplot fftw sndfile png gtk"
for module in $standard_modules
do
echo "Cloning '$module':"
commandline="git submodule add $module_website/$module.git"
commandline="git submodule add $website/$module.git module"
$commandline &> $TMP_DIR/clone_$module.log || { echo "Fail cloning '$module' executing: '$commandline'"; cat $TMP_DIR/clone_$module.log; echo ; }
done
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