Skip to content
GitLab
Commit 57f765df authored by yoogx's avatar yoogx
Browse files

Merge branch 'master' into spark2014

parents 0fb0b68b 00b86271
Hide whitespace changes
Inline Side-by-side
.gitignore
View file @ 57f765df
......@@ -13,6 +13,7 @@ doc/stamp-vti
doc/version.texi
resources/runtime/polyorb-hi-ada
resources/runtime/polyorb-hi-c
resources/runtime/python/ocarina.pyc
support/mdate-sh
support/texinfo.tex
tools/compare.py
......
autotest.sh
View file @ 57f765df
......@@ -186,7 +186,7 @@ if test $# != 0 ; then
;;
--lcov|-l)
lcov -d . -c -o ocarina.gcov-info -t ocarina
genhtml ocarina.gcov-info -o html -s -f
genhtml -o html -s -f ocarina.gcov-info
exit 0
;;
--clean|-c)
......
configure.ac
View file @ 57f765df
......@@ -147,10 +147,10 @@ AM_CONDITIONAL(DEBUG, test x$debug = xtrue)
define(SHARED_LIBRARY_OPTIONS, [dnl
GNAT_LIB_FLAGS="-XLIBRARY=dynamic"
GNAT_LIB_FLAGS="-XLIBRARY_TYPE=relocatable"
shared=true])
define(NO_SHARED_LIBRARY_OPTIONS, [dnl
GNAT_LIB_FLAGS="-XLIBRARY=static"
GNAT_LIB_FLAGS="-XLIBRARY_TYPE=static"
shared=false])
AC_ARG_ENABLE(shared,
......@@ -325,6 +325,19 @@ AS_HELP_STRING([--with-aadl-version=x], [choose AADL version (v1)]),
AC_MSG_RESULT(${newval})
AC_SUBST(AADL_VERSION)
#############################
# Python
#############################
AC_ARG_ENABLE(python,
[ --enable-python Build Python bindings [default=no]],
[if [[ "$enableval" = "yes" ]]; then
PYTHON_PRJ=ocarina-python.gpr
fi],
[])
AC_SUBST(PYTHON_PRJ)
##########################################
# Some version control stuff
##########################################
......@@ -406,15 +419,18 @@ AC_OUTPUT([
resources/Makefile
resources/behavioural_properties/Makefile
resources/runtime/Makefile
resources/runtime/cheddar/Makefile
resources/runtime/aadl_xml/Makefile
resources/runtime/cheddar/Makefile
resources/runtime/python/Makefile
projects/ocarina.gpr
src/main/Makefile
src/main/ocarina-configuration.adb
src/config/ocarina-configuration.adb
src/frontends/Makefile
src/config/Makefile
src/core/Makefile
src/transfo/Makefile
src/backends/Makefile
src/python/Makefile
src/Makefile
support/Makefile
support/strip_wrapper.sh
......
doc/CODING_GUIDELINES deleted 100644 → 0
View file @ 0fb0b68b
--------------------------------------------------
-- CODING GUIDELINES for the Ocarina tool suite --
--------------------------------------------------
-- $Id: CODING_GUIDELINES 4768 2008-10-23 09:32:50Z zalila $
The Ada 95 Quality & Style Guide and the GNAT coding style have to be
respected. The GNAT coding style is available at:
- http://gcc.gnu.org/onlinedocs/gnat-style/
Each file should start with the standard Ocarina copyright header,
then a blank line, then a comment that documents its purpose, followed
by a blank line. The Ocarina copyright header might be adapted for
copyrighted specs or code from third party.
If a package body needs to explicitly execute some code for its
initialization, this MUST NOT be done in the elaboration code.
Instead, a parameterless procedure Initialize must be declared
containing the necessary initialization code, and this procedure
should be called by the corresponding module initialization routine.
The code shall not produce warnings when compiled with -gnatwa -gnaty.
Any use of pragma Warnings (Off) shall be documented by a comment. In
other words, './configure --enable-debug && make' shall terminate
successfully.
Usage of Ada 2005 features is allowed provided that all the Ada
compilers listed in the Ocarina documentation can still compile it.
Copyright headers should be up to date whenever necessary, using the
script /support/update_headers.sh:
- Copyright date information is either
- x where x is year of code's creation,
- y - z where y is year of code's creation and z is year of last
modification, if y /= z.
By code's creation, we mean the date the code was first created and
checked in in Ocarina repository. If packages are renamed, merged,
copyright years must remain consistent with package content.
- Some packages require specific adjustments to take into account
references to other projects (e.g. GNAT components)
Always update (or create if necessary) README file for each example.
Any modification to NEWS must be propagated to the Ocarina User's
guide to ensure consistency.
Any commented code is prohibited unless a reasonable comment message
justifies its presence.
Before any commit, check that 'make distcheck' runs successfully. Make
distcheck verifies:
- the testsuite runs successfully (In case the testsuite files are
present)
- all the examples compile AND RUN successfully.
- the source package installs and uninstalls correctly and is
self-contained.
Commit messages must be clear and must explain 'why' (and not 'how')
all the changes have been made. When a mistake is found in the commit
message after the commit is sent, the message can be corrected by
issuing the following command:
%/> svn propedit --revprop svn:log -r <revision number> . (the
trailing 'dot' is the last element of the command)
After that, an editor with the old message opens. It can be fixed and
validated.
doc/CONTRIBUTING deleted 100644 → 0
View file @ 0fb0b68b
-- LEGAL INSTRUCTIONS for contributors to Ocarina
-- $Id: CONTRIBUTING 3978 2007-09-20 12:20:11Z zalila $
The copyright in any contribution to Ocarina must be assigned to
GET-Telecom Paris prior to checkin or patch submission. Each
contributor must fill out the form below and email it to the
Ocarina Users mailing list (ocarina-users@listes.enst.fr).
======================================================================
Please email the following information to
ocarina-users@listes.enst.fr.
Please use your full legal name (in ASCII characters) as the subject
line of the message.
----------------------------------------------------------------------
REQUEST: CONTRIBUTE TO OCARINA
[What is the name of the program or package you're contributing to?]
The Ocarina AADL tool suite
[Did you copy any files or text written by someone else in these
changes? Even if that material is free software, we need to know
about it.]
[Do you have an employer who might have a basis to claim to own your
changes? Do you attend a school which might make such a claim?]
[For the copyright registration, what country are you a citizen of?]
[What year were you born?]
[Please write your email address here.]
[Please write your postal address here.]
[Which files have you changed so far, and which new files have you
written so far?]
doc/Makefile.am
View file @ 57f765df
# For now, do not build real documentation, it requires LaTeX files
# that may not be installed. However, its source is included in the
# packaging.
DIST_SUBDIRS = real
ADAFILES= $(srcdir)/sources/parse_and_print_aadl.adb
AADLFILES= $(srcdir)/sources/scenario_ada.aadl \
$(srcdir)/sources/scenario_c.aadl \
$(srcdir)/sources/scenario_common.aadl \
$(srcdir)/sources/example_pn.aadl \
$(top_srcdir)/resources/AADLv1/aadl_project.aadl \
$(top_srcdir)/resources/AADLv1/aadl_properties.aadl \
$(top_srcdir)/resources/deployment.aadl \
$(top_srcdir)/resources/ocarina_config.aadl
APIFILES= \
$(top_srcdir)/src/core/tree/ocarina-me_aadl-aadl_tree-entities.ads \
$(top_srcdir)/src/core/tree/ocarina-me_aadl-aadl_tree-entities-properties.ads \
$(top_srcdir)/src/core/model/ocarina-builder.ads \
$(top_srcdir)/src/core/model/ocarina-builder-aadl.ads \
$(top_srcdir)/src/core/model/ocarina-builder-aadl-annexes.ads \
$(top_srcdir)/src/core/model/ocarina-builder-aadl-components.ads \
$(top_srcdir)/src/core/model/ocarina-builder-aadl-components-connections.ads \
$(top_srcdir)/src/core/model/ocarina-builder-aadl-components-features.ads \
$(top_srcdir)/src/core/model/ocarina-builder-aadl-components-flows.ads \
$(top_srcdir)/src/core/model/ocarina-builder-aadl-components-modes.ads \
$(top_srcdir)/src/core/model/ocarina-builder-aadl-components-subcomponents.ads\
$(top_srcdir)/src/core/model/ocarina-builder-aadl-components-subprogram_calls.ads \
$(top_srcdir)/src/core/model/ocarina-builder-aadl-namespaces.ads \
$(top_srcdir)/src/core/model/ocarina-builder-aadl-properties.ads \
$(top_srcdir)/src/core/model/ocarina-analyzer-aadl-finder.ads \
$(top_srcdir)/src/core/model/ocarina-analyzer-aadl-queries.ads
GEN_TEXIFILES= ${notdir $(ADAFILES:=.texi) $(AADLFILES:=.texi) $(APIFILES:=.texi)}
IMAGE_NAMES=\
$(srcdir)/images/component\
$(srcdir)/images/connection\
$(srcdir)/images/feature\
$(srcdir)/images/mubroker_complet\
$(srcdir)/images/spg_connection\
$(srcdir)/images/subprogram
ALL_IMAGES= $(IMAGE_NAMES:=.eps) $(IMAGE_NAMES:=.png) $(IMAGE_NAMES:=.pdf)
KW_FILES = \
$(srcdir)/aadl.kw\
$(srcdir)/ada.kw
SED_FILES = ${notdir $(KW_FILES:.kw=.sed)}
GUIDE=ocarina
GUIDE_TEXIFILES =\
$(srcdir)/$(GUIDE).texi\
$(GEN_TEXIFILES) \
gfdl.texi
info_TEXINFOS = ocarina.texi
ocarina_TEXINFOS=$(GUIDE_TEXIFILES)
man_MANS = ocarina-config.1 ocarina.1
GUIDE_RSTFILES = $(srcdir)/about.rst $(srcdir)/gfdl.rst \
$(srcdir)/introduction.rst $(srcdir)/annexes.rst index.rst \
$(srcdir)/python.rst $(srcdir)/editors.rst \
$(srcdir)/installation.rst $(srcdir)/usage.rst
EXTRA_DIST= $(srcdir)/CODING_GUIDELINES $(srcdir)/CONTRIBUTING \
$(srcdir)/PROBLEM-REPORT-FORM $(GUIDE_TEXIFILES) $(ALL_IMAGES) \
$(ADAFILES) $(AADLFILES) $(KW_FILES) $(srcdir)/ocarina.css \
$(man_MANS) $(srcdir)/ocarina-config.html \
$(srcdir)/ocarina_man.html
all-local: $(GUIDE).html $(GUIDE).pdf
$(GUIDE).html: $(IMAGES) $(GUIDE_TEXIFILES)
-$(MAKEINFO) --css-include=$(srcdir)/ocarina.css --force --html --ifhtml --number-sections $(srcdir)/$(GUIDE).texi -o $(GUIDE).html
rm -rf $(GUIDE).html/images
mkdir -p $(GUIDE).html/images
cp -p $(srcdir)/images/*.png $(GUIDE).html/images/
INDEX_FILE="$(GUIDE).html/index.html";\
TMP_FILE="$$INDEX_FILE.tmp"; \
cat "$$INDEX_FILE" | sed 's/$$LastChangedDate: \([^$$]*\) \$$/Last Modified: \1/g' > "$$TMP_FILE"; \
mv -f "$$TMP_FILE" "$$INDEX_FILE"
$(GUIDE).html: $(GUIDE_RSTFILES)
make html
$(GUIDE).pdf: $(IMAGES) $(GUIDE_TEXIFILES)
-$(TEXI2PDF) $(srcdir)/$(GUIDE).texi
$(GUIDE).pdf: $(IMAGES) $(GUIDE_RSTFILES)
make latexpdf
clean-local:
rm -f *.aux *.log *.dvi *.info *.tmp
rm -f *.cp *.pg *.toc *.vr *.fn *.ky *.tp *~
rm -f *~
-rm -rf $(BUILDDIR)/*
distclean-local:
rm -f $(GEN_TEXIFILES)
......@@ -112,28 +49,11 @@ dist-hook: all
install-data-local: all
$(INSTALL) -d $(DESTDIR)$(datadir)/doc/ocarina
if [ -r $(GUIDE).pdf ]; then \
$(INSTALL_DATA) $(GUIDE).pdf $(DESTDIR)$(datadir)/doc/ocarina; \
if [ -r $(builddir)/_build/latex/$(GUIDE).pdf ]; then \
$(INSTALL_DATA) $(builddir)/_build/latex/$(GUIDE).pdf $(DESTDIR)$(datadir)/doc/ocarina; \
$(INSTALL) -d $(DESTDIR)$(datadir)/doc/ocarina/$(GUIDE).html; \
for f in $(GUIDE).html/*.html; do \
$(INSTALL_DATA) $$f $(DESTDIR)$(datadir)/doc/ocarina/$(GUIDE).html; \
done; \
$(INSTALL) -d $(DESTDIR)$(datadir)/doc/ocarina/$(GUIDE).html/images; \
for f in $(GUIDE).html/images/*.png; do \
$(INSTALL_DATA) $$f $(DESTDIR)$(datadir)/doc/ocarina/$(GUIDE).html/images; \
done; \
else \
$(INSTALL_DATA) $(srcdir)/$(GUIDE).pdf $(DESTDIR)$(datadir)/doc/ocarina; \
$(INSTALL) -d $(DESTDIR)$(datadir)/doc/ocarina/$(GUIDE).html; \
for f in $(srcdir)/$(GUIDE).html/*.html; do \
$(INSTALL_DATA) $$f $(DESTDIR)$(datadir)/doc/ocarina/$(GUIDE).html; \
done; \
$(INSTALL) -d $(DESTDIR)$(datadir)/doc/ocarina/$(GUIDE).html/images; \
for f in $(srcdir)/$(GUIDE).html/images/*.png; do \
$(INSTALL_DATA) $$f $(DESTDIR)$(datadir)/doc/ocarina/$(GUIDE).html/images; \
done; \
$(CP) -r $(builddir)/_build/html/* $(DESTDIR)$(datadir)/doc/ocarina/$(GUIDE).html; \
fi
$(INSTALL_DATA) $(srcdir)/CONTRIBUTING $(DESTDIR)$(datadir)/doc/ocarina
$(INSTALL_DATA) $(srcdir)/PROBLEM-REPORT-FORM $(DESTDIR)$(datadir)/doc/ocarina
$(INSTALL_DATA) $(srcdir)/ocarina-config.html $(DESTDIR)$(datadir)/doc/ocarina
$(INSTALL_DATA) $(srcdir)/ocarina_man.html $(DESTDIR)$(datadir)/doc/ocarina
......@@ -142,41 +62,38 @@ install-data-local: all
uninstall-local:
rm -rf $(DESTDIR)$(datadir)/doc/ocarina
$(GUIDE_TEXIFILES): ada-stamp adb-stamp ads-stamp aadl-stamp
ada-stamp: $(top_srcdir)/tools/gentexifile $(ADAFILES) sed-stamp
for f in ${filter %.ada, $(ADAFILES)}; do \
$(SHELL) $(top_srcdir)/tools/gentexifile $$f; \
done
touch ada-stamp
adb-stamp: $(top_srcdir)/tools/gentexifile $(ADAFILES) sed-stamp
for f in ${filter %.adb, $(ADAFILES)}; do \
$(SHELL) $(top_srcdir)/tools/gentexifile $$f; \
done
touch adb-stamp
ads-stamp: $(top_srcdir)/tools/gen_api_doc $(APIFILES)
ABS_TOP_SRCDIR="@abs_top_srcdir@" \
ABS_TOP_BUILDDIR="@abs_top_builddir@" \
$(SHELL) $(top_srcdir)/tools/gen_api_doc
touch ads-stamp
aadl-stamp: $(top_srcdir)/tools/gentexifile $(AADLFILES) sed-stamp
for f in $(AADLFILES); do \
$(SHELL) $(top_srcdir)/tools/gentexifile $$f; \
done
touch aadl-stamp
sed-stamp: $(top_srcdir)/tools/gensedfile $(KW_FILES)
for f in $(KW_FILES); do \
$(SHELL) $(top_srcdir)/tools/gensedfile $$f; \
done
touch sed-stamp
###############################################################################
# Building manpages
# SPHINX rules
# You can set these variables from the command line.
SPHINXOPTS =
SPHINXBUILD = sphinx-build
PAPER =
BUILDDIR = $(builddir)/_build
# Internal variables.
PAPEROPT_a4 = -D latex_paper_size=a4
PAPEROPT_letter = -D latex_paper_size=letter
ALLSPHINXOPTS = -c $(srcdir) -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) $(srcdir)
# the i18n builder cannot share the environment and doctrees with the others
I18NSPHINXOPTS = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
.PHONY: help clean html dirhtml singlehtml pickle json htmlhelp qthelp devhelp epub latex latexpdf text man changes linkcheck doctest gettext
html:
$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html
@echo
@echo "Build finished. The HTML pages are in $(BUILDDIR)/html."
latexpdf:
$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
@echo "Running LaTeX files through pdflatex..."
$(MAKE) -C $(BUILDDIR)/latex all-pdf
@echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex."
###############################################################################
# Building manpages
build_man: $(top_srcdir)/ocarina-config.in
chmod 755 $(top_builddir)/ocarina-config
......
doc/aadl.kw deleted 100644 → 0
View file @ 0fb0b68b
aadlboolean
aadlinteger
aadlreal
aadlstring
access
all
and
annex
applies
binding
bus
calls
classifier
connections
constant
data
delta
device
end
enumeration
event
extends
false
features
flow
flows
group
implementation
in
inherit
initial
inverse
is
list
memory
mode
modes
none
not
of
or
out
package
parameter
path
port
private
process
processor
properties
property
provides
public
range
reference
refined
refines
requires
server
set
sink
source
subcomponents
subprogram
system
thread
to
true
type
units
value
doc/about.rst 0 → 100644
View file @ 57f765df
.. _about:
================
About This Guide
================
About this Guide
################
This guide describes the use of Ocarina, a compiler for the AADL.
It presents the features of the compiler, related APIs and tools; and
details how to use them to build and exploit AADL models.
It also details model transformations of AADL models onto Petri Net models
Companion documents describe other add-ons for Ocarina:
* PolyORB-HI/Ada, a High-Integrity AADL runtime and its code generator
built on top of Ocarina that targets Ada targets: Native or bare
board runtimes;
* PolyORB-HI/C, a High-Integrity AADL runtime and its code generator
built on top of Ocarina that targets C targets: POSIX and RT-POSIX
systems, RTEMS.
Document Conventions
####################
This document uses the following conventions:
.. note:: This is just a note, for your information.
.. warning:: This is a warning, something you should take care of.
A filename or a path to a filename is displayed like this:
:file:`/path/to/filename.ext`
A command to type in the shell is displayed like this:
:command:`command --arguments`
A sample of code is illustrated like this:
::
First Line of Code
Second Line of Code
...
.. _copyright:
Copyright Information
#####################
Permission is granted to copy, distribute and/or modify this
document under the terms of the GNU Free Documentation
License, Version 1.1 or any later version published by the
Free Software Foundation; with no Invariant Sections, no
Front-Cover Texts, and with no Back-Cover Texts. A copy of
the license is included in :ref:`gfdl`.
If you have any questions regarding this document, its
copyright, or publishing this document in non-electronic form,
please contact us.
doc/ada.kw deleted 100644 → 0
View file @ 0fb0b68b
with
while
when
use
until
type
then
terminate
task
tagged
subtype
separate
select
reverse
reverse
return
requeue
renames
rem
record
range
raise
protected
procedure
private
pragma
package
out
others
or
of
null
not
new
mod
loop
limited
is
in
if
goto
generic
function
for
exit
exception
entry
end
elsif
else
do
digits
delta
delay
declare
constant
configuration
case
body
begin
array
and
all
aliased
access
accept
abstract
abs
abort
doc/annexes.rst 0 → 100644
View file @ 57f765df
Indices and tables
==================
* :ref:`genindex`
* :ref:`modindex`
* :ref:`search`
doc/bug.rst 0 → 100644
View file @ 57f765df
Submitting a bug
================
To submit a bug report, please follow the following steps, you may then use Ocarina bug tracking system.
See Ocarina main web site for more details.
.. include:: PROBLEM-REPORT-FORM
:literal:
\ No newline at end of file
doc/conf.py 0 → 100644
View file @ 57f765df
# -*- coding: utf-8 -*-
#
# Ocarina documentation build configuration file, created by
# sphinx-quickstart on Mon Mar 3 22:24:45 2014.
#
# This file is execfile()d with the current directory set to its containing dir.
#
# Note that not all possible configuration values are present in this