Parent Directory
| 
Revision Log
| Sticky Revision: |
first attempt at merging with Ben's changes on the trunk
Merged changes from DAE branch (revisions 702 to 819) back into trunk. This adds the Integration API to the ASCEND solver (in base/generic). Also provides pre-alpha support for 'IDA' from the SUNDIALS suite, a DAE solver. Many other minor code clean-ups, including adoption of new 'ASC_NEW' and friends (to replace 'ascmalloc') Added some very sketchy stuff providing 'DIFF(...)' syntax, although it is anticipated that this will be removed.
Summary: most of the recent complaints about autotools build fixed, but the buildbot might find a problem with the scons build/install/rpmbuild. Details: configure,Driver.c,utilities/config.h.in: The choice of INSTALL_DATA as a configure variable name has been repaired (renamed INSTALL_SHARE); INSTALL_DATA is the unix canonical name for the program 'install' handling a data file. Both autotools and scons builds have been updated to reflect this, in the process correcting the definition from prefix/share to prefix/share/ascend. autotools build: Added --with-quiet option to make the install of already installed and unchanged files less verbose. Put in a workaround for the '' problem in tkConfig.sh seen by KC/JP. Added --datadir support to autotools configure. If you configure the autotools --datadir=PREFIX/share/ascend you get the same behavior as the Pye packaging; by default you get the CMU packaging convention instead. Added utilities/env.c to build. compiler: Turned off AWAL in anontype.c. Noodling away at blackboxes continues...
Working on platform-independent pathnames for the IMPORT command. Added 'ospath.c' to base/generic/general for this purpose. Patched kvalues and sensitivity to use the 'IMPORT "libname";' syntax instead of 'IMPORT registerfn FROM libname;'. Fixed pathnames in create.nsi. Added GPL header to coupla files. Added quoting to 'IMPORT' syntax in ascParse.y. Removed 'PackageOption' from Tcl/Tk related Scons options so that missing Tcl/Tk doesn't cause breakage.
Changed the syntax of import from IMPORT id FROM id; to IMPORT id FROM "quoted/text/lib"; Writing external METHOD calls via the EXTERNAL methname(arglist); now works. Against my better judgement in a few cases, cleaned up the old EXT statement code from Abbott to work in a typesafe manner. A better solution is to get the CALL syntax working as defined in the grammar, but this takes a good deal more work and meanwhile people want to get their phds... Still some known bugs in relation_util. I need to commit the test models that go with the EXT statements. Fixed a bunch of lintish compiler complaints. Don't try to solve external models yet.
updated kvalues example to parse and put in model library. changed import library name to dquote text for more generality. fixed many, but not all problems in kvalues.c
Normalised all #include statements so that files in the current directory are included as "localfile.h" and files in other directories are included as <directory/file.h> This is in accordance with the spec at http://gcc.gnu.org/onlinedocs/gcc-4.1.0/cpp/Include-Syntax.html#Include-Syntax
Correcting package checkin
This form allows you to request diffs between any two revisions of this file. For each of the two "sides" of the diff, enter a numeric revision.
| john.pye@anu.edu.au | ViewVC Help |
| Powered by ViewVC 1.1.22 |