Parent Directory
| 
Revision Log
| Links to HEAD: | (view) (download) (annotate) |
| Sticky Revision: |
Added SCons tests to check SIGINT and to replace ascresetneeded (need replacement for this in Autoconf as well).
Removed debugging from createinst.c
Typo (text) in evaluate.c
Commented out redundant code in importhandler.c
Added signal handling in ExecuteCASGN.
Added missing ospath_free in ModuleSearchPath.
Exported InitSymbolTable, DestroySymbolTable in symtab (dubious)
Moved FPRESET macro out of ascConfig.h and into ascSignal.h
Added Asc_SignalHandler{Push,Pop}Default.
Added ASC_RESETNEEDED and HAVE_C99FPE macros in config.h.in.
Found the bug causing the SIGFPE in idakryx.a4c (raises a question about int/float division in modelling, I think)
Added system_destroy call in Simulation::~Simulation (dubious).
Fixed OSPATH typo Other minor doc changes.
Able to compile now on Solaris. Fixed a problem with datareader.c returning non-void. Remains a problem with std::logic_error not being linked to _ascpy
static linking to python, again
Bit more on building against static libpython
Fixed for static linking to python where libpython2.x.so is not available.
Modified SConstruct so that no assumption is made about the version of Python being used.
Added test for C99 FPE handling Fixing mess-up of ChildByChar in arrayinst.h header. Added 'safeeval' config option to IDA. Changed 'SigHandler' to 'SigHandlerFn *' in line with other function pointer datatypes being used in ASCEND. Moved processVarStatus *after* 'Failed integrator' exception (ongoing issue).
Added support for dmalloc (http://dmalloc.com) Added Integrator::setEngine(string name) Minor other stuff.
Adopted suggestions wrt Py_None on Windows platform (extpy) Fixed up default values of CUNIT_PREFIX (needs testing for case where missing)
Expanded the 'ascend-config' mechanism to be supported in Windows installations (On Windows, ascend-config is installed in $INSTDIR and uses the registry instead of hard-coded file paths).
Added test for SUNDIALS version (2.2.1 and 2.3.0-pre are preferred) Fixed silly warning message about ignored return values from CONSOLE_DEBUG on GCC.
Bumping version for fixed IDA integrator
Some success with IDA: fixed up the indexing dilemma and was able to integrate 'johnpye/thermalequilibrium.a4c' for a short time span (but through to 3000 s as with LSODE). I would blame lack of jacobian routine in the first instance. Added 'more properties' button in Properties dialog for a variable, to allow values of ode_id, ode_type etc to be queried (but not changed).
Bumping version to 0.9.5.102 after checking windows build.
Better plot points in moody diagram model. Attempt to get rid of some compiler warnings in extmethod. Better handling of LD_LIBRARY_PATH and ASCENDLIBRARY in ascdev. Changed default documentation path (to avoid warnings, seems like a scons bug?)
Trying to fix installation of the ASCEND manual, still not quite right :-(
bumping versions to 0.9.5.101
Some work on the IMPORT handler functionality. Mostly just placeholders at this stage.
Improved detection of Python, GTK, Tcl/Tk, Glade in Windows installer. Bumped version to 0.9.5.100
Added new script 'ascdev' to launch ASCEND in 'developer mode' which means that files in the source hierarchy will be used instead of the installed files.
Updated installer to allow separate choices of PyGTK and Tcl/Tk GUIs at install-time. Installer won't allow GUIs to be installed unless ActiveTcl and/or Python are located. Bumped version to 0.9.5.99.
Bumped version to 0.9.5.98. Added support for 'setSymbolValue' from C++ interface, and allow symbol variables to be edited via the PyGTK GUI. Added some limited data about structural analysis of beams in johnpye/aiscbeams.a4c. Updated johnpye/beam4.a4c to use this data. Added some currency conversions to measure.a4l. Added some units related to Mechanics of Solids to atoms.a4l.
Renamed testTrig to testfunc.a4c. Removed some buildtime messages. Added self-test to testfunc model. Some windows-specific changes to SConstruct (need testing?)
Added an attempt to fix the long-command-line-on-windows problem, then disabled it pending assistance from the scons user's list
bumped version to 0.9.5.97 added error message when datareader file not found in search path fixed datareader linkage for Windows.
Adding the 'sun.c' and 'sun.h' files back into ASCEND so that we don't need dependency on libradtran. Added detection of Scrollkeeper, the freedesktop.org documentation manager. Added placeholder SConscript file for building the user's manual.
Added vim 'syntax=python' comments to many SConscript files.
Lots more work on the datareader extfn.
The testtmy.a4c file requires the file obtained here ('gzip -d' before use)
http://rredc.nrel.gov/solar/old_data/nsrdb/tmy2/unix/23161.tm2.Z
In slv9, made changes to keep CONOPT from complaining. CMSlv still not working as expected though. Decreased required version of Bison to 2.0. Switched search path for CONOPT on Linux to the CONOPT_PATH env var (LD_LIBRARY_PATH was being interfered with when ASC_DEV=1). Some other debug message changes.
Removed incorrect copyright in extfntest.c. Fixed CONOPT detection on linux in SConstruct. Tidied up comments in instquery.h.
Fixed for CONOPT under Windows.
Added 'testcmslv' model. Fixed error in CONOPT build test.
Bumped version number 0.9.5.96
Enabled the LRSLV solver, so that CMSLV will be able to function correctly.
First work towards reinstating the CONOPT solver. So far, I've got it building and linking without errors, but haven't tested the resulting runtime.
Radu Serban sent me a preview of the new version of IDA which has new header file layout. This patch updates for the new layout. Also couple of minor fixes for gcc warnings in numlist and library.cpp.
Added 'docs' target to run doxygen for libascend.
Added necessary changes to allow 'johnpye/extfn/libextfntest.so' to be built automatically as part of main SCons build. This will make testing of external relations a little easier.
Lot of svn ignore tagging. Little more work on DSG model.
Few small changes to fix for Linux after the recent MSVC++ oriented changes.
I think this almost resolves all the Visual C++ issues. Just an outstanding issue with the use of the option struct in LibraryProc.c eg use of &g_compiler_warnings in initialiser.
Fixes for MSVC++
Fixing build for Microsoft VC++ 8
Working on fixing for MSVC on Windows.
Added '--models' option to ascend-config. Fixed a bug with packages.c wrt generating absolute paths to library files. Added SCons directives to install header files in INSTALL_INCLUDE subdirs. Changed rel.c so that init function is only run if provided in the package. Added 'ospath_getabs' to convert relative paths into absolute paths by adding prefix of fully-resolved '.'
Monster commit! Lots of recommenting and reorganising of external relations-related stuff. Replaced a lot of ascmalloc and asccalloc calls with the new ASC_NEW* macros. Fixed (?) the problem Art is having with icons in PyGTK. Turned on -Wall in SConstruct and fixed up a stack of warnings. Removed the redundant exit(2) from after Asc_Panic calls and added __attribute__((noreturn)). Set doxygen to create callgraphs to level 2, updated doxyfile to version 1.4.7. Fixed up building of extfntest.c.
Improved detection of math library. Fixed bug that was affecting detection of CUnit library.
Changed default SCons option, was TCL=~/activetcl now TCL=/usr. This means that by default we assume that the user will provide suitable Tcl/Tk from their on-root libraries.
Added 'ascend-config' scriptlet to be used when building external libraries and other software that must link to ASCEND. Also some minor updates to the INSTALL instructions.
Adding explicit dependency of tarball on 'ascend.spec'. Use automated creation of SRCS lists in base/generic/general makefile.
Fixing up incorrectly merged SConstruct (merging r702-820 from dae branch to trunk)
Small changes to CUnit detection.
Bumping version number
Fixing up for buildbot problem with null release ID
Removed dependency on ccache. Added RELEASE flag to allow BuildBot to control RPM versions.
Bumped version to 0.9.5.93. Added Tcl/Tk GUI to the GNOME applications menu.
Turning off MSVC extensions when compiling
Minor changes to bison/yacc detection, hoping this will make MSVC happier...
Fixing up Yacc/Bison detection a little.
woops
Setting default Tcl path to one that MSVC likes as well as MINGW.
...
Fixed up some other small probs with MSVC2005
Changed the way that installer is created on Windows: now you must use 'scons installer' to build the installer. This will only work on windows. The WITH_INSTALLER option has been removed. Switched the expected version of Tcl to 8.4 under Windows for builds with SCons.
Added changes to allow autotools build on ubuntu. There were some wrong assumptions about file locations that I was able to correct using information in the tclConfig.sh and tkConfig.sh files. This will need testing on Fedora/Unix/etc.
Fixed up standard paths stuff to use 'INSTALL_ASCDATA' as the place where tcltk/python/models etc will live. The confusion here came from the fact that I was taking 'INSTALL_SHARE' to be be assumed to mean 'the location of /usr/share' -- hence the resulting '$INSTALL_SHARE/ascend' that was bothering Ben. The 'INSTALL_ASCDATA' fixes this, and behaves as he will like, I hope. Also note that I have switched the default situation in config.h.in to use relative paths by default, which is the preferred CMU way. SCons builds will default to absolute paths on non-Windows systems.
Fixing the windows build. Added full support for Tcl/Tk version to the installer.
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...
Completing missing part of RELATIVE_PATHS configuration for SCons, to address bug #262.
Still working on a way to add options to config.h.in such that it doesn't break autotools.
fixed for scons, can't work out a way to allows @MISSING_SOMETHING@ to fallback safely, unfort.
fixing so that Ben won't need to add this macro to autoconf, hopefully.
Adding configuration option to turn off xterm colours in output.
Bumped version to 0.9.5.91. Changed WITH_CUNIT_TESTS to WITH_CUNIT. Added GCOV scons option. Fixed up 'test' target for SCons. Added lots of export symbols to libascend.so.
Added GCOV=1 option to SCons build, working on integrating LCOV tool with Buildbot.
Fixing some malloc bugs.
Working on improving handling of paths.
Fixed for Ubuntu 5.10 (linking to libstdc++ when building _ascpy.so) Tested with MinGW/WinXP, still OK.
Customisable installer .exe names. Moved NSIS tool into the scons subdirectory, reverted to standard NsisSconsBuilder from the SCons Wiki.
Bumping the version number for NSIS and RPM pre-releases
Changing from 'tcltk98' to 'tcltk', in progress.
Remove dependency on perl5
Manual override to set name of created tarball (for use with buildbot testing).
RPM builds now, but has a dependency on perl(!?!)
Changes to detection of TkTable. TkTable detection was not possible on FC5 due to the provided tktable package not coming with header files, and no tktable-devel being offered. Hence static linkage to Tktable is not possible. Maybe it's not a great idea anyway. Also modified and updated the DistTar builder for SCons. Modified SConstruct to allow Tcl/Tk 8.4 to be used. Modified ascend.spec.in to use system-standard version of Tcl/Tk 8.4.
Fixing some dependency issues with the building of the SWIG wrapper. Added automatic SWIG dependency scanner (from the SCons Wiki).
Some fixes to the 'disttar' thing for 'scons dist'
Some more on the RPMs. The tarball still missing some files.
Fixed building of source tarball using 'scons dist'. Will next add automated building of RPM targets. Started work on building of separate RPMs for tcltk and python interfaces.
Created 'scons install' command that also works for Tcl/Tk interface. These changes required some modifications to the default values of the environment variables. Installed Tcl/Tk version now works with only the LD_LIBRARY_PATH env var being required.
Added LICENSE.txt to root directory Fixed a 'const' problem in ospath Fixed up some variable names and key errors in SConstruct Modified License-Warranty.tcl in accordance with the recommendations in the GPL.
More on RPM
Adding 'gcc' to runtime requirements of RPM Adding gccvisibility switch.
This is a patch to allow statements like "IMPORT johnpye/extfn/extfntest". It modifies the methods in packages.c. Plan is to reuse the same code for "REQUIRE xxxxxx" statements as well.
More work on the ospath.c file, trying to iron out some windows-specific issues Fixed McGraw-Hill URL in TCL files. Created platform-specific TCL_LIBPATH so that c:\Tcl\bin is used instead of c:\Tcl\lib for .dlls.
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.
Removed 'interface' directory in trunk/pygtk/interface (moved everything up a level) Made corresponding changes to SCons* and spec files.
Working of debugging the mysterious PyGTK bug. Seems to be coming from a wrong char *filename in an error_reporter call from the DEBUG_RELS sections of the compiler code. Also renamed the WSEM and WSNM macros for clarity, removed unused file pointer.
Fixed up a problem with ordering of headers with Python.h. Removed psyco initialisation, pending evidence that it actually does something :-) Disabled python 'director' error message callbacks, trying to debug a segfault. Added ability to disable GCC Visibility, scons WITH_GCCVISIBILITY=0. Turned off runtime signal tests for SIG_INT and SIG_FPE (makes using GDB a pain), see base/generic/utilities/ascSignal.[ch].
Getting the modular version the Tcl/Tk GUI working. In progress.
SConstruct for python2.3
SWIG < 1.3.28 can't do GCC visibility, so turn off for python interface in that case.
More fixes for compiling and running on ubuntu 5.10 with GCC: gcc version 4.0.2 20050808 (prerelease) (Ubuntu 4.0.1-4ubuntu9) Added ASC_SHLIBSUFFIX and ASC_SHLIBPREFIX which are used in packages.c in preference to platform-specific #ifdefs.
Fixing for ubuntu GCC 4
The Visual C++ 2005 version now builds without linker errors. But I ran the installer and it crashed during the first C++ call, so still problems.
woops, fixing typo that showed up with GCC visibility on MinGW.
Added check to see that YACC runs OK. Fixing build with MSVC++ 2005. All builds now except for some problems in the SWIG-generated code.
Managing GCC visibility is the job of the build too, not ascConfig.h
Reduced some runtime debug messages from Python and C++ and base/generic/compiler/type_descio.c. Fixed up support for GCC Visibility and add SCons 'sniffer' for this. Fixed a bug with 'fileopenpath' in PyGTK interface (File->Open location is remembered from last time). Fixed a bug with missing includes in C++.
Working on Linux again. For some reason you need to run /sbin/ldconfig though. I'm going to ask Ben about this.
MinGW build fixed and working again.
Changed SConstruct so that if you run SCons from MSYS, SCons won't try to use MV++ tools.
Wrapped extern "C" {} around #include <utilities/ascConfig.h> in pygtk/interface/config.h.in.
Added 'HAVE_LEX' and 'HAVE_YACC' env vars in SCons so that we can be smart about using _no_yacc source.
Changed tcltk98 SCons script so that _no_yacc is switchable.
Huge cleanup of file header comments (GPL notice etc). Changed from ASC_DLLSPEC to ASC_DLLSPEC(TYPE) -- like python Fixed up some badly export symbols (missing 'extern') Fixed exporting of symbols from error.h Removed ASC_DLLSPEC from .c files-- only in .h files now (hope that's right...) Changed the way bintoken does its exporting, to take advantage of ASC_BUILDING_LIBASCEND (needs testing) I wonder if the 'extern' keywork should be a part of the ASC_DLLSPEC macro?
Fixing build for SWIG 1.3.24 (no -O flag) Adding more debug info to loading output in PyGTK interface/config.py.in Adding SWIGVERSION flag to SCons env. Commenting in ascDynaLoad.c and ascParse.y Adding VERSION to config.py
Rolled back revision 451, since the DLL loading issue on Windows is now resolved. Fixed up some #ifdef brackets in slv*.h headers. Added NSIS functionality to SConstruct file Renamed default installer to 'ascend-setup.exe' pending a more clever approach to version numbers.
Renamed 'WITHOUT_TCLTK_GUI' option to 'WITHOUT_TCLTK'. Hard-wired path to c:\Python24 and c:\GTK\bin in Windows Python GUI installer.
Building Tcl/Tk with dynamic linking to shared libascend.dll. Still some problems.
Converting to the new shared-object configuration (on email discussion with Ben) First stage: PyGTK interface on windows. More to come.
Fixing for 'STATIC_TKTABLE' flags for Fedora Core 5
Fixing default PackageOption values Adding --library option to gtkbrowser for ASC_DEVELOPING override of 'models' path.
Tidying up some debug output Fixing up use of icon filenames on Windows Removing reference to .svg file in glade/ascend.glade
Remove default CUnit locations for failsafe 'scons -h' on Windows
Got the test suite to compile with SCons. Seems that there are some serious problems still though.
Adding 'models' directory to SCons install
RPM build works now. The model library isn't being installed but the PyGTK interface opens up correctly.
Added ascend.spec (for 'rpmbuild -ta' command). Fixed VERSION substitution in ascend.spec.in.
Installation instructions and an RPM SPEC file (untested)
Implemented installer version of PyGTK interface. Use 'scons install' to install. See 'scons -h' for new build options.
Starting work on linux-based install process
Much progress on the MinGW build of the Tcl/Tk interface. Builds and links now, just having some problems getting the DLLs for Tcl/Tk to resolve at runtime.
tentative: Disabled ascDynaload functions when DYNAMIC_PACKAGES is not defined. Altered error.[ch] so that MS VC++ variadic macros are used when available. Disabled Windows MessageBox in ascPanic, so that compilation of base engine is possible with the Platform SDK. Added SConscript files to build FORTRAN components. Removed some autoconf-related stuff from the pygtk/interface directory.
Debug output for MSVC build
Small correction to keep MinGW build working
Some progress on getting a MSVC build to work with SCons. Issues with linking still.
Improved SWIG detection and version checking.
Trying to fix problems with the parser 'yy' and 'zz' stuff so that it works with SCons and hopefuly autotools at same time.
Woops
Added Tk detection, improved reporting
Added Tcl detection. Still to do: check that Tk version matches Tcl version.
Fixed bug #251
More work on tracking down Krishnan's problem with SWIG detection.
Fixing up message about bad SWIG version
Almost there with getting Jerry's tests to run. Just sorting out the linking.
Added SWIG version detection. Added some ignore patterns for files in the repository.
Fixing python interface on FC4. Still a problem with detection of the full path to swig under Windows.
Successful build of Python interface on Windows with MinGW/MSYS.
Fixed SCons build to do output of config file 'config.py' require by PyGTK GUI. Removed requirement for 'config.h' from the C++ file and instead supplied required flags via compiler commandline.
Some fixes to the SCons build: - adding flags to enable QRSLV and CMSLV by default. - adding commands to build SWIG library correctly for Python interface.
A little bit of progress on getting the windows build to work
Successful build of the PyGTK interface with SCons on Linux (FC4)
Added SConscript for PyGTK interface. It's not finding the lib files, something wrong with the -L options?
Added SConscript to Tcl/Tk directory. Still having some problems with linking.
First attempt at SCons build. This will build the static libraries for me on Linux with GCC 4.0.2. Will work now on getting it to build the Tcl/Tk GUI.
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 |