Commit dbc6cf4b authored by Maxime Perrotin's avatar Maxime Perrotin

Increase version, update scripts

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