Commit 0dd65363 authored by Thanassis Tsiodras's avatar Thanassis Tsiodras
Browse files

First step of moving back to relative paths (avoiding taste-update-data-view)

parent de836303
...@@ -21,9 +21,6 @@ fi ...@@ -21,9 +21,6 @@ fi
SKELS="./" SKELS="./"
# Update the data view with local paths
taste-update-data-view || exit 1
# Generate code for OpenGEODE function orchestrator # Generate code for OpenGEODE function orchestrator
cd "$SKELS"/orchestrator || exit 1 cd "$SKELS"/orchestrator || exit 1
opengeode --toAda orchestrator.pr system_structure.pr || exit 1 opengeode --toAda orchestrator.pr system_structure.pr || exit 1
......
...@@ -14,8 +14,6 @@ ...@@ -14,8 +14,6 @@
# Note: TASTE will not overwrite your changes - if you need to update some parts # Note: TASTE will not overwrite your changes - if you need to update some parts
# you will have to merge the changes with the newly-created "build-script.new.sh" file. # you will have to merge the changes with the newly-created "build-script.new.sh" file.
taste-update-data-view || exit 1
rm -f lift_model.zip rm -f lift_model.zip
zip lift_model lift_model/* zip lift_model lift_model/*
[ ! -z "$CLEANUP" ] && rm -rf binary [ ! -z "$CLEANUP" ] && rm -rf binary
......
...@@ -27,7 +27,6 @@ zip a a/* ...@@ -27,7 +27,6 @@ zip a a/*
rm -f b.zip rm -f b.zip
zip b b/* zip b b/*
cd "$OLDPWD" cd "$OLDPWD"
taste-update-data-view
[ ! -z "$CLEANUP" ] && rm -rf binary [ ! -z "$CLEANUP" ] && rm -rf binary
if [ -f ConcurrencyView.pro ] if [ -f ConcurrencyView.pro ]
......
...@@ -21,9 +21,6 @@ fi ...@@ -21,9 +21,6 @@ fi
SKELS="./" SKELS="./"
# Update the data view with local paths
taste-update-data-view || exit 1
cd "$SKELS" && rm -f router.zip && zip router router/* && cd $OLDPWD cd "$SKELS" && rm -f router.zip && zip router router/* && cd $OLDPWD
cd "$SKELS" && rm -f displayer.zip && zip displayer displayer/* && cd $OLDPWD cd "$SKELS" && rm -f displayer.zip && zip displayer displayer/* && cd $OLDPWD
......
...@@ -14,8 +14,6 @@ ...@@ -14,8 +14,6 @@
# Note: TASTE will not overwrite your changes - if you need to update some parts # Note: TASTE will not overwrite your changes - if you need to update some parts
# you will have to merge the changes with the newly-created "build-script.new.sh" file. # you will have to merge the changes with the newly-created "build-script.new.sh" file.
taste-update-data-view || exit 1
if [ -z "$DEPLOYMENTVIEW" ] if [ -z "$DEPLOYMENTVIEW" ]
then then
DEPLOYMENTVIEW=DeploymentView.aadl DEPLOYMENTVIEW=DeploymentView.aadl
......
...@@ -14,8 +14,6 @@ ...@@ -14,8 +14,6 @@
# Note: TASTE will not overwrite your changes - if you need to update some parts # Note: TASTE will not overwrite your changes - if you need to update some parts
# you will have to merge the changes with the newly-created file. # you will have to merge the changes with the newly-created file.
taste-update-data-view || exit 1
if [ -z "$DEPLOYMENTVIEW" ] if [ -z "$DEPLOYMENTVIEW" ]
then then
DEPLOYMENTVIEW=DeploymentView.aadl DEPLOYMENTVIEW=DeploymentView.aadl
......
...@@ -4,7 +4,6 @@ rm -f simple_c_function.zip ...@@ -4,7 +4,6 @@ rm -f simple_c_function.zip
zip simple_c_function simple_c_function/* zip simple_c_function simple_c_function/*
[ ! -z "$CLEANUP" ] && rm -rf binary.* [ ! -z "$CLEANUP" ] && rm -rf binary.*
taste-update-data-view || exit 1
# Ada runtime # Ada runtime
assert-builder-ocarina.py \ assert-builder-ocarina.py \
......
...@@ -14,8 +14,6 @@ ...@@ -14,8 +14,6 @@
# Note: TASTE will not overwrite your changes - if you need to update some parts # Note: TASTE will not overwrite your changes - if you need to update some parts
# you will have to merge the changes with the newly-created file. # you will have to merge the changes with the newly-created file.
taste-update-data-view || exit 1
if [ -z "$DEPLOYMENTVIEW" ] if [ -z "$DEPLOYMENTVIEW" ]
then then
DEPLOYMENTVIEW=DeploymentView.aadl DEPLOYMENTVIEW=DeploymentView.aadl
......
...@@ -42,9 +42,6 @@ grep "version => \"2" "$DEPLOYMENTVIEW" >/dev/null && { ...@@ -42,9 +42,6 @@ grep "version => \"2" "$DEPLOYMENTVIEW" >/dev/null && {
SKELS="./" SKELS="./"
# Update the data view with local paths
taste-update-data-view || exit 1
cd "$SKELS" && rm -f simple_c_function.zip && zip simple_c_function simple_c_function/* && cd $OLDPWD cd "$SKELS" && rm -f simple_c_function.zip && zip simple_c_function simple_c_function/* && cd $OLDPWD
[ ! -z "$CLEANUP" ] && rm -rf binary [ ! -z "$CLEANUP" ] && rm -rf binary
......
...@@ -42,9 +42,6 @@ grep "version => \"2" "$DEPLOYMENTVIEW" >/dev/null && { ...@@ -42,9 +42,6 @@ grep "version => \"2" "$DEPLOYMENTVIEW" >/dev/null && {
SKELS="./" SKELS="./"
# Update the data view with local paths
taste-update-data-view || exit 1
cd "$SKELS" && rm -f simple_c_function.zip && zip simple_c_function simple_c_function/* && cd $OLDPWD cd "$SKELS" && rm -f simple_c_function.zip && zip simple_c_function simple_c_function/* && cd $OLDPWD
[ ! -z "$CLEANUP" ] && rm -rf binary [ ! -z "$CLEANUP" ] && rm -rf binary
......
-------------------------------------------------------- --------------------------------------------------------
--! File generated by asn2aadl v2.1.10: DO NOT EDIT ! --! File generated by asn2aadl v2.1.10: DO NOT EDIT !
-------------------------------------------------------- --------------------------------------------------------
--! InputASN1FileChecksum:c4cca3f50df525b08cac54f4b04c5297:/home/taste/tool-src/testSuites/Demo_ContextParams/DataView.asn: --! InputASN1FileChecksum:c4cca3f50df525b08cac54f4b04c5297:DataView.asn:
--! InputASN1FileChecksum:ee8a7e01f29874c0d50f437d5abb9599:/home/taste/tool-inst/share/taste-types/taste-types.asn: --! InputASN1FileChecksum:ee8a7e01f29874c0d50f437d5abb9599: ../misc/taste-common-types/taste-types.asn:
-------------------------------------------------------- --------------------------------------------------------
package DataView package DataView
...@@ -46,7 +46,7 @@ end Stream_Element_Buffer; ...@@ -46,7 +46,7 @@ end Stream_Element_Buffer;
DATA T_SEQUENCE DATA T_SEQUENCE
PROPERTIES PROPERTIES
-- name of the ASN.1 source file: -- name of the ASN.1 source file:
Source_Text => ("/home/taste/tool-src/testSuites/Demo_ContextParams/DataView.asn"); Source_Text => ("DataView.asn");
TASTE::Ada_Package_Name => "DataView"; TASTE::Ada_Package_Name => "DataView";
Deployment::ASN1_Module_Name => "DataView"; Deployment::ASN1_Module_Name => "DataView";
Source_Language => ASN1; Source_Language => ASN1;
......
...@@ -53,9 +53,6 @@ grep "version => \"2" "$DEPLOYMENTVIEW" >/dev/null && { ...@@ -53,9 +53,6 @@ grep "version => \"2" "$DEPLOYMENTVIEW" >/dev/null && {
SKELS="./" SKELS="./"
# Update the data view with local paths
taste-update-data-view
# Generate code for OpenGEODE function function1 # Generate code for OpenGEODE function function1
cd "$SKELS"/function1 && opengeode --toAda function1.pr system_structure.pr && cd $OLDPWD cd "$SKELS"/function1 && opengeode --toAda function1.pr system_structure.pr && cd $OLDPWD
......
...@@ -54,9 +54,6 @@ grep "version => \"2" "$DEPLOYMENTVIEW" >/dev/null && { ...@@ -54,9 +54,6 @@ grep "version => \"2" "$DEPLOYMENTVIEW" >/dev/null && {
SKELS="./" SKELS="./"
# Update the data view with local paths
taste-update-data-view
cd "$SKELS" && rm -f copter_imu.zip && zip copter_imu copter_imu/* && cd $OLDPWD cd "$SKELS" && rm -f copter_imu.zip && zip copter_imu copter_imu/* && cd $OLDPWD
cd "$SKELS" && rm -f control_laws.zip && zip control_laws control_laws/* && cd $OLDPWD cd "$SKELS" && rm -f control_laws.zip && zip control_laws control_laws/* && cd $OLDPWD
......
...@@ -9,8 +9,6 @@ cd .. ...@@ -9,8 +9,6 @@ cd ..
[ ! -z "$CLEANUP" ] && rm -rf binary.linux.pohic/ [ ! -z "$CLEANUP" ] && rm -rf binary.linux.pohic/
taste-update-data-view || exit 1
assert-builder-ocarina.py \ assert-builder-ocarina.py \
-f \ -f \
-p \ -p \
......
...@@ -21,9 +21,6 @@ fi ...@@ -21,9 +21,6 @@ fi
SKELS="./" SKELS="./"
# Update the data view with local paths
taste-update-data-view || exit 1
# Generate code for OpenGEODE function flight # Generate code for OpenGEODE function flight
cd "$SKELS"/flight && opengeode --toAda flight.pr system_structure.pr && cd $OLDPWD cd "$SKELS"/flight && opengeode --toAda flight.pr system_structure.pr && cd $OLDPWD
......
...@@ -24,9 +24,6 @@ fi ...@@ -24,9 +24,6 @@ fi
SKELS="./" SKELS="./"
# Update the data view with local paths
taste-update-data-view || exit 1
cd "$SKELS" && rm -f function1.zip && zip function1 function1/* && cd $OLDPWD cd "$SKELS" && rm -f function1.zip && zip function1 function1/* && cd $OLDPWD
[ ! -z "$CLEANUP" ] && rm -rf binary [ ! -z "$CLEANUP" ] && rm -rf binary
......
#!/bin/bash #!/bin/bash
taste-update-data-view || exit 1
rm -f a.zip rm -f a.zip
zip a a/* zip a a/*
rm -f b.zip rm -f b.zip
......
#!/bin/bash #!/bin/bash
taste-update-data-view || exit 1
rm -f hello.zip rm -f hello.zip
zip hello hello/* zip hello hello/*
rm -f world.zip rm -f world.zip
......
...@@ -14,8 +14,6 @@ ...@@ -14,8 +14,6 @@
# Note: TASTE will not overwrite your changes - if you need to update some parts # Note: TASTE will not overwrite your changes - if you need to update some parts
# you will have to merge the changes with the newly-created file. # you will have to merge the changes with the newly-created file.
taste-update-data-view || exit 1
if [ -z "$DEPLOYMENTVIEW" ] if [ -z "$DEPLOYMENTVIEW" ]
then then
DEPLOYMENTVIEW=DeploymentView.aadl DEPLOYMENTVIEW=DeploymentView.aadl
......
...@@ -14,8 +14,6 @@ ...@@ -14,8 +14,6 @@
# Note: TASTE will not overwrite your changes - if you need to update some parts # Note: TASTE will not overwrite your changes - if you need to update some parts
# you will have to merge the changes with the newly-created "build-script.new.sh" file. # you will have to merge the changes with the newly-created "build-script.new.sh" file.
taste-update-data-view || exit 1
rm -f f1.zip rm -f f1.zip
zip f1 f1/* zip f1 f1/*
rm -f f2.zip rm -f f2.zip
......
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