Parent Directory | Revision Log
Links to HEAD: | (view) (download) (annotate) |
Sticky Revision: |
More work on Windows installer detection of PyGTK, PyCairo etc at install-time.
Move 'create.nsi' to top-level
Changes made at time of 0.9.5.110 update for Windows.
Fixed build for SCons 0.96.92. Needs testing.
Working on fixing for SCons 0.97. There is a problem with SCons 0.96.92 on Ubuntu 6.10, waiting an answer on that.
Fixed problem with installer name (WindowS)
Almost there with the debian package now
dos2unix nsis.py. scons install will install .pyc files for .py in pygtk dir.
installer goes to the 'dist' directory instead of pygtk directory.
Fixed build problem on MinGW GCC 3.4.2 Fixed problem with font in IPython console on Windows Some attempts to fix problems with FILE* support in Python bindings gfortran is now the preferred FORTRAN compiler. Comment out failing FILE* tests for the moment.
Added getParameter by name in SolverParameters. Fixed up refences to signal-related header files. Fixed up various warnings from -pedantic compilation. Identified an apparent bug with RelationCalcGradient (unsafe version). Added support for compilation of a standalone C++ program (idatest) in SCons build.
More sensible slv_param_real bounds in LSODE and IDA. Run ode_init by default for dsgsat.a4c. Fixed dependencies for swig python outputs. Fixed [X] button on Integrator dialog.
Added an explicit dependency on solver.i. Seemed to be necessary.
Added Matrix object to C++ interface. This is a thin wrapper for 'struct mtx_header *'. Added getMatrix method in Simulation class. Simple test case to write a matrix from a simulation (but no validation of the target file). Added #include to ascPanic.h. Added typemap in solver.i to ensure that python file object correctly translate en route to C.
Added writeBlockGraph to ascpy API: writes out a .dot file.
fixed linking of mfgraph
Fixed ascend.in for local install (use execv to set required env vars)
Added simplified ASC_PANIC call that uses var-args, added throughout relation_util.c. Fixed var_filter_t stuff in djex and fvex. More assertions in integrator.c Added output of initial state from lsode.c (hoping that's a good idea?) Fixed output code from relman_diff2. Added asc_panic_nofunc for non var-arg CPPs. Disabled -O3 flag in building C++ API Added __getitem__ and __getattr__ methods in Simuluation for simplified python syntax (eg M.x instead M.sim.x) Integrator::analyse throws exceptions on error now.
Fixed a silly bug with Integrator::setEngine. Added test case for lotka.a4c to test.py
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
Added support for dmalloc (http://dmalloc.com) Added Integrator::setEngine(string name) Minor other stuff.
Working on bugs in the 'error_reporter_tree' stuff. Removed binary files from base/generic/utilities/test (these are built as needed by SCons now)
Little more on removing stream redirection (ongoing)
Suppressing -Wall warnings while building ascpy_wrap.cc
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).
first attempt at merging with Ben's changes on the trunk
Adding 'NOTES' support to C++ interface. 'johnpye/thermalequilibrium2.a4c' is the example case. listnotes.py performs listing via a python external script method. annotation.h and annotation.cpp implement the C++ wrapper referenced by SWIG. library.{h,cpp} modified to provide access to the AnnotationDatabase. Typemapping modified in ascpy.i in attempt to get a more maintainable wrapping. Added annotation.cpp to build. Updated copyright header and formatting of notate.{c,h}. Improved ErrMsg_BracesEOF error message fn. Updated copyright header and formatting of braced.{c,h} Some misc debug output removed esp in simulation.cpp, conopt.c, importhandler.c.
'hello world' works from external python module, correctly hooks into 'browser' object.
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.
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
Added 'use relation sharing' option to the PyGTK GUI. Changed some debug output calls. Tidied up headers in anoncopy, anonmerg, etc.
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.
Added missing dependence for ascpy.py
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.
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.
Fixed incidences of INSTALL_DATA in SConscript files.
Forced pygtk to share major env vars with base library. Modified 'can't use this here' error messages. Added notification when colour codes are being disabled.
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.
Fixing some dependency issues with the building of the SWIG wrapper. Added automatic SWIG dependency scanner (from the SCons Wiki).
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.
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.
Fixing SCons Tcl/Tk build on Windows.
Removed 'interface' directory in trunk/pygtk/interface (moved everything up a level) Made corresponding changes to SCons* and spec files.
Removing extra subdir level in pygtk path
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.
Fixing up the 'tuple' thing (Yomi's change) as it didn't now work with Python 2.4 Fixed up dependencies around the SWIG compile. Fixed so that SCons makes pygtk/interface/ascend executable automatically.
Removing the chmod+x ascend thing, it's not right.
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
Add some 'Depends' to ensure that the PyGTK app gets built before the installer does.
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.
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++.
Set up memory of file->open path in PyGTK GUI. Improved pass-through of ./ascend parameters in ASC_DEVELOPING mode. Removed disused SWIG builder in SConscript (using SCOns' builtin stuff now) Improved some console messages from Python.
Adding ASC_DLLSPEC to all functions that are being used by Python interface. Also cleaned up some #ifdef header brackets and html-style comments inside doxygen comments. Renamed pygtk/interface/config.in to pygtk/interface/config.h.in and made this active again (for ASC_BUILDING_INTERFACE) use. Trying to catch error in ascpy.Library call with try/except, doesn't work though.
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
Added some INSTALL notes relating to building windows installer. Added some optimisations to the SWIG build to reduce target file size. Fixed bug with WITH_INSTALLER=1 flag.
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.
Converting to the new shared-object configuration (on email discussion with Ben) First stage: PyGTK interface on windows. More to come.
RPM build works now. The model library isn't being installed but the PyGTK interface opens up correctly.
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
Added Tcl detection. Still to do: check that Tk version matches Tcl version.
Added SWIG version detection. Added some ignore patterns for files in the repository.
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?
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 |