Commit cf7bc935 authored by yoogx's avatar yoogx

Merge branch 'master' of https://github.com/yoogx/ocarina

parents dd5fee13 31b27603
......@@ -14,4 +14,8 @@ doc/version.texi
resources/runtime/polyorb-hi-ada
resources/runtime/polyorb-hi-c
support/mdate-sh
support/texinfo.tex
\ No newline at end of file
support/texinfo.tex
tools/compare.py
log.*
support/headers_ocarina*
#! /bin/sh
# This script builds Ocarina automatically. It is used to regularly
# test the status of the source code.
TMP_FILE=`mktemp filXXXXXX`
TMP_DIR=`mktemp -d dirXXXXXX`
echo "SVN: reconfiguring..."
./support/reconfig > ${TMP_FILE} 2>&1
s=$?
if [ ${s} != 0 ]; then
echo "SVN: problem in reconfig"
cat ${TMP_FILE}
exit ${s}
fi
echo "SVN: configuring..."
./configure $@ > ${TMP_FILE} 2>&1
s=$?
if [ ${s} != 0 ]; then
echo "SVN: problem in configure"
cat ${TMP_FILE}
exit ${s}
fi
echo "SVN: light cleanup..."
make clean > ${TMP_FILE} 2>&1
s=$?
if [ ${s} != 0 ]; then
echo "SVN: problem in make clean"
cat ${TMP_FILE}
exit ${s}
fi
echo "SVN: building..."
make > ${TMP_FILE} 2>&1
s=$?
if [ ${s} != 0 ]; then
echo "SVN: problem in make"
cat ${TMP_FILE}
exit ${s}
fi
echo "SVN: installation..."
make install > ${TMP_FILE} 2>&1
s=$?
if [ ${s} != 0 ]; then
echo "SVN: problem in make install"
cat ${TMP_FILE}
exit ${s}
fi
echo "SVN: full cleanup..."
make distclean > ${TMP_FILE} 2>&1
s=$?
if [ ${s} != 0 ]; then
echo "SVN: problem in make distclean"
cat ${TMP_FILE}
exit ${s}
fi
echo "SVN: configuring 2..."
./configure $@ > ${TMP_FILE} 2>&1
s=$?
if [ ${s} != 0 ]; then
echo "SVN: problem in configure 2"
cat ${TMP_FILE}
exit ${s}
fi
echo "SVN: building distribution..."
make dist > ${TMP_FILE} 2>&1
s=$?
if [ ${s} != 0 ]; then
echo "SVN: problem in make dist"
cat ${TMP_FILE}
exit ${s}
fi
echo "SVN: extract archive..."
tar xzvf ocarina*.tar.gz -C ${TMP_DIR} > ${TMP_FILE} 2>&1
s=$?
if [ ${s} != 0 ]; then
echo "SVN: problem in make dist"
cat ${TMP_FILE}
exit ${s}
fi
# Enter to the archive dir
cd ${TMP_DIR}/ocarina*
echo "DIST: configuring..."
./configure $@ > ${TMP_FILE} 2>&1
s=$?
if [ ${s} != 0 ]; then
echo "DIST: problem in configure"
cat ${TMP_FILE}
exit ${s}
fi
echo "DIST: building..."
make > ${TMP_FILE} 2>&1
s=$?
if [ ${s} != 0 ]; then
echo "DIST: problem in make"
cat ${TMP_FILE}
exit ${s}
fi
echo "DIST: installation..."
make install > ${TMP_FILE} 2>&1
s=$?
if [ ${s} != 0 ]; then
echo "DIST: problem in make install"
cat ${TMP_FILE}
exit ${s}
fi
cd ../..
# Rebuild the SVN copy
echo "SVN: building 2..."
make > ${TMP_FILE} 2>&1
s=$?
if [ ${s} != 0 ]; then
echo "SVN: problem in make 2"
cat ${TMP_FILE}
exit ${s}
fi
rm -f ${TMP_FILE}
rm -rf ${TMP_DIR}
exit 0
......@@ -421,10 +421,10 @@ if test ${dotests} = "true" ; then
else
total=`expr ${total} + 1`
if test -r ${gprfile} ; then
ocarina_gpr="`ocarina-config --prefix`/lib/gnat"
command="ADA_PROJECT_PATH=\"${ocarina_gpr}${path_sep}${ADA_PROJECT_PATH}\" gnatmake -P\"`${path_conv} ${gprfile}`\" -XOBJ_DIR=\"`${path_conv} ${tmpdir}`\""
ocarina_gpr="`ocarina-config --projects`"
command="gnatmake -P\"`${path_conv} ${gprfile}`\" -aP${ocarina_gpr} -XOBJ_DIR=\"`${path_conv} ${tmpdir}`\""
ADA_PROJECT_PATH="${ocarina_gpr}${path_sep}${ADA_PROJECT_PATH}" \
gnatmake -P"`${path_conv} ${gprfile}`" \
gnatmake -P"`${path_conv} ${gprfile}`" -aP${ocarina_gpr} \
-XOBJ_DIR="`${path_conv} ${tmpdir}`" \
>${actual_output} 2>&1
else
......
......@@ -57,24 +57,21 @@ GUIDE_TEXIFILES =\
$(GEN_TEXIFILES) \
gfdl.texi
EXTRA_DIST=\
$(srcdir)/CODING_GUIDELINES \
$(srcdir)/CONTRIBUTING \
$(srcdir)/PROBLEM-REPORT-FORM \
$(GUIDE_TEXIFILES)\
$(ALL_IMAGES)\
$(ADAFILES)\
$(AADLFILES)\
$(KW_FILES)\
$(srcdir)/ocarina.css
info_TEXINFOS = ocarina.texi
ocarina_TEXINFOS=$(GUIDE_TEXIFILES)
man_MANS = ocarina-config.1 ocarina.1
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 --html $(srcdir)/$(GUIDE).texi -o $(GUIDE).html
-$(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/
......@@ -138,6 +135,9 @@ install-data-local: all
fi
$(INSTALL_DATA) $(srcdir)/CONTRIBUTING $(DESTDIR)$(datadir)/doc/ocarina
$(INSTALL_DATA) $(srcdir)/PROBLEM-REPORT-FORM $(DESTDIR)$(datadir)/doc/ocarina
$(INSTALL_DATA) $(builddir)/ocarina-config.html $(DESTDIR)$(datadir)/doc/ocarina
$(INSTALL_DATA) $(builddir)/ocarina_man.html $(DESTDIR)$(datadir)/doc/ocarina
$(INSTALL_DATA) $(srcdir)/ocarina.css $(DESTDIR)$(datadir)/doc/ocarina
uninstall-local:
rm -rf $(DESTDIR)$(datadir)/doc/ocarina
......@@ -173,3 +173,16 @@ sed-stamp: $(top_srcdir)/tools/gensedfile $(KW_FILES)
$(SHELL) $(top_srcdir)/tools/gensedfile $$f; \
done
touch sed-stamp
###############################################################################
# Building manpages
build_man: $(top_srcdir)/ocarina-config.in
chmod 755 $(top_builddir)/ocarina-config
help2man --no-discard-stderr $(top_builddir)/ocarina-config > $(top_builddir)/doc/ocarina-config.1
echo ".HEAD \"<link rel=\"\"stylesheet\"\" type=\"\"text/css\"\" href=\"\"ocarina.css\"\" >\"" >> $(top_builddir)/doc/ocarina-config.1
groff -man -Thtml $(top_builddir)/doc/ocarina-config.1 > $(top_builddir)/doc/ocarina-config.html
-help2man --no-discard-stderr --help-option="-help" --version-option="-V" `which ocarina` > $(top_builddir)/doc/ocarina.1
echo ".HEAD \"<link rel=\"\"stylesheet\"\" type=\"\"text/css\"\" href=\"\"ocarina.css\"\" >\"" >> $(top_builddir)/doc/ocarina.1
groff -man -Thtml $(top_builddir)/doc/ocarina.1 > $(top_builddir)/doc/ocarina_man.html
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.40.10.
.TH OCARINA "1" "avril 2013" "Ocarina 2.0w" "User Commands"
.SH NAME
Ocarina \- manual page for Ocarina 2.0w
.SH SYNOPSIS
.B ocarina-config
[\fIOPTIONS\fR]
.SH OPTIONS
.IP
No option:
.IP
Output all the flags (compiler and linker) required
to compile your program.
.IP
[\-\-prefix[=DIR]]
.IP
Output the directory in which Ocarina architecture\-independent
.IP
files are installed, or set this directory to DIR.
.IP
[\-\-exec\-prefix[=DIR]]
.IP
Output the directory in which Ocarina architecture\-dependent
.IP
files are installed, or set this directory to DIR.
.IP
[\-\-version|\-v]
.IP
Output the version of Ocarina.
.IP
[\-\-config]
.IP
Output Ocarina's configuration parameters.
.IP
[\-\-runtime[=<Runtime_Name>]]
.IP
Checks the validity and the presence of the given runtime and
then, outputs its path. Only one runtime can be requested at
a time. If no runtime name is given, outputs the root directory
of all runtimes.
.IP
[\-\-libs]
.IP
Output the linker flags to use for Ocarina.
.IP
[\-\-projects]
.IP
Output the path to GNAT Project files for Ocarina
.IP
[\-\-properties]
.IP
Output the location of the standard property file.
.IP
[\-\-resources]
.IP
Output the location of resource files
(typically the standard properties)
.IP
[\-\-cflags]
.IP
Output the compiler flags to use for Ocarina.
.IP
[\-\-help]
.IP
Output this message
.SH "SEE ALSO"
The full documentation for
.B Ocarina
is maintained as a Texinfo manual. If the
.B info
and
.B Ocarina
programs are properly installed at your site, the command
.IP
.B info Ocarina
.PP
should give you access to the complete manual.
.HEAD "<link rel=""stylesheet"" type=""text/css"" href=""ocarina.css"" >"
<!-- Creator : groff version 1.19.2 -->
<!-- CreationDate: Thu Apr 18 14:42:34 2013 -->
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
"http://www.w3.org/TR/html4/loose.dtd">
<html>
<head>
<meta name="generator" content="groff -Thtml, see www.gnu.org">
<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
<meta name="Content-Style" content="text/css">
<style type="text/css">
p { margin-top: 0; margin-bottom: 0; }
pre { margin-top: 0; margin-bottom: 0; }
table { margin-top: 0; margin-bottom: 0; }
</style>
<title>OCARINA</title>
<link rel="stylesheet" type="text/css" href="ocarina.css" >
</head>
<body>
<h1 align=center>OCARINA</h1>
<a href="#NAME">NAME</a><br>
<a href="#SYNOPSIS">SYNOPSIS</a><br>
<a href="#OPTIONS">OPTIONS</a><br>
<a href="#SEE ALSO">SEE ALSO</a><br>
<hr>
<a name="NAME"></a>
<h2>NAME</h2>
<p style="margin-left:11%; margin-top: 1em">Ocarina &minus;
manual page for Ocarina 2.0w</p>
<a name="SYNOPSIS"></a>
<h2>SYNOPSIS</h2>
<p style="margin-left:11%; margin-top: 1em"><b>ocarina-config</b>
[<i>OPTIONS</i>]</p>
<a name="OPTIONS"></a>
<h2>OPTIONS</h2>
<p style="margin-left:22%; margin-top: 1em">No option:</p>
<p style="margin-left:22%; margin-top: 1em">Output all the
flags (compiler and linker) required to compile your
program.</p>
<p style="margin-left:22%; margin-top: 1em">[&minus;&minus;prefix[=DIR]]</p>
<p style="margin-left:22%; margin-top: 1em">Output the
directory in which Ocarina
architecture&minus;independent</p>
<p style="margin-left:22%; margin-top: 1em">files are
installed, or set this directory to DIR.</p>
<p style="margin-left:22%; margin-top: 1em">[&minus;&minus;exec&minus;prefix[=DIR]]</p>
<p style="margin-left:22%; margin-top: 1em">Output the
directory in which Ocarina architecture&minus;dependent</p>
<p style="margin-left:22%; margin-top: 1em">files are
installed, or set this directory to DIR.</p>
<p style="margin-left:22%; margin-top: 1em">[&minus;&minus;version|&minus;v]</p>
<p style="margin-left:22%; margin-top: 1em">Output the
version of Ocarina.</p>
<p style="margin-left:22%; margin-top: 1em">[&minus;&minus;config]</p>
<p style="margin-left:22%; margin-top: 1em">Output
Ocarina&rsquo;s configuration parameters.</p>
<p style="margin-left:22%; margin-top: 1em">[&minus;&minus;runtime[=&lt;Runtime_Name&gt;]]</p>
<p style="margin-left:22%; margin-top: 1em">Checks the
validity and the presence of the given runtime and then,
outputs its path. Only one runtime can be requested at a
time. If no runtime name is given, outputs the root
directory of all runtimes.</p>
<p style="margin-left:22%; margin-top: 1em">[&minus;&minus;libs]</p>
<p style="margin-left:22%; margin-top: 1em">Output the
linker flags to use for Ocarina.</p>
<p style="margin-left:22%; margin-top: 1em">[&minus;&minus;projects]</p>
<p style="margin-left:22%; margin-top: 1em">Output the path
to GNAT Project files for Ocarina</p>
<p style="margin-left:22%; margin-top: 1em">[&minus;&minus;properties]</p>
<p style="margin-left:22%; margin-top: 1em">Output the
location of the standard property file.</p>
<p style="margin-left:22%; margin-top: 1em">[&minus;&minus;resources]</p>
<p style="margin-left:22%; margin-top: 1em">Output the
location of resource files (typically the standard
properties)</p>
<p style="margin-left:22%; margin-top: 1em">[&minus;&minus;cflags]</p>
<p style="margin-left:22%; margin-top: 1em">Output the
compiler flags to use for Ocarina.</p>
<p style="margin-left:22%; margin-top: 1em">[&minus;&minus;help]</p>
<p style="margin-left:22%; margin-top: 1em">Output this
message</p>
<a name="SEE ALSO"></a>
<h2>SEE ALSO</h2>
<p style="margin-left:11%; margin-top: 1em">The full
documentation for <b>Ocarina</b> is maintained as a Texinfo
manual. If the <b>info</b> and <b>Ocarina</b> programs are
properly installed at your site, the command</p>
<p style="margin-left:22%; margin-top: 1em"><b>info
Ocarina</b></p>
<p style="margin-left:11%; margin-top: 1em">should give you
access to the complete manual.</p>
<hr>
</body>
</html>
.HEAD "<link rel=""stylesheet"" type=""text/css"" href=""ocarina.css"" >"
/* Global settings */
body {}
body {
background-color: white;
position: absolute;
font-size: medium;
font-family: Verdana;
// padding-left: 7em;
top: 3em;
}
/*
CSS stylesheet for XHTML produced by DocBook XSL stylesheets.
Tested with XSL stylesheets 1.61.2, 1.67.2
*/
div.navigation {
font-size: small;
padding-left: 0;
padding-right: 0;
text-align: right
span.strong {
font-weight: bold;
}
div#menu {
text-align: left;
position: fixed;
left: 1pt;
bottom: auto;
top: 2em;
right: auto;
padding-right: 1ex;
padding-left: 1em;
padding-top: 1ex;
padding-bottom: 1ex;
border-width: 3pt;
background-color: transparent;
border-color: red;
border-left-style: solid
body blockquote {
margin-top: .75em;
line-height: 1.5;
margin-bottom: .75em;
}
div#menu span.item {
display: block;
background-color: transparent;
html body {
margin: 1em 5% 1em 5%;
line-height: 1.2;
font-family: sans-serif;
}
table.navigation {
font-size: small
}
/* Paragraphs */
p, blockquote {
color: black;
text-indent: 1em;
text-align: justify
body div {
margin: 0;
}
p {
margin-bottom: .5em;
margin-top: 1px
h1, h2, h3, h4, h5, h6,
div.toc p b,
div.list-of-figures p b,
div.list-of-tables p b,
div.abstract p.title
{
color: #527bbd;
font-family: tahoma, verdana, sans-serif;
}
p kbd
div.toc p:first-child,
div.list-of-figures p:first-child,
div.list-of-tables p:first-child,
div.example p.title
{
background-color: ivory
margin-bottom: 0.2em;
}
div.important {
background-color: lightgray;
border-color: red;
border-style: solid;
border-width: 1pt
}
p.important {
color: red
}
p.brut {
text-indent: 0
}
p.brut:first-letter {
font-size: 100%;
font-weight: normal
body h1 {
margin: .0em 0 0 -4%;
line-height: 1.3;
border-bottom: 2px solid silver;
}
/* Sections */
div {
border-style: none;
padding-left: 1em;
padding-right: 1em;
margin-top: 2px;
margin-bottom: 2px
body h2 {
margin: 0.5em 0 0 -4%;
line-height: 1.3;
border-bottom: 2px solid silver;
}
/* Menus */
div.action {
background-color: ivory;
border-color: lightgray;
border-style: solid;
border-width: 1pt 1pt 1pt 1pt;
font-size: small;
text-align: left
body h3 {
margin: .8em 0 0 -3%;
line-height: 1.3;
}
div.special
{
border-color: lightgray;
border-style: solid;
border-width: 0 0 0 4pt
body h4 {
margin: .8em 0 0 -3%;
line-height: 1.3;
}
body h5 {
margin: .8em 0 0 -2%;
line-height: 1.3;
}
/* Docbook special settings */