Commit fa7916179e3d8c29515aecd8f945f1da95f52591
1 parent
9937b488
Exists in
master
and in
66 other branches
Set to version 1.4.0
Showing
3 changed files
with
22 additions
and
3 deletions
Show diff stats
config/AMDAIntegrationConfig.php
... | ... | @@ -102,6 +102,25 @@ switch ($localIP) |
102 | 102 | define('IHM_SRC_DIR', '/home/myriam/workspacenew/AMDA_IHM/'); |
103 | 103 | |
104 | 104 | break; |
105 | + | |
106 | + case '195.83.102.54' : | |
107 | + define('PLATFORM_NAME','amdatest'); | |
108 | + | |
109 | + //AKKA - Force the IP client value to prevent a bug with DDServer | |
110 | + // The IP client must be write with the pattern : xxx.xxx.xxx.xxx | |
111 | + define('FORCE_CLIENT_IP', '195.083.102.054'); | |
112 | + | |
113 | + // true for AKKA | |
114 | + // false or not defined for IRAP | |
115 | + // It's used to select the correct SVN path for depotInfo repository | |
116 | + //define('AKKA_SVN', 'true'); | |
117 | + | |
118 | + //Path to AMDA_Kernel base dir | |
119 | + define('NEWKERNEL_BASE_PATH', '/home/myriam/AMDA_Kernel/'); | |
120 | + | |
121 | + //Path to AMDA_IHM base dir | |
122 | + define('IHM_SRC_DIR', '/home/myriam/AMDA_IHM/'); | |
123 | + break; | |
105 | 124 | } |
106 | 125 | |
107 | 126 | ... | ... |
doc/Doxyfile
... | ... | @@ -32,13 +32,13 @@ DOXYFILE_ENCODING = UTF-8 |
32 | 32 | # title of most generated pages and in a few other places. |
33 | 33 | # The default value is: My Project. |
34 | 34 | |
35 | -PROJECT_NAME = "AMDA-Kernel Phase 3 - Integration" | |
35 | +PROJECT_NAME = "AMDA_Integration - Prestation AKKA 2016 - Release 1" | |
36 | 36 | |
37 | 37 | # The PROJECT_NUMBER tag can be used to enter a project or revision number. This |
38 | 38 | # could be handy for archiving the generated documentation or if some version |
39 | 39 | # control system is used. |
40 | 40 | |
41 | -PROJECT_NUMBER = 1.2.0 | |
41 | +PROJECT_NUMBER = 1.4.0 | |
42 | 42 | |
43 | 43 | # Using the PROJECT_BRIEF tag one can provide an optional one line description |
44 | 44 | # for a project that appears at the top of each page and should give viewer a | ... | ... |