CDPP / AMDA_Integration

Commit a04159d9f3a8367000bce8dc9a38f9121f08f5df

Authored by Benjamin Renard
1 parent 570d7d45
Exists in master and in 60 other branches 10098, 4797, 5390, 6728, 7616, 8528, 8928, 9016Bis, 9049, 9084, 9259, 9326, FER_10400, FER_10663, FER_11100, FER_11242, FER_11500, FER_11586, FER_11588, FER_6265, FER_6860, FER_6951, FER_7618, FER_8455, FER_9629, FER_9915, FER_CR41, FER_CR42, FER_CR43, FER_TFCat, Histo1D2D, MAZ_10936, MAZ_11362, MAZ_6018, MAZ_9016_New, MAZ_FIX_9016, New_ColorMaps, SpeasyGet, amdadev, anr_tempete, cu2022, density_maps, develop, evol-6371, expression-parser-bre, frames-transformation, master_vge, mlplasmas, multiplot, new-save-plot-request, plot-request, plot-tt-catalog, rm_6912, rm_7926, rm_8932, save-other-requests, shared-objects-updater, sum-components-indexes, test-merge, ws_get_catalog

Define common library path for compilation (#6371)

Showing 3 changed files with 13 additions and 3 deletions   Show diff stats
Inline Side-by-side
src/Request/Config/KernelConfigClass.php
  Diff comments   View file @a04159d
@@ -121,6 +121,11 @@ class KernelConfigClass @@ -121,6 +121,11 @@ class KernelConfigClass
121 { 121 {
122 return MissionInfo; 122 return MissionInfo;
123 } 123 }
  124 +
  125 + public static function getCommonLibPath()
  126 + {
  127 + return CommonLib;
  128 + }
124 129
125 public static function getKernelBinPath() 130 public static function getKernelBinPath()
126 { 131 {
@@ -173,7 +178,8 @@ class KernelConfigClass @@ -173,7 +178,8 @@ class KernelConfigClass
173 178
174 $appProperties["app.plugin"] = AMDA_KERNEL_BUILD_DIR.'/'.self::$pluginDir; 179 $appProperties["app.plugin"] = AMDA_KERNEL_BUILD_DIR.'/'.self::$pluginDir;
175 $appProperties["app.process.src"] = $compilation_path.self::$userSrcDir; 180 $appProperties["app.process.src"] = $compilation_path.self::$userSrcDir;
176 - $appProperties["app.process.lib"] = $compilation_path.self::$userLibDir; 181 + $appProperties["app.process.lib"] = self::getCommonLibPath();
  182 + $appProperties["app.process.userlib"] = $compilation_path.self::$userLibDir;
177 $appProperties["app.process.CXX_COMPILER"] = self::$cxxCompiler; 183 $appProperties["app.process.CXX_COMPILER"] = self::$cxxCompiler;
178 $appProperties["app.process.CMAKE_CXX_FLAGS"] = self::$cmakeFlags; 184 $appProperties["app.process.CMAKE_CXX_FLAGS"] = self::$cmakeFlags;
179 185
src/Request/ParamsRequestImpl/Nodes/Params/ParamNodeClass.php
  Diff comments   View file @a04159d
@@ -14,6 +14,7 @@ define ("PARAM_GAP", "gap_threshold"); @@ -14,6 +14,7 @@ define ("PARAM_GAP", "gap_threshold");
14 define ("PARAM_GET", "get"); 14 define ("PARAM_GET", "get");
15 define ("PARAM_PROCESS", "process"); 15 define ("PARAM_PROCESS", "process");
16 define ("PARAM_PROCESS_DESCRIPTION", "description"); 16 define ("PARAM_PROCESS_DESCRIPTION", "description");
  17 +define ("PARAM_PROCESS_USERPROCESS", "userProcess");
17 define ("PARAM_OUTPUT", "output"); 18 define ("PARAM_OUTPUT", "output");
18 19
19 abstract class ParamGetTypeEnum 20 abstract class ParamGetTypeEnum
@@ -109,11 +110,14 @@ class ParamNodeClass extends NodeClass @@ -109,11 +110,14 @@ class ParamNodeClass extends NodeClass
109 return NULL; 110 return NULL;
110 } 111 }
111 112
112 - public function setProcess($process, $process_info) 113 + public function setProcess($process, $process_info, $isUserProcess = false)
113 { 114 {
114 $node = $this->getChildInstanceByName(PARAM_PROCESS, true); 115 $node = $this->getChildInstanceByName(PARAM_PROCESS, true);
115 $node->setValue($process); 116 $node->setValue($process);
116 $node->setAttribute(PARAM_PROCESS_DESCRIPTION, $process_info); 117 $node->setAttribute(PARAM_PROCESS_DESCRIPTION, $process_info);
  118 + if ($isUserProcess) {
  119 + $node->setAttribute(PARAM_PROCESS_USERPROCESS, $isUserProcess ? "true" : "false");
  120 + }
117 } 121 }
118 122
119 public function setOutput() 123 public function setOutput()
src/Request/ParamsRequestImpl/ParamsRequestDataClass.php
  Diff comments   View file @a04159d
@@ -163,7 +163,7 @@ class ParamsRequestDataClass extends ProcessRequestDataClass @@ -163,7 +163,7 @@ class ParamsRequestDataClass extends ProcessRequestDataClass
163 else 163 else
164 $amdaParamNode->setParamName($getParam['paramid']); 164 $amdaParamNode->setParamName($getParam['paramid']);
165 } 165 }
166 - $newParam->setProcess($expression, $expression_info); 166 + $newParam->setProcess($expression, $expression_info, true);
167 $newParam->setOutput(); 167 $newParam->setOutput();
168 168
169 $this->processParamsToCreate[$paramId] = array('param' => $newParam, 'dateModif' => $dateModif); 169 $this->processParamsToCreate[$paramId] = array('param' => $newParam, 'dateModif' => $dateModif);