CDPP / AMDA_IHM

Commit c0b8b7300a311abfb04a7b83e2d22a891c73ecbe

Authored by Benjamin Renard
1 parent 1655606d
Exists in master and in 110 other branches 10098, 10178, 5390, 6629, 6728, 6920, 7494, 7497, 7616, 8459, 8528, 8928, 9014, 9016Bis, 9017, 9049, 9084, 9259, 9326, 9345, 9505, 9660, 9750, 9750.bck, 9800, 9980, FER_10285, FER_10400, FER_10435, FER_10557, FER_10663, FER_10765, FER_10828, FER_10828_2, FER_10829, FER_10836, FER_10852, FER_10934, FER_11100, FER_11242, FER_11478, FER_11500, FER_11537, FER_11586, FER_11588, FER_5119, FER_5165, FER_6265, FER_6860, FER_6899, FER_6951, FER_7618, FER_7862, FER_8455, FER_9629, FER_9660, FER_9915, FER_CR41, FER_CR42, FER_CR43, FER_TFCat, Histo1D2D, MAZ_10936, MAZ_11362, MAZ_11427, MAZ_6018, MAZ_9016_New, MAZ_FIX_9016, New_ColorMaps, SpeasyGet, alias, amdadev, amdadev_test, anr_tempete, catalog-histo, create-user, cu2022, data-activities, density_maps, develop, epn-tap, expression-parser-bre, frames-transformation, hapi, homePage, install-rework, master_vge, minimize, mlplasmas, multiplot, new-save-plot-request, openam, plot-request, plot-request-update, plot-tt-catalog, remoteData, rm_5118, rm_5776, rm_6912, rm_6912_bis, rm_7926, rm_8932, save-other-requests, save-plot, save-plot-request, shared-objects-updater, special-params, sum-components-indexes, test-merge, ws_get_catalog

Re-use variables defined in AMDA_Integration

Showing 4 changed files with 6 additions and 24 deletions   Show diff stats
Inline Side-by-side
php/config.php
  Diff comments   View file @c0b8b73
... ... @@ -16,6 +16,7 @@ require_once(INTEGRATION_BASE_PATH.'config/AMDAIntegrationConfig.php');
16 16  
17 17 //AKKA - For compatibility with IHM
18 18 define('BASE_PATH', IHM_SRC_DIR);
  19 +define('AMDA_IHM', IHM_SRC_DIR);
19 20  
20 21 //log for AmdaUpdate/AmdaInstall
21 22 define('log', LOG_DIR.'LOG');
... ...
php/getEnv.php
  Diff comments   View file @c0b8b73
... ... @@ -9,9 +9,8 @@ $variables = array(
9 9 'NEWMETA',
10 10 'AMDAINTERNALDIR',
11 11 'AMDAINSTALLATION',
12   - 'DDROOT',
13   - 'GCCROOT',
14   - 'BUILD_TYPE',
  12 + 'COTS_BASE_DIR',
  13 + 'KERNEL_BUILD_TYPE',
15 14 'PROXY_HOST',
16 15 'PROXY_PORT',
17 16 'PROXY_NAME',
... ...
php/my_config.php
  Diff comments   View file @c0b8b73
... ... @@ -25,24 +25,6 @@ define('TITLE', 'AMDANEW-Test');
25 25 // here for additional flexibility
26 26 define('MAX_UPLOADED_FILESIZE',30000000); // in bytes !!!
27 27  
28   -# ToDo - Check the following variables
29   -
30   -define('AMDA_SPASE_INTERFACE','/home/brenard/AMDA-GIT/AMDA_SPASE_INTERFACE/');
31   -
32   -define('NEWMETA','/home/brenard/AMDA-GIT/NEWMETA/');
33   -
34   -define('AMDAINTERNALDIR','/home/brenard/AMDA-GIT/AMDA_INTERNAL_METADATA/');
35   -
36   -define('AMDAINSTALLATION','/home/brenard/AMDA-GIT');
37   -
38   -define('DDROOT','/opt2/local');
39   -
40   -define('BUILD_TYPE','Debug');
41   -
42   -define('AMDA_IHM','/home/brenard/AMDA-GIT/AMDA_IHM/');
43   -
44   -define('GCCROOT','/opt2/tools/gcc/4.7.2/rtf');
45   -
46 28 #define('PROXY_HOST','');
47 29 #define('PROXY_PORT','');
48 30 #define('PROXY_NAME','');
... ...
update_amda/generate_param_info
  Diff comments   View file @c0b8b73
... ... @@ -9,7 +9,7 @@ CRT_PWD=`pwd`
9 9  
10 10 cd $AMDAINSTALLATION/AMDA_Kernel/app-generate-paraminfo
11 11  
12   -export PATH=$AMDAINSTALLATION/AMDA_Kernel/build/${BUILD_TYPE}/bin:$PATH
  12 +export PATH=$AMDAINSTALLATION/AMDA_Kernel/build/${KERNEL_BUILD_TYPE}/bin:$PATH
13 13 export DDPATH=$AMDAINSTALLATION/AMDA_Kernel/app-generate-paraminfo
14 14  
15 15 PARAM_INFO_PATH=$NEWMETA/ParamInfo
... ... @@ -64,11 +64,11 @@ else
64 64 fi
65 65  
66 66 if [[ $line == app.plugin* ]]; then
67   - line="app.plugin=./../build/"$BUILD_TYPE"/plugin/"
  67 + line="app.plugin=./../build/"$KERNEL_BUILD_TYPE"/plugin/"
68 68 fi
69 69  
70 70 if [[ $line == app.process.LIB* ]]; then
71   - line="app.process.LIB=-L../build/"$BUILD_TYPE"/lib/ -lParameters"
  71 + line="app.process.LIB=-L../build/"$KERNEL_BUILD_TYPE"/lib/ -lParameters"
72 72 fi
73 73  
74 74 echo $line >> ./app.properties.temp
... ...