Georg Bauhaus <[email protected]> writes:
> I am appending a diff for opentoken-4.0w-2013-09-02, in case someone
> wishes to experiment on Mac OS X. Some of them may be of interest also
> if running on other systems.
>
> The changes have let me
>
> (a) translate wisi-generate.exe on a Mac (10.7.5) with GNAT GPL 2012,
> (b) run the testing parts of the its "make" process.
Excellent.
Thanks for working on this.
I'm getting errors in the tests on Debian here; I haven't run on Debian
in a while.
I'm trying to make time to do a full release of all these tools, so this
will get cleaned up.
> Both appropriate the files in build/linux_{release|debug} for
> configuration and building.
So far this looks ok for Debian as well (see below).
> A minimal change for (a) was setting the GPRBUILD_TARGET
> to the triple output by gcc -v.
Automating that looks ok:
GPRBUILD_TARGET := $(shell gcc -dumpmachine)
works on Debian and Windows.
> The other changes address .gpr paths, source include paths,
> line length issues,
I think that's for the Check procedures in gen_opentoken_aunit.adb? Yes,
those lines were too long.
Ah; I had turned off the length check for all files in the
opentoken_test project. I like your solution better.
> the executable path, and comparison of lines of text irrespective of
> EOL characters (see AUnit.Check).
I like the EOL Chomp.
> Only Windows includes "." in PATH automatically. Therefore,
> starting "make" as seen below lets the process find the freshly
> built executables:
>
> $ PATH=$(pwd):$PATH make
I could change the make rules to run ./* rather than just *. That would
make sense.
But it's not a prolem on Debian. And I don't have "." in my $PATH. So I
don't know why it's not a problem.
> (The only thing left, for full Mac support, is, I think, to select
> the proper tools for making the dynamic library. (It is built as
> a file ending with ".so"))
This _should_ be handled by declaring the library project properly; did
you check that I have everything necessary according to the GNAT user
guide?
On Windows, the library defaults to static (not sure why), but on linux,
it is set by build/common.gpr to the LIBTYPE env var, which defaults to
dynamic.
It may be that GNAT 2012 on OS X doesn't support dynamic libraries.
> diff -Naur org.opentoken.stephe-4.0w-2013-09-02/Test/aunit-check.adb
> opentoken-4.0w-2013-09-02/Test/aunit-check.adb
> --- org.opentoken.stephe-4.0w-2013-09-02/Test/aunit-check.adb
> +++ opentoken-4.0w-2013-09-02/Test/aunit-check.adb
cleaned up a bit, accepted.
> --- org.opentoken.stephe-4.0w-2013-09-02/Test/gen_opentoken_aunit.adb
> +++ opentoken-4.0w-2013-09-02/Test/gen_opentoken_aunit.adb
cleaned up a bit, accepted.
> --- org.opentoken.stephe-4.0w-2013-09-02/build/linux_debug/Makefile
> +++ opentoken-4.0w-2013-09-02/build/linux_debug/Makefile
> @@ -10,7 +10,7 @@
> one : RUN_ARGS := ../../wisi/test/body_instantiation_conflict.wy Elisp
> one : wisi-generate.run
>
> -GPRBUILD_TARGET := x86-linux
> +GPRBUILD_TARGET := x86_64-apple-darwin10.8.0
replaced with
GPRBUILD_TARGET := $(shell gcc -dumpmachine)
> --- org.opentoken.stephe-4.0w-2013-09-02/build/linux_debug/opentoken_test.gpr
> 2013-09-02 08:17:54.000000000 +0000
> +++ opentoken-4.0w-2013-09-02/build/linux_debug/opentoken_test.gpr
> 2013-09-10 12:44:43.000000000 +0000
> @@ -1,10 +1,11 @@
> -- For running OpenToken tests.
> with "aunit";
> -with "common";
> +with "../common";
Accepted.
Note that linux_release/opentoken_test.gpr has this fix already. I
usually run in build/*_release, so the *_debug files are often out of
date.
> project OpenToken_Test is
>
> for Source_Dirs use
> - ("../..",
> + (".",
accepted
> + "../..",
The correct fix is to add 'with "opentoken";' above.
--
-- Stephe
_______________________________________________
Emacs-ada-mode mailing list
[email protected]
http://host114.hostmonster.com/mailman/listinfo/emacs-ada-mode_stephe-leake.org
