Potential CI server #26 issue fix

ipa320 · Nov 16, 2023 · 317995d · 317995d
1 parent 960ffb1
commit 317995d
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 26 deletions.
diff --git a/haros_runner.sh b/haros_runner.sh
@@ -71,24 +71,24 @@ haros init
 
 echo ""
 echo "## Call the HAROS plugin to extract the ros-models ##"
-if [ -n $ROS_PYTHON_VERSION ]
+if [ -n $PYTHON_VERSION ]
 then
-  if [[ $ROS_PYTHON_VERSION == "2" ]]
+  if [[ $PYTHON_VERSION == "2" ]]
   then
     if [ "${2}" = "--all" ]
     then
-      python /home/divya/Documents/Master_Thesis/ros_model_extractot_fork/ros-model-extractors/ros_model_extractor.py --package "$1" --"${3}" --model-path "${4}" --ws "${5}" --repo $model_repo -a>> extractor.log
+      python /ros_model_extractor.py --package "$1" --"${3}" --model-path "${4}" --ws "${5}" --repo $model_repo -a>> extractor.log
     else
-      python /home/divya/Documents/Master_Thesis/ros_model_extractot_fork/ros-model-extractors/ros_model_extractor.py --package "$1" --name "$2" --"${3}" --model-path "${4}" --ws "${5}" --repo $model_repo>> extractor.log
+      python /ros_model_extractor.py --package "$1" --name "$2" --"${3}" --model-path "${4}" --ws "${5}" --repo $model_repo>> extractor.log
     fi
     #cat extractor.log
-  elif [[ $ROS_PYTHON_VERSION == "3" ]]
+  elif [[ $PYTHON_VERSION == "3" ]]
   then
     if [ "${2}" = "--all" ]
     then
-      python3 /home/divya/Documents/Master_Thesis/ros_model_extractot_fork/ros-model-extractors/ros_model_extractor.py --package "$1" --"${3}" --model-path "${4}" --ws "${5}" --path-to-src "$path_to_src_code" --repo $model_repo -a >> ${4}/extractor.log
+      python3 /ros_model_extractor.py --package "$1" --"${3}" --model-path "${4}" --ws "${5}" --path-to-src "$path_to_src_code" --repo $model_repo -a >> ${4}/extractor.log
     else
-      python3 /home/divya/Documents/Master_Thesis/ros_model_extractot_fork/ros-model-extractors/ros_model_extractor.py --package "$1" --name "$2" --"${3}" --model-path "${4}" --ws "${5}" --path-to-src "$path_to_src_code" --repo $model_repo>> ${4}/extractor.log
+      python3 /ros_model_extractor.py --package "$1" --name "$2" --"${3}" --model-path "${4}" --ws "${5}" --path-to-src "$path_to_src_code" --repo $model_repo>> ${4}/extractor.log
     fi
     #cat extractor.log 
   else

diff --git a/rosHumble_model_extractor_scripts/Ros_Extractor.py b/rosHumble_model_extractor_scripts/Ros_Extractor.py
@@ -313,28 +313,16 @@ def extract_primitives(self, node, parser, analysis, RosModel_node, roscomponent
         #ROS2
         if node.language == "cpp":
           for call in (CodeQuery(gs).all_calls.get()):
-              print("-------------------")
-
-              printDict = {"full_name":call.full_name,
-                           "canonical_type": call.canonical_type,
-                            "call_variable": str(call),
-                            "line_no":call.line,
-                            "name":call.name,
-                            "column":call.column,
-                            "file_name": call.file}
-
 
               if "Publisher" in str(call):
-                print("Printing calll========================", call)
                 if len(call.arguments) > 1:
                   name = analysis._extract_topic(call, topic_pos=0)
                   msg_type = analysis._extract_message_type(call)
                   queue_size = analysis._extract_queue_size(call, queue_pos=1)
                   if name!="?" or msg_type!="?":
                     RosModel_node.add_publisher(name, msg_type.replace("/",".").replace(".msg",""))
 
-              if "Subscription" in str(call):
-                #print(call)
+              if "Subscriber" in str(call):
                 if len(call.arguments) > 1:
                   name = analysis._extract_topic(call, topic_pos=0)
                   msg_type = analysis._extract_message_type(call)
@@ -343,8 +331,6 @@ def extract_primitives(self, node, parser, analysis, RosModel_node, roscomponent
                     RosModel_node.add_subscriber(name, msg_type.replace("/",".").replace(".msg",""))
 
               if "Service" in str(call) or "::srv::" in str(call.function):
-                print(call.function.canonical_type)
-                print(printDict)
                 if len(call.arguments) > 1:
                   name = analysis._extract_topic(call, topic_pos=0)
                   srv_type = analysis._extract_message_type(call)

diff --git a/rosHumble_model_extractor_scripts/ros2runner.py b/rosHumble_model_extractor_scripts/ros2runner.py
@@ -34,7 +34,7 @@ def __init__(self,
                         outputDir=outputDir)
 
     def runColconBuild(self,):
-        subprocess.run(["colcon", "build", "--cmake-args", "-DCMAKE_EXPORT_COMPILE_COMMANDS=ON"])
+        subprocess.run(["colcon", "build", "--cmake-args"])   #CMake Colcon Warning fix
 
     def runColconList(self,):
         os.system('colcon list > /tmp/colcon_list.txt')

diff --git a/rosHumble_model_extractor_scripts/ros_pkg_runner.py b/rosHumble_model_extractor_scripts/ros_pkg_runner.py
@@ -110,7 +110,7 @@ def cleanUPsrc(self):
 
     def callHarosPlugin(self,):
 
-        print("Update code to execute harosPlugig command!!")
+        print("Update code to execute harosPlugin command!!")
 
     def mkOuputDir(self,):
 

diff --git a/ros_model_extractor.py b/ros_model_extractor.py
@@ -43,8 +43,8 @@ def launch(self):
 
     #BONSAI PARSER
     parser = CppAstParser(workspace = ws)
-    parser.set_library_path("/usr/lib/llvm-14/lib")
-    parser.set_standard_includes("/usr/lib/llvm-14/lib/clang/14.0.0/include")
+    parser.set_library_path("/usr/lib/llvm-10/lib")
+    parser.set_standard_includes("/usr/lib/llvm-14/lib/clang/10.0.0/include")
     db_dir = os.path.join(ws, "build")
     if os.path.isfile(os.path.join(db_dir, "compile_commands.json")):
         parser.set_database(db_dir)