Commit a7dec5a500f9fb2a1ff621f8b3c550a67cdc9bd7
1 parent
4ecb4d64
more work on build documentation
Showing
1 changed file
with
69 additions
and
61 deletions
sdk/openbr_export.cpp
| @@ -78,17 +78,15 @@ $ br -help | @@ -78,17 +78,15 @@ $ br -help | ||
| 78 | 78 | ||
| 79 | /*! | 79 | /*! |
| 80 | * \page windows_msvc Windows 7 - Visual Studio Express Edition 2012 - x64 | 80 | * \page windows_msvc Windows 7 - Visual Studio Express Edition 2012 - x64 |
| 81 | - * \brief Installation from source with Visual Studio. | ||
| 82 | - * | ||
| 83 | - * -# Download and install <a href="http://www.microsoft.com/visualstudio/eng/downloads#d-express-windows-desktop">Visual Studio 2012 Express Edition for Windows Desktop</a> | ||
| 84 | - * -# If you need a program to mount ISO images then consider the free open source program <a href="http://wincdemu.sysprogs.org">WinCDEmu</a>. | 81 | + * -# <a href="http://www.microsoft.com/visualstudio/eng/downloads#d-express-windows-desktop">Download Visual Studio 2012 Express Edition for Windows Desktop</a> and install. |
| 82 | + * -# Consider the free open source program <a href="http://wincdemu.sysprogs.org">WinCDEmu</a> if you need a program to mount ISO images. | ||
| 85 | * -# You will have to register with Microsoft after installation, but it's free. | 83 | * -# You will have to register with Microsoft after installation, but it's free. |
| 86 | * -# Grab any available <a href="http://www.microsoft.com/visualstudio/eng/downloads#d-visual-studio-2012-update">Visual Studio Updates</a>. | 84 | * -# Grab any available <a href="http://www.microsoft.com/visualstudio/eng/downloads#d-visual-studio-2012-update">Visual Studio Updates</a>. |
| 87 | - * -# Download and install <a href="http://www.cmake.org/files/v2.8/cmake-2.8.10.2-win32-x86.exe">CMake 2.8.10.2</a> | 85 | + * -# <a href="http://www.cmake.org/files/v2.8/cmake-2.8.10.2-win32-x86.exe">Download CMake 2.8.10.2</a> and install. |
| 88 | * -# During installation setup select "add CMake to PATH". | 86 | * -# During installation setup select "add CMake to PATH". |
| 89 | - * -# Download and unarchive <a href="http://sourceforge.net/projects/opencvlibrary/files/opencv-unix/2.4.3/OpenCV-2.4.3.tar.bz2/download">OpenCV 2.4.3</a> | ||
| 90 | - * -# If you need a program to unarchive tarballs then consider the free open source program <a href="http://www.7-zip.org/">7-Zip</a>. | ||
| 91 | - * -# Copy the "OpenCV-2.4.3" folder to "C:\". | 87 | + * -# <a href="http://sourceforge.net/projects/opencvlibrary/files/opencv-unix/2.4.3/OpenCV-2.4.3.tar.bz2/download">Download OpenCV 2.4.3</a> and unarchive. |
| 88 | + * -# Consider the free open source program <a href="http://www.7-zip.org/">7-Zip</a> if you need a program to unarchive tarballs. | ||
| 89 | + * -# Move the "OpenCV-2.4.3" folder to "C:\". | ||
| 92 | * -# Open "VS2012 x64 Cross Tools Command Prompt" (from the Start Menu, select "All Programs" -> "Microsoft Visual Studio 2012" -> "Visual Studio Tools" -> "VS2012 x64 Cross Tools Command Prompt") and enter: | 90 | * -# Open "VS2012 x64 Cross Tools Command Prompt" (from the Start Menu, select "All Programs" -> "Microsoft Visual Studio 2012" -> "Visual Studio Tools" -> "VS2012 x64 Cross Tools Command Prompt") and enter: |
| 93 | * \code | 91 | * \code |
| 94 | * $ cd C:\OpenCV-2.4.3 | 92 | * $ cd C:\OpenCV-2.4.3 |
| @@ -102,13 +100,13 @@ $ br -help | @@ -102,13 +100,13 @@ $ br -help | ||
| 102 | * $ nmake install | 100 | * $ nmake install |
| 103 | * $ nmake clean | 101 | * $ nmake clean |
| 104 | * \endcode | 102 | * \endcode |
| 105 | - * -# <http://releases.qt-project.org/qt5/5.0.1/single/qt-everywhere-opensource-src-5.0.1.zip">Download Qt 5.0.1</a> and install: | ||
| 106 | - * -# Unzip "qt-everywhere-opensource-src-5.0.1.zip" | ||
| 107 | - * -# Install Perl/Python/Ruby dependencies as explained in the "Windows" section of "qt-everywhere-opensource-src-5.0.1\\README". | 103 | + * -# <a href="http://releases.qt-project.org/qt5/5.0.1/single/qt-everywhere-opensource-src-5.0.1.zip">Download Qt 5.0.1</a> and unzip. |
| 104 | + * -# Install Perl/Python/Ruby dependencies as explained in the "Windows" section of "README". Make sure they are added to "path" when given the option during installation. | ||
| 105 | + * -# <a href="http://www.microsoft.com/en-us/download/confirmation.aspx?id=6812">Download Direct X Software Developement Kit</a> and install. | ||
| 108 | * -# From the VS2012 x64 Cross Tools Command Prompt: | 106 | * -# From the VS2012 x64 Cross Tools Command Prompt: |
| 109 | * \code | 107 | * \code |
| 110 | * $ cd qt-everywhere-opensource-src-5.0.1 | 108 | * $ cd qt-everywhere-opensource-src-5.0.1 |
| 111 | - * $ configure -prefix C:\Qt\5.0.1\msvc2012 -opensource -nomake examples -nomake tests -no-opengl | 109 | + * $ configure -prefix C:\Qt\5.0.1\msvc2012 -opensource -confirm-license -nomake examples -nomake tests |
| 112 | * $ nmake | 110 | * $ nmake |
| 113 | * $ nmake install | 111 | * $ nmake install |
| 114 | * $ cd .. | 112 | * $ cd .. |
| @@ -124,20 +122,22 @@ $ br -help | @@ -124,20 +122,22 @@ $ br -help | ||
| 124 | * $ git submodule init | 122 | * $ git submodule init |
| 125 | * $ git submodule update | 123 | * $ git submodule update |
| 126 | * \endcode | 124 | * \endcode |
| 127 | - * -# Finally time to build OpenBR! | 125 | + * -# Build OpenBR! |
| 128 | * -# From the VS2012 x64 Cross Tools Command Prompt: | 126 | * -# From the VS2012 x64 Cross Tools Command Prompt: |
| 129 | * \code | 127 | * \code |
| 130 | * $ cd C:\openbr | 128 | * $ cd C:\openbr |
| 131 | * $ mkdir build-msvc2012 | 129 | * $ mkdir build-msvc2012 |
| 132 | * $ cd build-msvc2012 | 130 | * $ cd build-msvc2012 |
| 133 | - * $ cmake -G "CodeBlocks - NMake Makefiles" -D CMAKE_PREFIX_PATH="C:/OpenCV-2.4.3/build-msvc2012/install;C:/Qt/5.0.1/msvc2012" -D BR_INSTALL_DEPENDENCIES=ON -D CMAKE_BUILD_TYPE=Release .. | 131 | + * $ cmake -G "CodeBlocks - NMake Makefiles" -D CMAKE_PREFIX_PATH="C:/OpenCV-2.4.3/build-msvc2012/install;C:/Qt/5.0.1/msvc2012" -D CMAKE_INSTALL_PREFIX="./install" -D BR_INSTALL_DEPENDENCIES=ON -D CMAKE_BUILD_TYPE=Release .. |
| 134 | * $ nmake | 132 | * $ nmake |
| 133 | + * $ nmake install | ||
| 135 | * \endcode | 134 | * \endcode |
| 136 | - * -# Start hacking OpenBR! | ||
| 137 | - * -# Download <a href="http://releases.qt-project.org/qtcreator/2.6.2/qt-creator-windows-opensource-2.6.2.exe">Qt Creator</a> IDE and install. | 135 | + * -# Check out the "install" folder. |
| 136 | + * -# Hack OpenBR! | ||
| 137 | + * -# <a href="http://releases.qt-project.org/qtcreator/2.6.2/qt-creator-windows-opensource-2.6.2.exe">Download Qt Creator</a> IDE and install. | ||
| 138 | * -# From the VS2012 x64 Cross Tools Command Prompt: | 138 | * -# From the VS2012 x64 Cross Tools Command Prompt: |
| 139 | * \code | 139 | * \code |
| 140 | - * $ "C:\Qt\qtcreator-2.6.2\bin\qtcreator.exe" | 140 | + * $ C:\Qt\qtcreator-2.6.2\bin\qtcreator.exe |
| 141 | * \endcode | 141 | * \endcode |
| 142 | * -# From the Qt Creator "Tools" menu select "Options..." | 142 | * -# From the Qt Creator "Tools" menu select "Options..." |
| 143 | * -# Under "Kits" select "Desktop (default)" | 143 | * -# Under "Kits" select "Desktop (default)" |
| @@ -147,8 +147,8 @@ $ br -help | @@ -147,8 +147,8 @@ $ br -help | ||
| 147 | * -# Browse to your prexisting build directory "C:\openbr\build-msvc2012" then select "Next". | 147 | * -# Browse to your prexisting build directory "C:\openbr\build-msvc2012" then select "Next". |
| 148 | * -# Clear any text in the "arguments" box then select "Run CMake" then "Finish". | 148 | * -# Clear any text in the "arguments" box then select "Run CMake" then "Finish". |
| 149 | * -# You're all set! You can find more information on Qt Creator <a href="http://qt-project.org/doc/qtcreator-2.6/">here</a> if you need. | 149 | * -# You're all set! You can find more information on Qt Creator <a href="http://qt-project.org/doc/qtcreator-2.6/">here</a> if you need. |
| 150 | - * -# (Optional) To package OpenBR: | ||
| 151 | - * -# Download and install <a href="http://sourceforge.net/projects/nsis/files/NSIS%202/2.46/nsis-2.46-setup.exe/download?use_mirror=iweb&download=">NSIS 2.46</a>. | 150 | + * -# Package OpenBR! |
| 151 | + * -# <a href="http://sourceforge.net/projects/nsis/files/NSIS%202/2.46/nsis-2.46-setup.exe/download?use_mirror=iweb&download=">Download NSIS 2.46</a> and install. | ||
| 152 | * -# From the VS2012 x64 Cross Tools Command Prompt: | 152 | * -# From the VS2012 x64 Cross Tools Command Prompt: |
| 153 | * \code | 153 | * \code |
| 154 | * $ cd C:\openbr\build-msvc2012 | 154 | * $ cd C:\openbr\build-msvc2012 |
| @@ -158,16 +158,14 @@ $ br -help | @@ -158,16 +158,14 @@ $ br -help | ||
| 158 | 158 | ||
| 159 | /*! | 159 | /*! |
| 160 | * \page windows_mingw Windows 7 - MinGW-w64 2.0 - x64 | 160 | * \page windows_mingw Windows 7 - MinGW-w64 2.0 - x64 |
| 161 | - * \brief Installation from source with MinGW-w64. | ||
| 162 | - * | ||
| 163 | * -# <a href="http://sourceforge.net/projects/mingw-w64/files/Toolchains%20targetting%20Win64/Personal%20Builds/rubenvb/gcc-4.7-release/x86_64-w64-mingw32-gcc-4.7.2-release-win64_rubenvb.7z/download">Download MinGW-w64 GCC 4.7.2</a> and unarchive. | 161 | * -# <a href="http://sourceforge.net/projects/mingw-w64/files/Toolchains%20targetting%20Win64/Personal%20Builds/rubenvb/gcc-4.7-release/x86_64-w64-mingw32-gcc-4.7.2-release-win64_rubenvb.7z/download">Download MinGW-w64 GCC 4.7.2</a> and unarchive. |
| 164 | * -# Use the free open source program <a href="http://www.7-zip.org/">7-Zip</a> to unarchive. | 162 | * -# Use the free open source program <a href="http://www.7-zip.org/">7-Zip</a> to unarchive. |
| 165 | - * -# Copy "x86_64-w64-mingw32-gcc-4.7.2-release-win64_rubenvb\mingw64" to "C:\". | 163 | + * -# Move "x86_64-w64-mingw32-gcc-4.7.2-release-win64_rubenvb\mingw64" to "C:\". |
| 166 | * -# <a href="http://www.cmake.org/files/v2.8/cmake-2.8.10.2-win32-x86.exe">Download CMake 2.8.10.2</a> and install. | 164 | * -# <a href="http://www.cmake.org/files/v2.8/cmake-2.8.10.2-win32-x86.exe">Download CMake 2.8.10.2</a> and install. |
| 167 | * -# During installation setup select "add CMake to PATH". | 165 | * -# During installation setup select "add CMake to PATH". |
| 168 | * -# <a href="http://sourceforge.net/projects/opencvlibrary/files/opencv-unix/2.4.3/OpenCV-2.4.3.tar.bz2/download">Download OpenCV 2.4.3</a> and unarchive. | 166 | * -# <a href="http://sourceforge.net/projects/opencvlibrary/files/opencv-unix/2.4.3/OpenCV-2.4.3.tar.bz2/download">Download OpenCV 2.4.3</a> and unarchive. |
| 169 | - * -# If you need a program to unarchive tarballs then consider the free open source program <a href="http://www.7-zip.org/">7-Zip</a>. | ||
| 170 | - * -# Copy the "OpenCV-2.4.3" folder to "C:\". | 167 | + * -# Consider the free open source program <a href="http://www.7-zip.org/">7-Zip</a> if you need a program to unarchive tarballs. |
| 168 | + * -# Move the "OpenCV-2.4.3" folder to "C:\". | ||
| 171 | * -# From the MinGW-w64 Command Prompt (double-click "C:\mingw64\mingw64env.cmd"): | 169 | * -# From the MinGW-w64 Command Prompt (double-click "C:\mingw64\mingw64env.cmd"): |
| 172 | * \code | 170 | * \code |
| 173 | * $ cd C:\OpenCV-2.4.3 | 171 | * $ cd C:\OpenCV-2.4.3 |
| @@ -181,13 +179,13 @@ $ br -help | @@ -181,13 +179,13 @@ $ br -help | ||
| 181 | * $ mingw32-make install | 179 | * $ mingw32-make install |
| 182 | * $ mingw32-make clean | 180 | * $ mingw32-make clean |
| 183 | * \endcode | 181 | * \endcode |
| 184 | - * -# <http://releases.qt-project.org/qt5/5.0.1/single/qt-everywhere-opensource-src-5.0.1.zip">Download Qt 5.0.1</a> and install: | ||
| 185 | - * -# Unzip "qt-everywhere-opensource-src-5.0.1.zip" | ||
| 186 | - * -# Install Perl/Python/Ruby dependencies as explained in the "Windows" section of "qt-everywhere-opensource-src-5.0.1\\README". | 182 | + * -# <a href="http://releases.qt-project.org/qt5/5.0.1/single/qt-everywhere-opensource-src-5.0.1.zip">Download Qt 5.0.1</a> and unzip. |
| 183 | + * -# Install Perl/Python/Ruby dependencies as explained in the "Windows" section of "README". Make sure they are added to "path" when given the option during installation. | ||
| 184 | + * -# <a href="http://www.microsoft.com/en-us/download/confirmation.aspx?id=6812">Download Direct X Software Developement Kit</a> and install. | ||
| 187 | * -# From the MinGW-w64 Command Prompt: | 185 | * -# From the MinGW-w64 Command Prompt: |
| 188 | * \code | 186 | * \code |
| 189 | * $ cd qt-everywhere-opensource-src-5.0.1 | 187 | * $ cd qt-everywhere-opensource-src-5.0.1 |
| 190 | - * $ configure -prefix C:\Qt\5.0.1\mingw64 -opensource -nomake examples -nomake tests -no-opengl | 188 | + * $ configure -prefix C:\Qt\5.0.1\mingw64 -opensource -confirm-license -nomake examples -nomake tests |
| 191 | * $ mingw32-make | 189 | * $ mingw32-make |
| 192 | * $ mingw32-make install | 190 | * $ mingw32-make install |
| 193 | * $ cd .. | 191 | * $ cd .. |
| @@ -203,32 +201,33 @@ $ br -help | @@ -203,32 +201,33 @@ $ br -help | ||
| 203 | * $ git submodule init | 201 | * $ git submodule init |
| 204 | * $ git submodule update | 202 | * $ git submodule update |
| 205 | * \endcode | 203 | * \endcode |
| 206 | - * -# Finally time to build OpenBR! | 204 | + * -# Build OpenBR! |
| 207 | * -# From the MinGW-w64 Command Prompt: | 205 | * -# From the MinGW-w64 Command Prompt: |
| 208 | * \code | 206 | * \code |
| 209 | * $ cd C:\openbr | 207 | * $ cd C:\openbr |
| 210 | * $ mkdir build-mingw64 | 208 | * $ mkdir build-mingw64 |
| 211 | * $ cd build-mingw64 | 209 | * $ cd build-mingw64 |
| 212 | - * $ cmake -G "CodeBlocks - MinGW Makefiles" -D CMAKE_RC_COMPILER="C:/mingw64/bin/windres.exe" -D CMAKE_PREFIX_PATH="C:/OpenCV-2.4.3/build-mingw64/install;C:/Qt/5.0.1/mingw64" -D BR_INSTALL_DEPENDENCIES=ON -D CMAKE_BUILD_TYPE=Release .. | 210 | + * $ cmake -G "CodeBlocks - MinGW Makefiles" -D CMAKE_RC_COMPILER="C:/mingw64/bin/windres.exe" -D CMAKE_PREFIX_PATH="C:/OpenCV-2.4.3/build-mingw64/install;C:/Qt/5.0.1/mingw64" -D CMAKE_INSTALL_PREFIX="./install" -D BR_INSTALL_DEPENDENCIES=ON -D CMAKE_BUILD_TYPE=Release .. |
| 213 | * $ mingw32-make | 211 | * $ mingw32-make |
| 214 | - * $ mingw32-make package | 212 | + * $ mingw32-make install |
| 215 | * \endcode | 213 | * \endcode |
| 216 | - * -# Start hacking OpenBR! | ||
| 217 | - * -# Download and install <a href="http://releases.qt-project.org/qtcreator/2.6.2/qt-creator-windows-opensource-2.6.2.exe">Qt Creator</a> IDE. | 214 | + * -# Check out the "install" folder. |
| 215 | + * -# Hack OpenBR! | ||
| 216 | + * -# <a href="http://releases.qt-project.org/qtcreator/2.6.2/qt-creator-windows-opensource-2.6.2.exe">Download Qt Creator</a> IDE and install. | ||
| 218 | * -# From the MinGW-w64 Command Prompt: | 217 | * -# From the MinGW-w64 Command Prompt: |
| 219 | * \code | 218 | * \code |
| 220 | * $ "C:\Qt\qtcreator-2.6.2\bin\qtcreator.exe" | 219 | * $ "C:\Qt\qtcreator-2.6.2\bin\qtcreator.exe" |
| 221 | * \endcode | 220 | * \endcode |
| 222 | * -# From the Qt Creator "Tools" menu select "Options..." | 221 | * -# From the Qt Creator "Tools" menu select "Options..." |
| 223 | * -# Under "Kits" select "Desktop (default)" | 222 | * -# Under "Kits" select "Desktop (default)" |
| 224 | - * -# For "Compiler:" select "MinGW (x84 64bit)" and click "OK" | 223 | + * -# For "Compiler:" select "MinGW (x86 64bit)" and click "OK" |
| 225 | * -# From the Qt Creator "File" menu select "Open File or Project...". | 224 | * -# From the Qt Creator "File" menu select "Open File or Project...". |
| 226 | * -# Select "C:\openbr\CMakeLists.txt" then "Open". | 225 | * -# Select "C:\openbr\CMakeLists.txt" then "Open". |
| 227 | * -# Browse to your prexisting build directory "C:\openbr\build-mingw64" then select "Next". | 226 | * -# Browse to your prexisting build directory "C:\openbr\build-mingw64" then select "Next". |
| 228 | * -# Clear any text in the "arguments" box then select "Run CMake" then "Finish". | 227 | * -# Clear any text in the "arguments" box then select "Run CMake" then "Finish". |
| 229 | * -# You're all set! You can find more information on Qt Creator <a href="http://qt-project.org/doc/qtcreator-2.6/">here</a> if you need. | 228 | * -# You're all set! You can find more information on Qt Creator <a href="http://qt-project.org/doc/qtcreator-2.6/">here</a> if you need. |
| 230 | - * -# (Optional) To package OpenBR: | ||
| 231 | - * -# Download and install <a href="http://sourceforge.net/projects/nsis/files/NSIS%202/2.46/nsis-2.46-setup.exe/download?use_mirror=iweb&download=">NSIS 2.46</a>. | 229 | + * -# Package OpenBR! |
| 230 | + * -# <a href="http://sourceforge.net/projects/nsis/files/NSIS%202/2.46/nsis-2.46-setup.exe/download?use_mirror=iweb&download=">Download NSIS 2.46</a> and install. | ||
| 232 | * -# From the MinGW-w64 Command Prompt: | 231 | * -# From the MinGW-w64 Command Prompt: |
| 233 | * \code | 232 | * \code |
| 234 | * $ cd C:\openbr\build-mingw64 | 233 | * $ cd C:\openbr\build-mingw64 |
| @@ -238,10 +237,8 @@ $ br -help | @@ -238,10 +237,8 @@ $ br -help | ||
| 238 | 237 | ||
| 239 | /*! | 238 | /*! |
| 240 | * \page osx_clang OS X Mountain Lion - Clang/LLVM 3.1 - x64 | 239 | * \page osx_clang OS X Mountain Lion - Clang/LLVM 3.1 - x64 |
| 241 | - * \brief Installation from source with Clang. | ||
| 242 | - * | ||
| 243 | * -# Download and install the latest "Xcode" and "Command Line Tools" from the <a href="https://developer.apple.com/downloads/index.action#">Apple Developer Downloads</a> page. | 240 | * -# Download and install the latest "Xcode" and "Command Line Tools" from the <a href="https://developer.apple.com/downloads/index.action#">Apple Developer Downloads</a> page. |
| 244 | - * -# <a href="http://www.cmake.org/files/v2.8/cmake-2.8.10.2.tar.gz">Download CMake 2.8.10.2</a> and install: | 241 | + * -# <a href="http://www.cmake.org/files/v2.8/cmake-2.8.10.2.tar.gz">Download CMake 2.8.10.2</a>. |
| 245 | * \code | 242 | * \code |
| 246 | * $ cd ~/Downloads | 243 | * $ cd ~/Downloads |
| 247 | * $ tar -xf cmake-2.8.10.2.tar.gz | 244 | * $ tar -xf cmake-2.8.10.2.tar.gz |
| @@ -252,7 +249,7 @@ $ br -help | @@ -252,7 +249,7 @@ $ br -help | ||
| 252 | * $ cd .. | 249 | * $ cd .. |
| 253 | * $ rm -r cmake-2.8.10.2 | 250 | * $ rm -r cmake-2.8.10.2 |
| 254 | * \endcode | 251 | * \endcode |
| 255 | - * -# <a href="http://sourceforge.net/projects/opencvlibrary/files/opencv-unix/2.4.3/OpenCV-2.4.3.tar.bz2/download">Download OpenCV 2.4.3</a> and install: | 252 | + * -# <a href="http://sourceforge.net/projects/opencvlibrary/files/opencv-unix/2.4.3/OpenCV-2.4.3.tar.bz2/download">Download OpenCV 2.4.3</a>. |
| 256 | * \code | 253 | * \code |
| 257 | * $ cd ~/Downloads | 254 | * $ cd ~/Downloads |
| 258 | * $ tar -xf OpenCV-2.4.3.tar.bz2 | 255 | * $ tar -xf OpenCV-2.4.3.tar.bz2 |
| @@ -266,14 +263,14 @@ $ br -help | @@ -266,14 +263,14 @@ $ br -help | ||
| 266 | * $ rm -r OpenCV-2.4.3 | 263 | * $ rm -r OpenCV-2.4.3 |
| 267 | * \endcode | 264 | * \endcode |
| 268 | * -# <a href="http://releases.qt-project.org/qt5/5.0.1/qt-mac-opensource-5.0.1-clang-offline.dmg">Download Qt 5.0.1</a> and install. | 265 | * -# <a href="http://releases.qt-project.org/qt5/5.0.1/qt-mac-opensource-5.0.1-clang-offline.dmg">Download Qt 5.0.1</a> and install. |
| 269 | - * -# Create a <a href="github.com">GitHub</a> account, follow their instructions for <a href="https://help.github.com/articles/set-up-git">setting up Git</a>, then clone: | 266 | + * -# Create a <a href="github.com">GitHub</a> account, follow their instructions for <a href="https://help.github.com/articles/set-up-git">setting up Git</a>. |
| 270 | * \code | 267 | * \code |
| 271 | * $ git clone https://github.com/biometrics/openbr.git | 268 | * $ git clone https://github.com/biometrics/openbr.git |
| 272 | * $ cd openbr | 269 | * $ cd openbr |
| 273 | * $ git submodule init | 270 | * $ git submodule init |
| 274 | * $ git submodule update | 271 | * $ git submodule update |
| 275 | * \endcode | 272 | * \endcode |
| 276 | - * -# Finally time to build OpenBR! | 273 | + * -# Build OpenBR! |
| 277 | * \code | 274 | * \code |
| 278 | * $ cd openbr | 275 | * $ cd openbr |
| 279 | * $ mkdir build | 276 | * $ mkdir build |
| @@ -282,7 +279,7 @@ $ br -help | @@ -282,7 +279,7 @@ $ br -help | ||
| 282 | * $ make -j4 | 279 | * $ make -j4 |
| 283 | * $ make install | 280 | * $ make install |
| 284 | * \endcode | 281 | * \endcode |
| 285 | - * -# Start hacking OpenBR! | 282 | + * -# Hack OpenBR! |
| 286 | * -# Open Qt Creator IDE | 283 | * -# Open Qt Creator IDE |
| 287 | * \code | 284 | * \code |
| 288 | * $ open ~/Qt5.0.1/Qt\ Creator.app | 285 | * $ open ~/Qt5.0.1/Qt\ Creator.app |
| @@ -292,6 +289,11 @@ $ br -help | @@ -292,6 +289,11 @@ $ br -help | ||
| 292 | * -# Browse to your prexisting build directory "~/openbr/build" then select "Continue". | 289 | * -# Browse to your prexisting build directory "~/openbr/build" then select "Continue". |
| 293 | * -# Select "Run CMake" then "Done". | 290 | * -# Select "Run CMake" then "Done". |
| 294 | * -# You're all set! You can find more information on Qt Creator <a href="http://qt-project.org/doc/qtcreator">here</a> if you need. | 291 | * -# You're all set! You can find more information on Qt Creator <a href="http://qt-project.org/doc/qtcreator">here</a> if you need. |
| 292 | + * -# Package OpenBR! | ||
| 293 | + * \code | ||
| 294 | + * $ cd openbr/build | ||
| 295 | + * $ make package | ||
| 296 | + * \endcode | ||
| 295 | * -# Build OpenBR documentation! | 297 | * -# Build OpenBR documentation! |
| 296 | * -# <a href="ftp://ftp.stack.nl/pub/users/dimitri/doxygen-1.8.3.1.src.tar.gz">Download Doxygen 1.8.3.1</a> and install: | 298 | * -# <a href="ftp://ftp.stack.nl/pub/users/dimitri/doxygen-1.8.3.1.src.tar.gz">Download Doxygen 1.8.3.1</a> and install: |
| 297 | * \code | 299 | * \code |
| @@ -306,7 +308,7 @@ $ br -help | @@ -306,7 +308,7 @@ $ br -help | ||
| 306 | * \endcode | 308 | * \endcode |
| 307 | * -# Modify build settings and recompile: | 309 | * -# Modify build settings and recompile: |
| 308 | * \code | 310 | * \code |
| 309 | - * $ cd ~/openbr/build | 311 | + * $ cd openbr/build |
| 310 | * $ cmake -D BR_BUILD_DOCUMENTATION=ON .. | 312 | * $ cmake -D BR_BUILD_DOCUMENTATION=ON .. |
| 311 | * $ make -j4 | 313 | * $ make -j4 |
| 312 | * $ open html/index.html | 314 | * $ open html/index.html |
| @@ -315,14 +317,12 @@ $ br -help | @@ -315,14 +317,12 @@ $ br -help | ||
| 315 | 317 | ||
| 316 | /*! | 318 | /*! |
| 317 | * \page linux_gcc Ubuntu 12.04 LTS - GCC 4.6.3 - x64 | 319 | * \page linux_gcc Ubuntu 12.04 LTS - GCC 4.6.3 - x64 |
| 318 | - * \brief Installation from source with GCC. | ||
| 319 | - * | ||
| 320 | - * -# Install GCC 4.6.3: | 320 | + * -# Install GCC 4.6.3. |
| 321 | * \code | 321 | * \code |
| 322 | * $ sudo apt-get update | 322 | * $ sudo apt-get update |
| 323 | * $ sudo apt-get install build-essential | 323 | * $ sudo apt-get install build-essential |
| 324 | * \endcode | 324 | * \endcode |
| 325 | - * -# <a href="http://www.cmake.org/files/v2.8/cmake-2.8.10.2.tar.gz">Download CMake 2.8.10.2</a> and install: | 325 | + * -# <a href="http://www.cmake.org/files/v2.8/cmake-2.8.10.2.tar.gz">Download CMake 2.8.10.2</a>. |
| 326 | * \code | 326 | * \code |
| 327 | * $ cd ~/Downloads | 327 | * $ cd ~/Downloads |
| 328 | * $ tar -xf cmake-2.8.10.2.tar.gz | 328 | * $ tar -xf cmake-2.8.10.2.tar.gz |
| @@ -333,7 +333,7 @@ $ br -help | @@ -333,7 +333,7 @@ $ br -help | ||
| 333 | * $ cd .. | 333 | * $ cd .. |
| 334 | * $ rm -r cmake-2.8.10.2 | 334 | * $ rm -r cmake-2.8.10.2 |
| 335 | * \endcode | 335 | * \endcode |
| 336 | - * -# <a href="http://sourceforge.net/projects/opencvlibrary/files/opencv-unix/2.4.3/OpenCV-2.4.3.tar.bz2/download">Download OpenCV 2.4.3</a> and install: | 336 | + * -# <a href="http://sourceforge.net/projects/opencvlibrary/files/opencv-unix/2.4.3/OpenCV-2.4.3.tar.bz2/download">Download OpenCV 2.4.3</a>. |
| 337 | * \code | 337 | * \code |
| 338 | * $ cd ~/Downloads | 338 | * $ cd ~/Downloads |
| 339 | * $ tar -xf OpenCV-2.4.3.tar.bz2 | 339 | * $ tar -xf OpenCV-2.4.3.tar.bz2 |
| @@ -346,21 +346,21 @@ $ br -help | @@ -346,21 +346,21 @@ $ br -help | ||
| 346 | * $ cd ../.. | 346 | * $ cd ../.. |
| 347 | * $ rm -r OpenCV-2.4.3 | 347 | * $ rm -r OpenCV-2.4.3 |
| 348 | * \endcode | 348 | * \endcode |
| 349 | - * -# <a href="http://releases.qt-project.org/qt5/5.0.1/qt-linux-opensource-5.0.1-x86_64-offline.run">Download Qt 5.0.1</a> and install: | 349 | + * -# <a href="http://releases.qt-project.org/qt5/5.0.1/qt-linux-opensource-5.0.1-x86_64-offline.run">Download Qt 5.0.1</a>. |
| 350 | * \code | 350 | * \code |
| 351 | * $ cd ~/Downloads | 351 | * $ cd ~/Downloads |
| 352 | * $ chmod +x qt-linux-opensource-5.0.1-x86_64-offline.run | 352 | * $ chmod +x qt-linux-opensource-5.0.1-x86_64-offline.run |
| 353 | * $ ./qt-linux-opensource-5.0.1-x86_64-offline.run | 353 | * $ ./qt-linux-opensource-5.0.1-x86_64-offline.run |
| 354 | * $ rm qt-linux-opensource-5.0.1-x86_64-offline.run | 354 | * $ rm qt-linux-opensource-5.0.1-x86_64-offline.run |
| 355 | * \endcode | 355 | * \endcode |
| 356 | - * -# Create a <a href="github.com">GitHub</a> account, follow their instructions for <a href="https://help.github.com/articles/set-up-git">setting up Git</a>, then clone: | 356 | + * -# Create a <a href="github.com">GitHub</a> account, follow their instructions for <a href="https://help.github.com/articles/set-up-git">setting up Git</a>. |
| 357 | * \code | 357 | * \code |
| 358 | * $ git clone https://github.com/biometrics/openbr.git | 358 | * $ git clone https://github.com/biometrics/openbr.git |
| 359 | * $ cd openbr | 359 | * $ cd openbr |
| 360 | * $ git submodule init | 360 | * $ git submodule init |
| 361 | * $ git submodule update | 361 | * $ git submodule update |
| 362 | * \endcode | 362 | * \endcode |
| 363 | - * -# Finally time to build OpenBR! | 363 | + * -# Build OpenBR! |
| 364 | * \code | 364 | * \code |
| 365 | * $ cd openbr | 365 | * $ cd openbr |
| 366 | * $ mkdir build | 366 | * $ mkdir build |
| @@ -369,7 +369,7 @@ $ br -help | @@ -369,7 +369,7 @@ $ br -help | ||
| 369 | * $ make -j4 | 369 | * $ make -j4 |
| 370 | * $ make install | 370 | * $ make install |
| 371 | * \endcode | 371 | * \endcode |
| 372 | - * -# Start hacking OpenBR! | 372 | + * -# Hack OpenBR! |
| 373 | * -# Open Qt Creator IDE | 373 | * -# Open Qt Creator IDE |
| 374 | * \code | 374 | * \code |
| 375 | * $ ~/Qt5.0.1/Tools/QtCreator/bin/qtcreator & | 375 | * $ ~/Qt5.0.1/Tools/QtCreator/bin/qtcreator & |
| @@ -379,14 +379,17 @@ $ br -help | @@ -379,14 +379,17 @@ $ br -help | ||
| 379 | * -# Browse to your prexisting build directory "~/openbr/build" then select "Next". | 379 | * -# Browse to your prexisting build directory "~/openbr/build" then select "Next". |
| 380 | * -# Select "Run CMake" then "Finish". | 380 | * -# Select "Run CMake" then "Finish". |
| 381 | * -# You're all set! You can find more information on Qt Creator <a href="http://qt-project.org/doc/qtcreator-2.6/">here</a> if you need. | 381 | * -# You're all set! You can find more information on Qt Creator <a href="http://qt-project.org/doc/qtcreator-2.6/">here</a> if you need. |
| 382 | + * -# Package OpenBR! | ||
| 383 | + * \code | ||
| 384 | + * $ cd openbr/build | ||
| 385 | + * $ make package | ||
| 386 | + * \endcode | ||
| 382 | */ | 387 | */ |
| 383 | 388 | ||
| 384 | /*! | 389 | /*! |
| 385 | * \page linux_icc Ubuntu 12.04 LTS - Intel C++ Studio XE 2013 - x64 | 390 | * \page linux_icc Ubuntu 12.04 LTS - Intel C++ Studio XE 2013 - x64 |
| 386 | - * \brief Installation from source with ICC. | ||
| 387 | - * | ||
| 388 | * -# Assuming you meet the eligibility requirements, <a href="http://software.intel.com/en-us/non-commercial-software-development">Download Intel C++ Studio XE 2013</a> and install. | 391 | * -# Assuming you meet the eligibility requirements, <a href="http://software.intel.com/en-us/non-commercial-software-development">Download Intel C++ Studio XE 2013</a> and install. |
| 389 | - * -# <a href="http://www.cmake.org/files/v2.8/cmake-2.8.10.2.tar.gz">Download CMake 2.8.10.2</a> and install: | 392 | + * -# <a href="http://www.cmake.org/files/v2.8/cmake-2.8.10.2.tar.gz">Download CMake 2.8.10.2</a>. |
| 390 | * \code | 393 | * \code |
| 391 | * $ cd ~/Downloads | 394 | * $ cd ~/Downloads |
| 392 | * $ tar -xf cmake-2.8.10.2.tar.gz | 395 | * $ tar -xf cmake-2.8.10.2.tar.gz |
| @@ -397,7 +400,7 @@ $ br -help | @@ -397,7 +400,7 @@ $ br -help | ||
| 397 | * $ cd .. | 400 | * $ cd .. |
| 398 | * $ rm -r cmake-2.8.10.2 | 401 | * $ rm -r cmake-2.8.10.2 |
| 399 | * \endcode | 402 | * \endcode |
| 400 | - * -# <a href="http://sourceforge.net/projects/opencvlibrary/files/opencv-unix/2.4.3/OpenCV-2.4.3.tar.bz2/download">Download OpenCV 2.4.3</a> and install: | 403 | + * -# <a href="http://sourceforge.net/projects/opencvlibrary/files/opencv-unix/2.4.3/OpenCV-2.4.3.tar.bz2/download">Download OpenCV 2.4.3</a>. |
| 401 | * \code | 404 | * \code |
| 402 | * $ cd ~/Downloads | 405 | * $ cd ~/Downloads |
| 403 | * $ tar -xf OpenCV-2.4.3.tar.bz2 | 406 | * $ tar -xf OpenCV-2.4.3.tar.bz2 |
| @@ -410,21 +413,21 @@ $ br -help | @@ -410,21 +413,21 @@ $ br -help | ||
| 410 | * $ cd ../.. | 413 | * $ cd ../.. |
| 411 | * $ rm -r OpenCV-2.4.3 | 414 | * $ rm -r OpenCV-2.4.3 |
| 412 | * \endcode | 415 | * \endcode |
| 413 | - * -# <a href="http://releases.qt-project.org/qt5/5.0.1/qt-linux-opensource-5.0.1-x86_64-offline.run">Download Qt 5.0.1</a> and install: | 416 | + * -# <a href="http://releases.qt-project.org/qt5/5.0.1/qt-linux-opensource-5.0.1-x86_64-offline.run">Download Qt 5.0.1</a>. |
| 414 | * \code | 417 | * \code |
| 415 | * $ cd ~/Downloads | 418 | * $ cd ~/Downloads |
| 416 | * $ chmod +x qt-linux-opensource-5.0.1-x86_64-offline.run | 419 | * $ chmod +x qt-linux-opensource-5.0.1-x86_64-offline.run |
| 417 | * $ ./qt-linux-opensource-5.0.1-x86_64-offline.run | 420 | * $ ./qt-linux-opensource-5.0.1-x86_64-offline.run |
| 418 | * $ rm qt-linux-opensource-5.0.1-x86_64-offline.run | 421 | * $ rm qt-linux-opensource-5.0.1-x86_64-offline.run |
| 419 | * \endcode | 422 | * \endcode |
| 420 | - * -# Create a <a href="github.com">GitHub</a> account, follow their instructions for <a href="https://help.github.com/articles/set-up-git">setting up Git</a>, then clone: | 423 | + * -# Create a <a href="github.com">GitHub</a> account, follow their instructions for <a href="https://help.github.com/articles/set-up-git">setting up Git</a>. |
| 421 | * \code | 424 | * \code |
| 422 | * $ git clone https://github.com/biometrics/openbr.git | 425 | * $ git clone https://github.com/biometrics/openbr.git |
| 423 | * $ cd openbr | 426 | * $ cd openbr |
| 424 | * $ git submodule init | 427 | * $ git submodule init |
| 425 | * $ git submodule update | 428 | * $ git submodule update |
| 426 | * \endcode | 429 | * \endcode |
| 427 | - * -# Finally time to build OpenBR! | 430 | + * -# Build OpenBR! |
| 428 | * \code | 431 | * \code |
| 429 | * $ cd openbr | 432 | * $ cd openbr |
| 430 | * $ mkdir build-icc | 433 | * $ mkdir build-icc |
| @@ -433,7 +436,7 @@ $ br -help | @@ -433,7 +436,7 @@ $ br -help | ||
| 433 | * $ make -j4 | 436 | * $ make -j4 |
| 434 | * $ make install | 437 | * $ make install |
| 435 | * \endcode | 438 | * \endcode |
| 436 | - * -# Start hacking OpenBR! | 439 | + * -# Hack OpenBR! |
| 437 | * -# Open Qt Creator IDE | 440 | * -# Open Qt Creator IDE |
| 438 | * \code | 441 | * \code |
| 439 | * $ ~/Qt5.0.1/Tools/QtCreator/bin/qtcreator & | 442 | * $ ~/Qt5.0.1/Tools/QtCreator/bin/qtcreator & |
| @@ -443,6 +446,11 @@ $ br -help | @@ -443,6 +446,11 @@ $ br -help | ||
| 443 | * -# Browse to your prexisting build directory "~/openbr/build" then select "Next". | 446 | * -# Browse to your prexisting build directory "~/openbr/build" then select "Next". |
| 444 | * -# Select "Run CMake" then "Finish". | 447 | * -# Select "Run CMake" then "Finish". |
| 445 | * -# You're all set! You can find more information on Qt Creator <a href="http://qt-project.org/doc/qtcreator-2.6/">here</a> if you need. | 448 | * -# You're all set! You can find more information on Qt Creator <a href="http://qt-project.org/doc/qtcreator-2.6/">here</a> if you need. |
| 449 | + * -# Package OpenBR! | ||
| 450 | + * \code | ||
| 451 | + * $ cd openbr/build | ||
| 452 | + * $ make package | ||
| 453 | + * \endcode | ||
| 446 | */ | 454 | */ |
| 447 | 455 | ||
| 448 | /*! | 456 | /*! |