Commit Graph

33 Commits

Author SHA1 Message Date
Neil Brown
0466a50dfa Changed the build process to support a directory to put modules and includes in, and added a dummy lib (occamutl) 2009-04-04 12:28:47 +00:00
Neil Brown
4fd2c7c890 Took out my warning option since it causes problems 2009-03-22 14:50:25 +00:00
Neil Brown
63d6c5258d Added an extra GCC flag to help catch problems with the C output 2009-03-21 22:57:49 +00:00
Neil Brown
592ed1d4ef Added a line to fix an autoconf warning and added -lm to the link options (for the math libraries) 2009-01-27 16:59:35 +00:00
Neil Brown
addcefdab2 Stopped GCC warning about unused variables
We detect real unused variables from the occam program ourselves, but we don't want GCC warnings for all the unused _sizes variables and so on
2009-01-27 12:56:32 +00:00
Neil Brown
9145c993ea Fixed the constant folding to use a type for Int based on the compilation target rather than just assuming Int32
However, it is possible that there will still be a problem if the C and C++ compiler have different int sizes, because the constant folding has to know the type at compile time, and thus we have to arbitrarily choose to use the C version.  In future, we could perhaps swap all Ints for the appropriate substiution (e.g. Int64) at run-time, based on the flags and prior knowledge about C/C++ int sizes
2009-01-23 15:50:06 +00:00
Neil Brown
732080557c Made the configure script check if certain GCC flags are supported before using them 2009-01-23 14:16:39 +00:00
Neil Brown
0d2ea4c920 Updated the code in light of the feedback from the GCC bug 2009-01-22 11:41:43 +00:00
Neil Brown
1b51eb5d63 Added a C file of tests ready for the occam overflow checking 2009-01-22 11:25:50 +00:00
Neil Brown
7f387ae6a9 Fixed a conflict in configure.ac, adding the GLIB_ flags to the C flags 2008-05-18 11:39:51 +00:00
Neil Brown
963b677142 Added support for detecting glib for the C backend 2008-03-25 18:43:48 +00:00
Adam Sampson
441b2ee344 Do away with the pkgconfig file in favour of another generated module.
Paths.hs is now generated by the Makefile.am, so it can include paths.

As a bonus, this actually works, since we weren't previously installing the .pc
file anywhere...
2008-05-07 13:06:27 +00:00
Adam Sampson
7567e5e499 Move the autoconf-generated Haskell files into a "config" directory. 2008-05-07 12:57:35 +00:00
Adam Sampson
39c7522096 Remove an obsolete FIXME. 2008-05-07 12:49:20 +00:00
Adam Sampson
d289900cb5 Use pkgconfig to find CCSP.
This means we now only depend on CCSP, rather than all of KRoC.
2008-05-07 10:48:48 +00:00
Adam Sampson
f3ca84c2b9 Add AC_PREREQ.
We need a fairly recent autoconf; this'll make it obvious if a user's got an
older one.
2008-04-26 19:58:52 +00:00
Neil Brown
4e890a45d5 Reworked the way we record the C/C++ compiler flags for Tock to use
Previously, the files were auto-generated from the Makefile.am.  This patch changes to generate the flags using .in files, generated by the configure script.

The only problem with this is that the include directory for the Tock support files became difficult, because it depended on Tock's install prefix.  As a solution, I've added a pkg-config file for the Tock flags.  There might be some way to streamline the whole process once CCSP uses pkg-config, as then Tock, CCSP and C++CSP will all use pkg-config; it might be more flexible for Tock to run the pkg-config command every time it compiles, to avoid having to recompile Tock if you reinstall one of its C/C++ dependencies to a new directory.
2008-03-25 14:53:06 +00:00
Neil Brown
0f0072866c Added a check for C++CSP2 using pkg-config 2008-03-17 17:36:48 +00:00
Neil Brown
c110eada17 Fixed an issue with caching of sizeof(int) in configure.ac 2008-03-17 17:35:28 +00:00
Neil Brown
5714b5552a Added an automatically generated module containing the sizes of bool and int in the C and C++ implementations on the host machine 2008-03-07 21:23:24 +00:00
Adam Sampson
aff90d8d45 Some initial shuffling to get Tock working with the new CIF.
This changes the TLP code to use CCSP's stand-alone mode, and gets rid of the
old KRoC wrapper stuff. It also changes occam_stop everywhere in order to pass
the number of arguments (since ExternalCallN needs that now), and cleans up the
interaction with the C++ backend a bit.
2008-03-05 16:21:20 +00:00
Adam Sampson
cbcccae96c Don't clobber CFLAGS/CPPFLAGS while configuring. 2008-02-29 11:09:18 +00:00
Neil Brown
07fe209140 Added some checks for the regex packages that Tock already depends on 2008-01-26 19:37:21 +00:00
Neil Brown
f46b8f5d72 Added detection of GHC's version number, and altered the GHC flags depending on the version 2008-01-26 17:27:44 +00:00
Neil Brown
d3c246a911 Fixed an autoconf warning due to using an obsolete form of the AC_OUTPUT macro 2007-11-21 12:41:11 +00:00
Neil Brown
feec33df4a Reinserted the haddock rules into the Makefile.am (they got missed out in the transition from the old build system) and put a warning-check for haddock in the configure.ac file. 2007-11-12 17:35:03 +00:00
Neil Brown
29333729eb Added QuickCheck to the list of needed libraries in configure.ac 2007-11-11 00:35:47 +00:00
Neil Brown
4d6d645010 Fixed various bugs in the build system relating to detected CCSP and C++CSP 2007-10-14 17:04:11 +00:00
Neil Brown
8e2c31f191 Tidied up some CCSP/C++CSP bits in configure.ac 2007-10-28 22:25:33 +00:00
Neil Brown
8ad4e8aab4 Added checks for required haskell libraries in configure.ac (using ghc-pkg) 2007-10-28 22:25:06 +00:00
Neil Brown
7ba4392b49 Made a common function for the required-program checks in configure.ac 2007-10-28 22:22:55 +00:00
Neil Brown
caa2a6164d Added rules for getting and making the cgtests to the new Automake make system 2007-10-09 00:44:41 +00:00
Neil Brown
7cee4e46fc Changed tock to use autoconf/automake for its build process
The old Makefile has been removed, and configure.ac and Makefile.am added in its place, along with the four files (AUTHORS, ChangeLog, NEWS and README) that autoconf requires you to have (all currently blank).  tock and tocktest can now be compiled, but the rules for cgtests and compiling the C and C++ files are currently missing.
2007-10-08 17:02:03 +00:00