Commit 93a7925e authored by yoogx's avatar yoogx

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

parents a3209202 51392f63
......@@ -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
......
......@@ -5,6 +5,7 @@ work_dir=`pwd`
script_dir=`dirname $0`; cd ${script_dir}; script_dir=`pwd`
prefix="${script_dir}/.."; cd ${prefix}; prefix=`pwd`;
prefix_w=`@CYGPATH_W@ ${prefix}`
projects_w=`@CYGPATH_W@ ${prefix}/lib/gnat`
cd ${work_dir}
modules="frontends backends"
......@@ -34,6 +35,8 @@ Options:
of all runtimes.
[--libs]
Output the linker flags to use for Ocarina.
[--projects]
Output the path to GNAT Project files for Ocarina
[--properties]
Output the location of the standard property file.
[--resources]
......@@ -97,6 +100,9 @@ while test $# -gt 0; do
--libs)
echo_libs=true
;;
--projects)
echo_projects=true
;;
--runtime=*)
requested_runtime=${optarg}
......@@ -163,6 +169,7 @@ if test ! x"${echo_prefix}" = x"true" \
-a ! x"${echo_exec_prefix}" = x"true" \
-a ! x"${echo_cflags}" = x"true" \
-a ! x"${echo_libs}" = x"true" \
-a ! x"${echo_projects}" = x"true" \
-a ! x"${runtime_set}" = x"true";
then
echo ${ocarina_dir} -largs ${ocarina_lib}
......@@ -183,6 +190,10 @@ if test x"${echo_libs}" = x"true"; then
echo ${ocarina_lib}
fi
if test x"${echo_projects}" = x"true"; then
echo ${projects_w}
fi
if test x"${runtime_set}" = x"true"; then
echo ${ocarina_runtime}
fi
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