X-Git-Url: https://git.teslayout.com/public/public/public/?p=anna.git;a=blobdiff_plain;f=README.md;h=27d8115ada6c3615d9721d042a331d0800bb0ad7;hp=06247b405a2464afdb45a467468dffe514d4206c;hb=af9c86ffb0e28d35ad94d99c5f77e41578c972b4;hpb=f28d977659db23f54b7a5badf6ef40b118e82ad9

diff --git a/README.md b/README.md
index 06247b4..27d8115 100644
--- a/README.md
+++ b/README.md
@@ -16,6 +16,16 @@ You could use my pre-commit specific template if you want to do some basic check
 
 ## Build project
 
+### With docker
+
+Architectures 'x86_64' and 'armv7l' are supported. Execute:
+
+     > tools/build-with-docker [variant: [Release]|Debug]
+
+Note: database resources building is unsupported at the moment using docker.
+
+### Natively
+
 This is a CMake based building suite.
 Install cmake:
 
@@ -30,19 +40,25 @@ You could specify type of build, 'Debug' or 'Release', for example:
      > cmake -DCMAKE_BUILD_TYPE=Debug .
      > cmake -DCMAKE_BUILD_TYPE=Release .
 
+You could avoid database resources compilation to ease the add of requirements:
+
+     > cmake -DSKIP_DATABASE_BUILD=1 .
+
 ## Clean project
 
      > make clean
 
-## Change the compiler to Clang++
+## Change the compilers
 
-     > cmake -DCMAKE_CXX_COMPILER=/usr/bin/clang++ 
+     > cmake -DCMAKE_CXX_COMPILER=/usr/bin/g++     -DCMAKE_C_COMPILER=/usr/bin/gcc
+     or
+     > cmake -DCMAKE_CXX_COMPILER=/usr/bin/clang++ -DCMAKE_C_COMPILER=/usr/bin/clang
 
 ## Some basic ubuntu requirements
 
 ### OpenSSL:
      > sudo apt-get install libssl-dev
- 
+
 ### Gnome XML:
      > sudo apt-get install libxml2-dev
 
@@ -57,20 +73,11 @@ You could specify type of build, 'Debug' or 'Release', for example:
 
 ### Oracle:
      https://help.ubuntu.com/community/Oracle%20Instant%20Client
-     Set 'ORACLE_HOME' environment variable in your profile, i.e.:
-        export ORACLE_HOME=/usr/lib/oracle/12.1/client64/
-
-     Be sure to create in that directory, a link to oracle includes,
-     for example:
 
-	> /usr/lib/oracle/12.1/client64$ ls -lrt
-	total 8
-	drwxr-xr-x 2 root root 4096 Feb 28 15:59 bin
-	drwxr-xr-x 2 root root 4096 Feb 28 15:59 lib
-	lrwxrwxrwx 1 root root   33 Feb 28 16:07 include -> /usr/include/oracle/12.1/client64
+     After instalation of basic/sqlplus/devel, edit CMakeLists.txt
+     and update oracle includes, for example:
 
-     The alternative is to edit SConstruct file directly to set
-     oracle includes directory.
+       include_directories(/usr/include/oracle/<version>/client64/include)
 
 ### Oracle-OpenLDAP conflict:
      as usual, Oracle is doing things very bad. Move the ldap.h from oracle includes, i.e.:
@@ -90,7 +97,7 @@ You could specify type of build, 'Debug' or 'Release', for example:
      > cd /usr/src/gtest
      > sudo cmake CMakeLists.txt
      > sudo make
- 
+
      Copy or symlink libgtest.a and libgtest_main.a to your /usr/lib folder:
      > sudo cp *.a /usr/lib
 
@@ -116,14 +123,18 @@ Execute 'make test'
 
 To install headers, libraries, and examples, execute:
 
-     > make install
+     > sudo make install
 
 Optionally you could specify another prefix for installation:
 
-     > cmake -DCMAKE_INSTALL_PREFIX=$HOME/anna_deploy .
+     > cmake -DMY_OWN_INSTALL_PREFIX=$HOME/anna-deploy
+     > make install
 
 ## Uninstall
 
      > cat install_manifest.txt | sudo xargs rm
 
+## AOTS (Agents-Oriented Testing Setup)
+
+See INSTALL_AOTS.md