Many fixes in templates related to relative paths and AIR and RTEMS paths.

templates/concurrency_view/air_cgpr/compile2

  -I"/home/taste/tool-src/AADLib/examples/air/hello/hello_impl/node_a/../polyorb-hi-c/include"
  "-I/home/taste/tool-src/AADLib/examples/air/hello"
- -I/home/taste/air/air/pmk/core/include
- -I/home/taste/air/air/pmk/arch/sparc/include
- -I/home/taste/air/air/install/libs/imaspex/include/
+ -I/home/taste/tool-src/air/air/pmk/core/include
+ -I/home/taste/tool-src/air/air/pmk/arch/sparc/include
+ -I/home/taste/tool-src/air/air/install/libs/imaspex/include/
  -I/home/taste/tool-inst/include/ocarina/runtime/polyorb-hi-c/include
  -I'/home/taste/tool-src/AADLib/examples/air/hello/'
 

templates/concurrency_view/air_cgpr/partition.tmplt

@@ -46,12 +46,12 @@ configuration project AIR is
           "-DGRLEON3",
           "-ffunction-sections",
           "-fdata-sections",
-          "-B/home/taste/air/air/install/libs/libprintf/",
-          "-B/home/taste/air/air/install/libs/libair/",
+          "-B/home/taste/tool-src/air/air/install/libs/libprintf/",
+          "-B/home/taste/tool-src/air/air/install/libs/libair/",
           "-DLEON_RTEMS",
           "-DLEON3",
           "-DGAISLER",
-          "-B/home/taste/air/air/install/pos/rtems5/rtems5-install/sparc-rtems5/leon3/lib",
+          "-B/home/taste/tool-src/air/air/install/pos/rtems5/rtems5-install/sparc-rtems5/leon3/lib",
           "-specs=bsp_specs",
           "-qrtems",
           "-mcpu=leon3");
