Commit 33260a9a authored by Maxime Perrotin's avatar Maxime Perrotin

Improve all makefiles

parent 0a4712a0
......@@ -166,7 +166,7 @@ package body TASTE.Concurrency_View is
Output_File : File_Type;
CV_Out_Dir : constant String :=
CV.Base_Output_Path.Element & "/concurrency_view/";
CV.Base_Output_Path.Element & "/build/";
-- Tags that are built over the whole system
-- and cleant up between each template folder:
......
......@@ -53,7 +53,7 @@ fi
# Execute the makefile to update dataviews, if needed, then call ocarina and build everything
make && \
cd concurrency_view && \
cd build && \
ocarina -x main.aadl &&
make -f Makefile.taste
......
......@@ -6,10 +6,18 @@
@@-- @_CPU_Name_@, _Platform_@, _Classifier_@, _Ada_Runtime_@ : Info about CPU
@@-- In standard TASTE systems there is only one partition per node
@@INLINE@@
@_LOWER:Node_Name_@ :
@_LOWER:Node_Name_@_native :
@@TABLE@@
@_LOWER:Partition_Names_@
@_LOWER:Partition_Names_@_native
@@END_TABLE@@
@@END_INLINE@@
@@INLINE@@
@_LOWER:Node_Name_@_rtems_ada :
@@TABLE@@
@_LOWER:Partition_Names_@_rtems_ada
@@END_TABLE@@
@@END_INLINE@@
@_Partitions_@
......@@ -21,13 +21,14 @@
@@-- @_Thread_Src_Port_@ : Vector tag : connection port name (source)
@@-- @_Thread_Dst_Port_@ : Vector tag : connection port name (dest)
@@INLINE()( )(\n)@@
@_LOWER:Name_@ :
@_LOWER:Name_@_native :
@@TABLE@@
@_LOWER:Block_Names_@
@@END_TABLE@@
@@END_INLINE@@
@_LOWER:Name_@_rtems_ada : @_LOWER:Name_@_native
@@-- On RTEMS if using POHIC we need to have adainit created for Ada functions
@@-- Here we miss the configuration? Please add... We don't need that for POHIAda
@@--@@IF@@ @_CPU_Platform_@ /= PLATFORM_NATIVE
mkdir -p @_LOWER:Name_@_adainit && \
@@INLINE( echo ')()()@@
......
......@@ -17,7 +17,7 @@
@@INLINE()( )()@@
all:
@@TABLE@@
@_LOWER:Node_Names_@
@_LOWER:Node_Names_@_native
@@END_TABLE@@
@@END_INLINE@@
......@@ -25,4 +25,15 @@ all:
make -C @_Node_Names_@ -f Makefile.@_Node_Names_@
@@END_TABLE@@
@@INLINE()( )()@@
rtems_ada:
@@TABLE@@
@_LOWER:Node_Names_@_rtems_ada
@@END_TABLE@@
@@END_INLINE@@
@@TABLE@@
make -C @_Node_Names_@ -f Makefile.@_Node_Names_@ debug_rtems_leon3_with_ada
@@END_TABLE@@
@_Nodes_@
......@@ -10,7 +10,15 @@
MAKEFILE_PATH := $(abspath $(lastword $(MAKEFILE_LIST)))
OUTDIR := $(dir $(MAKEFILE_PATH))
all: dataview/dataview-uniq.asn
all: build-native
dataview : dataview/dataview-uniq.asn
build-native: dataview
cd build && ocarina -x main.aadl && make -f Makefile.taste
build-rtems-ada: dataview
cd build && ocarina -x main.aadl && make -f Makefile.taste rtems_ada
@@INLINE(dataview/dataview-uniq.asn:)( )(\n)@@
@@TABLE@@
......@@ -34,7 +42,7 @@ all: dataview/dataview-uniq.asn
@_LOWER:Function_Names_@/@_Language_@/wrappers/@_LOWER:Function_Names_@_system_config.h
@@END_IF@@
@@END_TABLE@@
; do cat $$f; echo; done > system_config.h
; do cat $$f; echo; done > build/system_config.h
@@END_INLINE@@
@@-- Generate DataView.aadl in AADLV1 as this is needed by aadl2glueC
......@@ -108,3 +116,8 @@ function-instances-linux: function-types-linux
@@END_TABLE@@
compile-all-linux: dataviews function-instances-linux
clean:
rm -rf binaries/*
.PHONY: clean compile-all-linux function-instances-linux function-types-linux build-native dataview build-rtems-ada
......@@ -6,17 +6,14 @@ ada: test-parse-ada
make -C output.ada && \
cp input_data/obsw.pr output.ada/obsw/SDL/src && \
cp input_data/gnc.c output.ada/gnc/C/src && \
cd output.ada/concurrency_view && \
cd output.ada/build && \
ocarina -x main.aadl && \
make -f Makefile.taste
c: test-parse-c # Polyorb_HI_C output
make -C output.pohic && \
cp input_data/obsw.pr output.pohic/obsw/SDL/src && \
cp input_data/gnc.c output.pohic/gnc/C/src && \
cd output.pohic/concurrency_view && \
ocarina -x main.aadl && \
make -f Makefile.taste
make -C output.pohic
test-parse-ada: clean-ada
$(KAZOO) --gw \
......@@ -46,6 +43,12 @@ clean-ada:
clean-c:
rm -rf output.pohic
clean: clean-ada clean-c
skeletons:
$(KAZOO) -p --gw --glue -o code && make -C code dataview
clean-skeletons:
rm -rf code
clean: clean-ada clean-c clean-skeletons
.PHONY: clean clean-ada clean-c test-parse-ada gdb test-parse-c buildsupport_pohic buildsupport_pohiada c
.PHONY: clean clean-ada clean-c test-parse-ada gdb test-parse-c buildsupport_pohic buildsupport_pohiada c skeletons clean-skeletons
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment