Commit dbc6cf4b authored by Maxime Perrotin's avatar Maxime Perrotin
Browse files

Increase version, update scripts

parent 9eb17650
......@@ -32,6 +32,7 @@ Author: Maxime Perrotin
1.1.0 - Add support for custom user widgets
1.0.8 - various updates in SDL handler
1.0.7 - fixed bug in value notation parser
......@@ -16,7 +16,7 @@
__author__ = "Maxime Perrotin"
__license__ = "LGPLv3"
__version__ = "1.0.8"
__version__ = "1.1.0"
__url__ = ""
import sys
...... -aadlv2 test.asn dataview.aadl
#!/bin/bash -e
asn2aadlPlus -aadlv2 test.asn dataview.aadl
buildsupport -i InterfaceView.aadl -c DeploymentView.aadl -d dataview.aadl -o glue -glue
cp glue/testgui/mini_cv.aadl . test.asn dataview.aadl mini_cv.aadl dataview.aadl
asn2aadlPlus test.asn dataview.aadl
aadl2glueC mini_cv.aadl dataview.aadl
cp guilayout.ui ..
cp .. -toPython ./test.asn -o python/
asn2dataModel -toPython ./test.asn -o python/
export ASN2DATAMODEL=asn2dataModel
cp glue/testgui/*.h python
cd python && make -f Makefile.python && \
swig -Wall -includeall -outdir . -python ./PythonAccess.i && \
#!/bin/bash -e
# needs generic InterfaceEnum.i
# needs interface_enum.h from the project
......@@ -6,43 +6,35 @@
rm -rf build python
mkdir -p build
mkdir -p build/python
EDITORPATH=$(taste-config --prefix)/share/asn1-editor
cd build
# Manual build of the Dataview and call to the B mapper ../dataview-uniq.asn DataView.aadl DataView.aadl ../dspace-connector.aadl
asn2aadlPlus ../dataview-uniq.asn DataView.aadl
aadl2glueC DataView.aadl ../dspace-connector.aadl
# Python mappers (normally done by the orchestrator): -toPython ../dataview-uniq.asn -o python
asn2dataModel -toPython ../dataview-uniq.asn -o python
export ASN2DATAMODEL=asn2dataModel
cd python && make -f Makefile.python || exit -1
# Generate the .py file with the error codes (to be done in the orchestrator)
echo "errCodes = $($EDITORPATH/ dataview-uniq.h)" >> ../ && cd ..
# copy taste logo
cp $EDITORPATH/*.png .
echo "errCodes = $(taste-asn1-errCodes dataview-uniq.h)" >> ../ && cd ..
#the following statements only apply if there is a BB device in the system:
cp $EDITORPATH/InterfaceEnum.i .
cp ../../../InterfaceEnum.i .
cp ../interface_enum.h .
swig -includeall -outdir . -python ./InterfaceEnum.i && \
gcc -g -shared -fPIC `python-config --includes` -o InterfaceEnum_wrap.c
# also copy speedometer:
cp $(taste-config --prefix)/share/speedometer/content . -r
cp $(taste-config --prefix)/share/speedometer/*.qml . -r
rm -rf ../dspace-sender-GUI
mkdir -p ../dspace-sender-GUI
mv *.py *.ui *.so *.qml *.png content python/*.so python/*.py ../dspace-sender-GUI
mv *.py *.ui *.so python/*.so python/*.py ../dspace-sender-GUI
cd ..
cp InterfaceView.aadl dspace-sender-GUI
cp dataview-uniq.asn dspace-sender-GUI
echo 'cd dspace-sender-GUI && $(taste-config --prefix)/share/asn1-editor/ --udp -v $@ && cd ..
echo 'cd dspace-sender-GUI && $(taste-gui --udp -v $@ && cd ..
' > && chmod +x
Supports Markdown
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