Complete build of AIR application

templates/concurrency_view/aadl_4_makefile/system.tmplt

@@ -55,6 +55,8 @@ air:
         cd deploymentview_final && rm -f Makefile && (configure --keep-files-silent)
 	@echo "XML generated, AIR configuration done, building..."
 	make -C @_Node_Names_@ -f Makefile.@_Node_Names_@ air
+	@echo Putting partitions alltogether
+	make -f Makefile.air && mkdir -p ../binaries && cp deploymentview_final/executable/* ../binaries
 @@END_TABLE@@
 
 @_Nodes_@

templates/concurrency_view/air_gpr/partition.tmplt

@@ -30,7 +30,7 @@ project @_CAPITALIZE:Name_@_AIR is
 
    for Create_Missing_Dirs use "True";
    for Object_Dir use "@_LOWER:Name_@_obj";
-   for Exec_Dir   use "../../binaries";
+   for Exec_Dir   use "../deploymentview_final/@_Name_@";
 
    for Languages use ("Ada", "C");
 
@@ -61,7 +61,7 @@ project @_CAPITALIZE:Name_@_AIR is
 
    package Builder is
       for Executable_Suffix use ".exe";
-      for Executable ("main.c") use "@_Name_@_leon3_rtems";
+      for Executable ("main.c") use "@_Name_@";
    end Builder;
 @@-- Not all systems use Ada so we must not always include Ada dataview folder
 @@TABLE@@
@@ -100,6 +100,7 @@ project @_CAPITALIZE:Name_@_AIR is
        "cheddar_schedule.hh",
        "cheddar_types.hh",
        "config.c",
+       "init.c",
        "config_leon3_drvmgr.c",
        "config_leon4_n2x.c",
        "grspw_api.c",
@@ -140,5 +141,4 @@ project @_CAPITALIZE:Name_@_AIR is
        "trace_manager.cc",
        "um_threads.c");
 
-
 end @_CAPITALIZE:Name_@_AIR;

templates/concurrency_view/c_pohi_gpr/node.tmplt

@@ -20,6 +20,8 @@ debug_rtems_leon3_with_ada:
 
 air:
 @@TABLE@@
+	# We need to compile and link separately because the linker script must
+	# be copied to the obj folder. Path cannot be set manually with -T
 	gprbuild -c -v --config=air.cgpr -P @_LOWER:Partition_Names_@_air.gpr -XCFG="Debug" -cargs:C -DSTATIC=""
 	cp ../deploymentview_final/@_LOWER:Partition_Names_@/linkcmds.inc @_LOWER:Partition_Names_@_obj/
 	gprbuild -l -v --config=air.cgpr -P @_LOWER:Partition_Names_@_air.gpr -XCFG="Debug" -cargs:C -DSTATIC=""