@@ -81,13 +81,13 @@ configuration project AIR is
        for Default_Switches ("C") use
            ("--pipe",
             "-g",
-            "-B/home/taste/air/air/install/pos/rtems5/rtems5-install/sparc-rtems5/leon3/lib",
-            "-B/home/taste/air/air/install/libs/libprintf/",
-            "-B/home/taste/air/air/install/libs/libair/",
+            "-B/home/taste/tool-src/air/air/install/pos/rtems5/rtems5-install/sparc-rtems5/leon3/lib",
+            "-B/home/taste/tool-src/air/air/install/libs/libprintf/",
+            "-B/home/taste/tool-src/air/air/install/libs/libair/",
             "-specs=bsp_specs",
             "-qrtems",
             "-lm",
-            --  "-L/opt/rtems-ada/lib/gcc/sparc-rtems5/7.3.0/leon3/adalib",
+            --  "-L/opt/rtems-5.1-2019.07.25/lib/gcc/sparc-rtems5/7.4.1/leon3/adalib",
             "-L/home/taste/tool-inst/include/ocarina/runtime/polyorb-hi-c/libs/leon-rtems4.12/",
             "-ffunction-sections",
             "-fdata-sections",
@@ -98,15 +98,15 @@ configuration project AIR is
             "-Wl,--start-group",
             "-lrtemscpu",
             "-lrtemsbsp",
-            "/home/taste/air/air/install/libs/libprintf/libprintf.a",
-            "/home/taste/air/air/install/libs/libair/libair.a",
-            "/home/taste/air/air/install/libs/imaspex/imaspex.a",
+            "/home/taste/tool-src/air/air/install/libs/libprintf/libprintf.a",
+            "/home/taste/tool-src/air/air/install/libs/libair/libair.a",
+            "/home/taste/tool-src/air/air/install/libs/imaspex/imaspex.a",
             "-Wl,--end-group",
             "-mcpu=leon3");
        for Default_Switches ("Ada") use
            ("--pipe",
             "-g",
-            "-B/opt/rtems-ada/sparc-rtems5/leon3/lib",
+            "-B/opt/rtems-5.1-2019.07.25/sparc-rtems5/leon3/lib",
             "-specs=bsp_specs",
             "-qrtems",
             "-lm",

templates/concurrency_view/c_pohi_rtems_with_ada_cgpr/partition.tmplt

@@ -47,7 +47,7 @@ configuration project RTEMS_WITH_ADA is
           "-DLEON3",
           "-DGAISLER",
           "-DNDEBUG",
-          "-B/opt/rtems-ada/sparc-rtems5/leon3/lib",
+          "-B/opt/rtems-5.1-2019.07.25/sparc-rtems5/leon3/lib",
           "-specs=bsp_specs",
           "-qrtems",
           "-mcpu=cypress",
@@ -79,18 +79,18 @@ configuration project RTEMS_WITH_ADA is
        for Default_Switches ("C") use
            ("--pipe",
             "-g",
-            "-B/opt/rtems-ada/sparc-rtems5/leon3/lib",
+            "-B/opt/rtems-5.1-2019.07.25/sparc-rtems5/leon3/lib",
             "-specs=bsp_specs",
             "-qrtems",
             "-lm",
-            "-L/opt/rtems-ada/lib/gcc/sparc-rtems5/7.3.0/leon3/adalib",
+            "-L/opt/rtems-5.1-2019.07.25/lib/gcc/sparc-rtems5/7.4.1/leon3/adalib",
             "-lgnat",
             "-lgnarl",
             "-mcpu=cypress");
        for Default_Switches ("Ada") use
            ("--pipe",
             "-g",
-            "-B/opt/rtems-ada/sparc-rtems5/leon3/lib",
+            "-B/opt/rtems-5.1-2019.07.25/sparc-rtems5/leon3/lib",
             "-specs=bsp_specs",
             "-qrtems",
             "-lm",

templates/skeletons/makefile.tmplt

@@ -7,7 +7,8 @@
 @@-- @_Unique_Languages_@    : List of all languages used in the system
 @@-- @_ASN1_Files_@          : List of all ASN.1 files
 @@-- @_ASN1_Modules_@        : List of all ASN.1 modules
-MAKEFILE_PATH   := $(abspath $(lastword $(MAKEFILE_LIST)))
+# MAKEFILE_PATH   := $(abspath $(lastword $(MAKEFILE_LIST)))
+MAKEFILE_PATH   := $(lastword $(MAKEFILE_LIST))
 OUTDIR          := $(dir $(MAKEFILE_PATH))
 DATAVIEW_PATH   := ${OUTDIR}/dataview
 DATAVIEW_UNIQ   := ${DATAVIEW_PATH}/dataview-uniq.asn
@@ -96,7 +97,8 @@ ${DATAVIEW_AADLV1}: ${DATAVIEW_UNIQ}
 
 @@-- Then generate Dataviews once per target language - first for C, it is needed in any case
 dataview/C/built: | ${DATAVIEW_UNIQ}
-	mkdir -p $(dir $@) && asn2dataModel -o $(dir $@) -toC ${DATAVIEW_UNIQ} \
+	mkdir -p $(dir $@)
+	asn2dataModel -o $(dir $@) -toC ${DATAVIEW_UNIQ} \
 	@@INLINE(	)( \\\n	)(\n)@@
 	    @@TABLE@@
                @_REPLACE(,/ ):CP_Files_@
@@ -105,7 +107,8 @@ dataview/C/built: | ${DATAVIEW_UNIQ}
 
 	cp $(shell taste-config --prefix)/share/AutoGUI/debug_messages.? dataview/C
 	cp $(shell taste-config --prefix)/share/AutoGUI/timeInMS.? dataview/C
-	cd dataview/C && msgPrinter ${DATAVIEW_UNIQ} && msgPrinterASN1 ${DATAVIEW_UNIQ}
+	cd dataview/C && msgPrinter ../dataview-uniq.asn
+	cd dataview/C && msgPrinterASN1  ../dataview-uniq.asn
 	touch $@
         @@TABLE@@
 	   @@IF@@ @_Unique_Languages_@ = "Ada" or @_Unique_Languages_@ = "SDL"
@@ -147,21 +150,21 @@ dataview/Ada/built: | ${DATAVIEW_UNIQ}
 	@@-- Then symlink the files for each function
 	@@TABLE@@
 	@@IF@@ @_Language_@ = "SDL"
-	ln -fs ${DATAVIEW_UNIQ} @_LOWER:Function_Names_@/@_Language_@/src
+	ln -fs ../../../${DATAVIEW_UNIQ} @_LOWER:Function_Names_@/@_Language_@/src
 	@@END_IF@@
 	@@END_TABLE@@
 
 function-types-linux:
 	@@TABLE@@
 	@@IF@@ @_Is_Type_@
-	cd @_LOWER:Function_Names_@/@_Language_@ && $(MAKE) -j compile-linux
+	$(MAKE) -j -C @_LOWER:Function_Names_@/@_Language_@ compile-linux
 	@@END_IF@@
 	@@END_TABLE@@
 
 function-instances-linux:	function-types-linux
 	@@TABLE@@
 	@@IF@@ not @_Is_Type_@
-	cd @_LOWER:Function_Names_@/@_Language_@ && $(MAKE) -j compile-linux
+	$(MAKE) -C @_LOWER:Function_Names_@/@_Language_@ -j compile-linux
 	@@END_IF@@
 	@@END_TABLE@@