Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
TASTE
Ocarina
Commits
5ab130a1
Commit
5ab130a1
authored
Jun 10, 2016
by
yoogx
Browse files
* Add AADLib as a regular runtime
parent
60e635b1
Changes
2
Hide whitespace changes
Inline
Side-by-side
configure.ac
View file @
5ab130a1
...
...
@@ -200,6 +200,7 @@ AC_ARG_WITH(ocarina-runtimes,
AS_HELP_STRING([--with-ocarina-runtimes=x], [enumerate runtimes]),
[
RUNTIME_LIST=""
AM_CONDITIONAL(AADLIB, false)
AM_CONDITIONAL(PO_HI_ADA, false)
AM_CONDITIONAL(PO_HI_C, false)
AM_CONDITIONAL(POK, false)
...
...
@@ -209,7 +210,7 @@ AS_HELP_STRING([--with-ocarina-runtimes=x], [enumerate runtimes]),
do
case ${R} in
all )
for P in polyorb-hi-ada polyorb-hi-c
for P in
aadlib
polyorb-hi-ada polyorb-hi-c
do
if test -d ${root}/resources/runtime/${P}
then
...
...
@@ -219,15 +220,27 @@ AS_HELP_STRING([--with-ocarina-runtimes=x], [enumerate runtimes]),
fi
done
AM_CONDITIONAL(AADLIB, true)
AM_CONDITIONAL(PO_HI_ADA, true)
AM_CONDITIONAL(PO_HI_C, true)
;;
none )
AM_CONDITIONAL(AADLIB, false)
AM_CONDITIONAL(PO_HI_ADA, false)
AM_CONDITIONAL(PO_HI_C, false)
;;
aadlib )
if test -d ${root}/resources/runtime/${R}
then
RUNTIME_LIST="${RUNTIME_LIST}${R} "
else
AC_MSG_ERROR([runtime ${R} not found])
fi
AM_CONDITIONAL(AADLIB, true)
;;
pok )
if test -d ${root}/resources/runtime/${R}
then
...
...
@@ -268,7 +281,7 @@ AS_HELP_STRING([--with-ocarina-runtimes=x], [enumerate runtimes]),
],
[
RUNTIME_LIST=""
for P in polyorb-hi-ada polyorb-hi-c
for P in
aadlib
polyorb-hi-ada polyorb-hi-c
do
if test -d ${root}/resources/runtime/${P}
then
...
...
@@ -276,6 +289,7 @@ AS_HELP_STRING([--with-ocarina-runtimes=x], [enumerate runtimes]),
fi
done
AM_CONDITIONAL(AADLIB, test -d "${root}/resources/runtime/aadlib")
AM_CONDITIONAL(POK, test -d "${root}/resources/runtime/pok")
AM_CONDITIONAL(PO_HI_ADA, test -d "${root}/resources/runtime/polyorb-hi-ada")
AM_CONDITIONAL(PO_HI_C, test -d "${root}/resources/runtime/polyorb-hi-c")
...
...
resources/runtime/Makefile.am
View file @
5ab130a1
...
...
@@ -5,6 +5,14 @@ SUBDIRS = cheddar aadl_xml python
################################################################################
maybe-reconfig-aadlib
:
@AADLIB_TRUE@maybe-reconfig-aadlib
:
reconfig-aadlib
reconfig-aadlib
:
r_dir
=
'aadlib'
;
\
test
-f
$(srcdir)
/
$
${r_dir}
/configure
&&
exit
0
||
true
;
\
test
-d
$(srcdir)
/
$
${r_dir}
||
exit
0
;
\
cd
$(srcdir)
/
$
${r_dir}
&&
./support/reconfig
maybe-reconfig-polyorb-hi-ada
:
@PO_HI_ADA_TRUE@maybe-reconfig-polyorb-hi-ada
:
reconfig-polyorb-hi-ada
reconfig-polyorb-hi-ada
:
...
...
@@ -30,6 +38,17 @@ configure-pok:
test
-f
$
${r_dir}
/Makefile
||
exit
0
;
\
cd
$
${r_dir}
&&
$(MAKE)
configure
maybe-configure-aadlib
:
@AADLIB_TRUE@maybe-configure-aadlib
:
configure-aadlib
configure-aadlib
:
reconfig-aadlib
r_dir
=
'aadlib'
;
\
s_dir
=
`
(
cd
$(srcdir)
&&
pwd
)
`
;
\
test
-f
$
${r_dir}
/Makefile
&&
exit
0
||
true
;
\
test
-x
$(srcdir)
/
$
${r_dir}
/configure
||
exit
0
;
\
$(mkdir_p)
$
${r_dir}
&&
cd
$
${r_dir}
||
exit
1
;
\
$
${s_dir}
/
$
${r_dir}
/configure
$(DEBUG_FLAG)
$(DOC_FLAG)
\
--with-ocarina-prefix
=
'
$(prefix)
'
--disable-ocarina-version-check
maybe-configure-polyorb-hi-ada
:
@PO_HI_ADA_TRUE@maybe-configure-polyorb-hi-ada
:
configure-polyorb-hi-ada
configure-polyorb-hi-ada
:
reconfig-polyorb-hi-ada
...
...
@@ -54,6 +73,13 @@ configure-polyorb-hi-c: reconfig-polyorb-hi-c
################################################################################
maybe-all-aadlib
:
@AADLIB_TRUE@maybe-all-aadlib
:
all-aadlib
all-aadlib
:
configure-aadlib
r_dir
=
'aadlib'
;
\
test
-f
$
${r_dir}
/Makefile
||
exit
0
;
\
cd
$
${r_dir}
&&
$(MAKE)
all
maybe-all-polyorb-hi-ada
:
@PO_HI_ADA_TRUE@maybe-all-polyorb-hi-ada
:
all-polyorb-hi-ada
all-polyorb-hi-ada
:
configure-polyorb-hi-ada
...
...
@@ -86,6 +112,13 @@ dvi-polyorb-hi-c: configure-polyorb-hi-c
################################################################################
maybe-install-aadlib
:
@AADLIB_TRUE@maybe-install-aadlib
:
install-aadlib
install-aadlib
:
all-aadlib
r_dir
=
'aadlib'
;
\
test
-f
$
${r_dir}
/Makefile
||
exit
0
;
\
cd
$
${r_dir}
&&
$(MAKE)
DESTDIR
=
"
$(DESTDIR)
"
install
maybe-install-polyorb-hi-ada
:
@PO_HI_ADA_TRUE@maybe-install-polyorb-hi-ada
:
install-polyorb-hi-ada
install-polyorb-hi-ada
:
all-polyorb-hi-ada
...
...
@@ -102,6 +135,13 @@ install-polyorb-hi-c: all-polyorb-hi-c
################################################################################
maybe-installcheck-aadlib
:
@AADLIB_TRUE@maybe-installcheck-aadlib
:
installcheck-aadlib
installcheck-aadlib
:
all-aadlib
r_dir
=
'aadlib'
;
\
test
-f
$
${r_dir}
/Makefile
||
exit
0
;
\
cd
$
${r_dir}
&&
$(MAKE)
installcheck
maybe-installcheck-polyorb-hi-ada
:
@PO_HI_ADA_TRUE@maybe-installcheck-polyorb-hi-ada
:
installcheck-polyorb-hi-ada
installcheck-polyorb-hi-ada
:
all-polyorb-hi-ada
...
...
@@ -118,6 +158,13 @@ installcheck-polyorb-hi-c: all-polyorb-hi-c
################################################################################
maybe-uninstall-aadlib
:
@AADLIB_TRUE@maybe-uninstall-aadlib
:
uninstall-aadlib
uninstall-aadlib
:
r_dir
=
'aadlib'
;
\
test
-f
$
${r_dir}
/Makefile
||
exit
0
;
\
cd
$
${r_dir}
&&
$(MAKE)
DESTDIR
=
"
$(DESTDIR)
"
uninstall
maybe-uninstall-polyorb-hi-ada
:
@PO_HI_ADA_TRUE@maybe-uninstall-polyorb-hi-ada
:
uninstall-polyorb-hi-ada
uninstall-polyorb-hi-ada
:
...
...
@@ -135,6 +182,13 @@ uninstall-polyorb-hi-c:
################################################################################
maybe-clean-aadlib
:
@AADLIB_TRUE@maybe-clean-aadlib
:
clean-aadlib
clean-aadlib
:
r_dir
=
'aadlib'
;
\
test
-f
$
${r_dir}
/Makefile
||
exit
0
;
\
cd
$
${r_dir}
&&
$(MAKE)
clean
maybe-clean-polyorb-hi-ada
:
@PO_HI_ADA_TRUE@maybe-clean-polyorb-hi-ada
:
clean-polyorb-hi-ada
clean-polyorb-hi-ada
:
...
...
@@ -151,6 +205,13 @@ clean-polyorb-hi-c:
################################################################################
maybe-distclean-aadlib
:
@AADLIB_TRUE@maybe-distclean-aadlib
:
distclean-aadlib
distclean-aadlib
:
r_dir
=
'aadlib'
;
\
test
-f
$
${r_dir}
/Makefile
||
exit
0
;
\
cd
$
${r_dir}
&&
$(MAKE)
distclean
maybe-distclean-polyorb-hi-ada
:
@PO_HI_ADA_TRUE@maybe-distclean-polyorb-hi-ada
:
distclean-polyorb-hi-ada
distclean-polyorb-hi-ada
:
...
...
@@ -174,6 +235,13 @@ check-pok: configure-pok
test
-f
$
${r_dir}
/Makefile
||
exit
0
;
\
cd
$
${r_dir}
&&
$(MAKE)
tests
maybe-check-aadlib
:
@AADLIB_TRUE@maybe-check-aadlib
:
check-aadlib
check-aadlib
:
r_dir
=
'aadlib'
;
\
test
-f
$
${r_dir}
/Makefile
||
exit
0
;
\
cd
$
${r_dir}
&&
PATH
=
"
$(DESTDIR)$(bindir)
:
$$
PATH"
$(MAKE)
check
maybe-check-polyorb-hi-ada
:
@PO_HI_ADA_TRUE@maybe-check-polyorb-hi-ada
:
check-polyorb-hi-ada
check-polyorb-hi-ada
:
...
...
@@ -190,6 +258,18 @@ check-polyorb-hi-c:
################################################################################
maybe-dist-aadlib
:
@AADLIB_TRUE@maybe-dist-aadlib
:
dist-aadlib
dist-aadlib
:
configure-aadlib
r_dir
=
'aadlib'
;
\
d_dir
=
'aadlib-dist'
;
\
test
-f
$
${r_dir}
/Makefile
||
exit
0
;
\
cd
$
${r_dir}
&&
$(MAKE)
distdir
"distdir=
$
${d_dir}
"
||
exit
1
;
\
cd
..
&&
chmod
-R
go
=
u-w
$
${r_dir}
/
$
${d_dir}
||
exit
1
;
\
$(mkdir_p)
$(distdir)
/
$
${r_dir}
||
exit
1
;
\
cp
-pR
$
${r_dir}
/
$
${d_dir}
/
*
$(distdir)
/
$
${r_dir}
||
exit
1
;
\
rm
-rf
$
${r_dir}
/
$
${d_dir}
maybe-dist-polyorb-hi-ada
:
@PO_HI_ADA_TRUE@maybe-dist-polyorb-hi-ada
:
dist-polyorb-hi-ada
dist-polyorb-hi-ada
:
configure-polyorb-hi-ada
...
...
@@ -214,11 +294,11 @@ dist-polyorb-hi-c: configure-polyorb-hi-c
cp
-pR
$
${r_dir}
/
$
${d_dir}
/
*
$(distdir)
/
$
${r_dir}
||
exit
1
;
\
rm
-rf
$
${r_dir}
/
$
${d_dir}
################################################################################
# Soft dependenciy against runtimes
all-local
:
\
maybe-all-aadlib
\
maybe-all-polyorb-hi-ada
\
maybe-all-polyorb-hi-c
...
...
@@ -227,30 +307,37 @@ dvi: \
maybe-dvi-polyorb-hi-c
install-data-local
:
\
maybe-install-aadlib
\
maybe-install-polyorb-hi-ada
\
maybe-install-polyorb-hi-c
installcheck
:
\
maybe-installcheck-aadlib
\
maybe-installcheck-polyorb-hi-ada
\
maybe-installcheck-polyorb-hi-c
uninstall-local
:
\
maybe-uninstall-aadlib
\
maybe-uninstall-polyorb-hi-ada
\
maybe-uninstall-polyorb-hi-c
clean-local
:
\
maybe-clean-aadlib
\
maybe-clean-polyorb-hi-ada
\
maybe-clean-polyorb-hi-c
distclean-local
:
\
maybe-distclean-aadlib
\
maybe-distclean-polyorb-hi-ada
\
maybe-distclean-polyorb-hi-c
maybe-check-runtimes
:
\
maybe-check-pok
\
maybe-check-aadlib
\
maybe-check-polyorb-hi-ada
\
maybe-check-polyorb-hi-c
dist-hook
:
\
maybe-dist-aadlib
\
maybe-dist-polyorb-hi-ada
\
maybe-dist-polyorb-hi-c
maybe-dist-polyorb-hi-c
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment