generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Replaced SVN instructions with Git instructions in iOS and Linux installation tutorials. Issue #2249

Browse Source 
+ Minor formatting fixes.
This commit is contained in:
Vsevolod Glumov
2012-10-11 16:44:53 +04:00
parent f41ab3a330
commit a3080636ba
2 changed files with 38 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
doc/tutorials/introduction/ios_install/ios_install.rst
View File

@@ -1,18 +1,18 @@
.. _iOS-Installation: .. _iOS-Installation:
Installation in iOS Installation in iOS
*********************** *******************
Required packages Required Packages
================== =================
* CMake 2.8.8 or higher * CMake 2.8.8 or higher
* Xcode 4.2 or higher * Xcode 4.2 or higher
Getting the cutting-edge OpenCV from GIT repository Getting the Cutting-edge OpenCV from Git Repository
--------------------------------------------------- ---------------------------------------------------
Launch GIT client and clone OpenCV repository from here: http://github.com/itseez/opencv Launch GIT client and clone OpenCV repository from `here <http://github.com/itseez/opencv>`_
In MacOS it can be done using the following command in Terminal: In MacOS it can be done using the following command in Terminal:
@@ -22,8 +22,8 @@ In MacOS it can be done using the following command in Terminal:
git clone https://github.com/Itseez/opencv.git git clone https://github.com/Itseez/opencv.git
Building OpenCV from source using CMake, using the command line Building OpenCV from Source, using CMake and Command Line
================================================================ =========================================================
#. Make symbolic link for Xcode to let OpenCV build scripts find the compiler, header files etc. #. Make symbolic link for Xcode to let OpenCV build scripts find the compiler, header files etc.
@@ -32,7 +32,7 @@ Building OpenCV from source using CMake, using the command line
cd / cd /
sudo ln -s /Applications/Xcode.app/Contents/Developer Developer sudo ln -s /Applications/Xcode.app/Contents/Developer Developer
#. Build OpenCV framework #. Build OpenCV framework:
.. code-block:: bash .. code-block:: bash
@@ -41,7 +41,6 @@ Building OpenCV from source using CMake, using the command line
If everything's fine, a few minutes later you will get ~/<my_working_directory>/ios/opencv2.framework. You can add this framework to your Xcode projects. If everything's fine, a few minutes later you will get ~/<my_working_directory>/ios/opencv2.framework. You can add this framework to your Xcode projects.
Further Reading Further Reading
===================== ===============
You can find several OpenCV+iOS tutorials here :ref:`Table-Of-Content-iOS` You can find several OpenCV+iOS tutorials here :ref:`Table-Of-Content-iOS`.

60
doc/tutorials/introduction/linux_install/linux_install.rst
View File

@@ -1,63 +1,59 @@
.. _Linux-Installation: .. _Linux-Installation:
Installation in Linux Installation in Linux
*********************** *********************
These steps have been tested for Ubuntu 10.04 but should work with other distros. These steps have been tested for Ubuntu 10.04 but should work with other distros as well.
Required packages Required Packages
================== =================
* GCC 4.4.x or later. This can be installed with * GCC 4.4.x or later. This can be installed with:
.. code-block:: bash .. code-block:: bash
sudo apt-get install build-essential sudo apt-get install build-essential
* CMake 2.6 or higher * CMake 2.6 or higher;
* Subversion (SVN) client * Git;
* GTK+2.x or higher, including headers (libgtk2.0-dev) * GTK+2.x or higher, including headers (libgtk2.0-dev);
* pkgconfig * pkgconfig;
* Python 2.6 or later and Numpy 1.5 or later with developer packages (python-dev, python-numpy) * Python 2.6 or later and Numpy 1.5 or later with developer packages (python-dev, python-numpy);
* ffmpeg or libav development packages: libavcodec-dev, libavformat-dev, libswscale-dev * ffmpeg or libav development packages: libavcodec-dev, libavformat-dev, libswscale-dev;
* [optional] libdc1394 2.x * [optional] libdc1394 2.x;
* [optional] libjpeg-dev, libpng-dev, libtiff-dev, libjasper-dev. * [optional] libjpeg-dev, libpng-dev, libtiff-dev, libjasper-dev.
All the libraries above can be installed via Terminal or by using Synaptic Manager All the libraries above can be installed via Terminal or by using Synaptic Manager.
Getting OpenCV source code Getting OpenCV Source Code
============================ ==========================
You can use the latest stable OpenCV version available in *sourceforge* or you can grab the latest snapshot from the `SVN repository <http://code.opencv.org/svn/opencv/>`_. You can use the latest stable OpenCV version available in *sourceforge* or you can grab the latest snapshot from our `Git repository <https://github.com/Itseez/opencv.git>`_.
Getting the latest stable OpenCV version Getting the Latest Stable OpenCV Version
------------------------------------------ ----------------------------------------
* Go to http://sourceforge.net/projects/opencvlibrary * Go to our `page on Sourceforge <http://sourceforge.net/projects/opencvlibrary>`_;
* Download the source tarball and unpack it * Download the source tarball and unpack it.
Getting the cutting-edge OpenCV from SourceForge SVN repository Getting the Cutting-edge OpenCV from the Git Repository
----------------------------------------------------------------- -------------------------------------------------------
Launch SVN client and checkout either Launch Git client and clone `OpenCV repository <http://github.com/itseez/opencv>`_
a. the current OpenCV snapshot from here: http://code.opencv.org/svn/opencv/trunk In Linux it can be achieved with the following command in Terminal:
#. or the latest tested OpenCV snapshot from here: http://code.opencv.org/svn/opencv/tags/latest_tested_snapshot
In Ubuntu it can be done using the following command, e.g.:
.. code-block:: bash .. code-block:: bash
cd ~/<my_working _directory> cd ~/<my_working _directory>
svn co http://code.opencv.org/svn/opencv/trunk git clone https://github.com/Itseez/opencv.git
Building OpenCV from source using CMake, using the command line Building OpenCV from Source Using CMake, Using the Command Line
================================================================ ===============================================================
#. Create a temporary directory, which we denote as <cmake_binary_dir>, where you want to put the generated Makefiles, project files as well the object filees and output binaries #. Create a temporary directory, which we denote as <cmake_binary_dir>, where you want to put the generated Makefiles, project files as well the object files and output binaries.
#. Enter the <cmake_binary_dir> and type #. Enter the <cmake_binary_dir> and type