diff --git a/config/AMDAIntegrationConfig.php b/config/AMDAIntegrationConfig.php index 1c0903e..3c28011 100644 --- a/config/AMDAIntegrationConfig.php +++ b/config/AMDAIntegrationConfig.php @@ -41,6 +41,7 @@ define('KERNEL_BUILD_TYPE', $config['KERNEL_BUILD_TYPE']); define('AMDA_KERNEL_DIR', $config['AMDA_KERNEL_DIR']); define('IHM_SRC_DIR', $config['IHM_SRC_DIR']); define('SPEASY_PROXY_URL', $config['SPEASY_PROXY_URL']); +define('SPEASY_PROXY_DATA', $config['SPEASY_PROXY_DATA']); define('GCC_BASE_DIR', TOOLS_BASE_DIR.'/gcc/4.7.2/rtf'); define('BOOST_BASE_DIR', TOOLS_BASE_DIR.'/gcc/4.7.2/boost'); @@ -49,6 +50,8 @@ define('DDRES_DIR',__DIR__.'/kernel'); define('AMDA_KERNEL_SRC_DIR', AMDA_KERNEL_DIR.'/src'); define('AMDA_KERNEL_BUILD_DIR', AMDA_KERNEL_DIR.'/build/'.KERNEL_BUILD_TYPE); + + //Path to AMDA_Integration source dir if (defined('INTEGRATION_BASE_PATH')) { define('INTEGRATION_SRC_DIR', INTEGRATION_BASE_PATH.'/src/'); diff --git a/config/current.env.template b/config/current.env.template index 98d1b31..8ed3aa6 100644 --- a/config/current.env.template +++ b/config/current.env.template @@ -16,3 +16,6 @@ AMDA_KERNEL_DIR='{:AMDA_KERNEL_DIR:}' ;Path to AMDA_IHM base dir IHM_SRC_DIR='{:IHM_SRC_DIR:}' +;Config for SpeasyGet +SPEASY_PROXY_URL='{:SPEASY_PROXY_URL:}' +SPEASY_PROXY_DATA='{:SPEASY_PROXY_DATA:}' \ No newline at end of file -- libgit2 0.21.2