diff --git a/php/config.php b/php/config.php index 99b4c19..08f9ef9 100644 --- a/php/config.php +++ b/php/config.php @@ -16,6 +16,7 @@ require_once(INTEGRATION_BASE_PATH.'config/AMDAIntegrationConfig.php'); //AKKA - For compatibility with IHM define('BASE_PATH', IHM_SRC_DIR); +define('AMDA_IHM', IHM_SRC_DIR); //log for AmdaUpdate/AmdaInstall define('log', LOG_DIR.'LOG'); diff --git a/php/getEnv.php b/php/getEnv.php index ec93f1f..8e79b6c 100644 --- a/php/getEnv.php +++ b/php/getEnv.php @@ -9,9 +9,8 @@ $variables = array( 'NEWMETA', 'AMDAINTERNALDIR', 'AMDAINSTALLATION', - 'DDROOT', - 'GCCROOT', - 'BUILD_TYPE', + 'COTS_BASE_DIR', + 'KERNEL_BUILD_TYPE', 'PROXY_HOST', 'PROXY_PORT', 'PROXY_NAME', diff --git a/php/my_config.php b/php/my_config.php index f14e90e..59a85a6 100644 --- a/php/my_config.php +++ b/php/my_config.php @@ -25,24 +25,6 @@ define('TITLE', 'AMDANEW-Test'); // here for additional flexibility define('MAX_UPLOADED_FILESIZE',30000000); // in bytes !!! -# ToDo - Check the following variables - -define('AMDA_SPASE_INTERFACE','/home/brenard/AMDA-GIT/AMDA_SPASE_INTERFACE/'); - -define('NEWMETA','/home/brenard/AMDA-GIT/NEWMETA/'); - -define('AMDAINTERNALDIR','/home/brenard/AMDA-GIT/AMDA_INTERNAL_METADATA/'); - -define('AMDAINSTALLATION','/home/brenard/AMDA-GIT'); - -define('DDROOT','/opt2/local'); - -define('BUILD_TYPE','Debug'); - -define('AMDA_IHM','/home/brenard/AMDA-GIT/AMDA_IHM/'); - -define('GCCROOT','/opt2/tools/gcc/4.7.2/rtf'); - #define('PROXY_HOST',''); #define('PROXY_PORT',''); #define('PROXY_NAME',''); diff --git a/update_amda/generate_param_info b/update_amda/generate_param_info index 13dd604..f887923 100755 --- a/update_amda/generate_param_info +++ b/update_amda/generate_param_info @@ -9,7 +9,7 @@ CRT_PWD=`pwd` cd $AMDAINSTALLATION/AMDA_Kernel/app-generate-paraminfo -export PATH=$AMDAINSTALLATION/AMDA_Kernel/build/${BUILD_TYPE}/bin:$PATH +export PATH=$AMDAINSTALLATION/AMDA_Kernel/build/${KERNEL_BUILD_TYPE}/bin:$PATH export DDPATH=$AMDAINSTALLATION/AMDA_Kernel/app-generate-paraminfo PARAM_INFO_PATH=$NEWMETA/ParamInfo @@ -64,11 +64,11 @@ else fi if [[ $line == app.plugin* ]]; then - line="app.plugin=./../build/"$BUILD_TYPE"/plugin/" + line="app.plugin=./../build/"$KERNEL_BUILD_TYPE"/plugin/" fi if [[ $line == app.process.LIB* ]]; then - line="app.process.LIB=-L../build/"$BUILD_TYPE"/lib/ -lParameters" + line="app.process.LIB=-L../build/"$KERNEL_BUILD_TYPE"/lib/ -lParameters" fi echo $line >> ./app.properties.temp -- libgit2 0.21.2