/[ascend]/trunk/pygtk/SConscript
ViewVC logotype

Log of /trunk/pygtk/SConscript

Parent Directory Parent Directory | Revision Log Revision Log


Links to HEAD: (view) (download) (annotate)
Sticky Revision:

Revision 2068 - (view) (download) (annotate) - [select for diffs]
Modified Fri Aug 21 02:48:14 2009 UTC (10 years, 10 months ago) by jpye
File length: 5285 byte(s)
Diff to previous 2039
Fix build of Python bindings for Mac OS X (Darwin).

Revision 2039 - (view) (download) (annotate) - [select for diffs]
Modified Wed May 20 01:34:20 2009 UTC (11 years, 1 month ago) by jpye
File length: 5213 byte(s)
Diff to previous 2027
Updated formatting/file headers for set.h, mem.h.
Added #includes to top of set.h, mem.h to ensure ascConfig is not missed.
Changed default IPOPT linear solver to MUMPS.
Added simple C++ test file for CONOPT.

Revision 2027 - (view) (download) (annotate) - [select for diffs]
Modified Thu Apr 30 08:27:56 2009 UTC (11 years, 2 months ago) by jpye
File length: 5143 byte(s)
Diff to previous 2018
Bump version to 0.9.6.
Documented changes since last release in CHANGELOG.txt

Revision 2018 - (view) (download) (annotate) - [select for diffs]
Modified Wed Apr 29 03:38:10 2009 UTC (11 years, 2 months ago) by jpye
File length: 5145 byte(s)
Diff to previous 2016
Fixed compile for new header file locations <ascend/compiler/xxx.h> etc.

Revision 2016 - (view) (download) (annotate) - [select for diffs]
Modified Tue Apr 28 09:30:57 2009 UTC (11 years, 2 months ago) by jpye
File length: 5108 byte(s)
Diff to previous 2007
Trying to fix up ASCEND for change of model library location to /usr/lib/ascend/models.

Revision 2007 - (view) (download) (annotate) - [select for diffs]
Modified Mon Apr 27 06:09:29 2009 UTC (11 years, 2 months ago) by jpye
File length: 5109 byte(s)
Diff to previous 1853
Break ASCEND into dev package and main package.
Fix up gtksourceview syntax rules, add more keywords, remove C cruft.
Add tools/scons/ascend.py tool for detecting ASCEND when building software using SCons.
DTAR now fails if dpkg-buildpackage fails, keeps temp files hanging around for inspection.
Plots generated by 'plot.a4l' no longer add legend if no labels specified.
Committing python bindings for FPROPS. Much testing remains to be done there.


Revision 1853 - (view) (download) (annotate) - [select for diffs]
Modified Thu Sep 11 06:13:47 2008 UTC (11 years, 10 months ago) by jpye
File length: 5088 byte(s)
Diff to previous 1803
Fixed detection of Graphviz on linux where pkg-config is available (should be always).
This will break detection of Graphviz on Windows though.

Revision 1803 - (view) (download) (annotate) - [select for diffs]
Modified Tue Jul 15 00:53:43 2008 UTC (11 years, 11 months ago) by jpye
File length: 5099 byte(s)
Diff to previous 1786
Fixing some svn:ignore tags, add DOPRI5 license file.
Minor edits in asc_ipopt.c.

Revision 1786 - (view) (download) (annotate) - [select for diffs]
Modified Sat Jun 7 06:17:35 2008 UTC (12 years, 1 month ago) by jpye
File length: 5095 byte(s)
Diff to previous 1747
Fixed for missing libpython (DistutilsPlatformError).
Fixed several env.Copy() warnings.
Removed swig 'SideEffect' statement for current SCons swig tool.

Revision 1747 - (view) (download) (annotate) - [select for diffs]
Modified Sun Feb 10 03:42:42 2008 UTC (12 years, 5 months ago) by jpye
File length: 5091 byte(s)
Diff to previous 1720
Fixed bug #361.
Moved a number of vars out of SUBST_DICT to prevent config.h changes from spawning a rebuild of libascend.
Eliminated use of ASC_WITH_CONOPT from C code (still need ASC_LINKED_CONOPT for the moment).


Revision 1720 - (view) (download) (annotate) - [select for diffs]
Modified Wed Jan 9 07:23:24 2008 UTC (12 years, 6 months ago) by jpye
File length: 4932 byte(s)
Diff to previous 1678
Fixed detection/linking with GraphViz in Windows (GraphViz 2.16).
Added support for linking against MSCVR71.DLL but still needs some work.

Revision 1678 - (view) (download) (annotate) - [select for diffs]
Modified Wed Dec 19 00:29:48 2007 UTC (12 years, 6 months ago) by jpye
File length: 4779 byte(s)
Diff to previous 1467
Removed references to MFGRAPH, seems better to use GraphViz directly.
Added configuration test for GraphViz.
Added configuration test for strdup, fixed mmio to not create its own strdup if other form is available already.


Revision 1467 - (view) (download) (annotate) - [select for diffs]
Modified Sun Jun 3 06:19:35 2007 UTC (13 years, 1 month ago) by jpye
File length: 4764 byte(s)
Diff to previous 1465
More work on Windows installer detection of PyGTK, PyCairo etc at install-time.

Revision 1465 - (view) (download) (annotate) - [select for diffs]
Modified Sun Jun 3 04:21:07 2007 UTC (13 years, 1 month ago) by jpye
File length: 4698 byte(s)
Diff to previous 1440
Move 'create.nsi' to top-level

Revision 1440 - (view) (download) (annotate) - [select for diffs]
Modified Sat May 26 04:03:46 2007 UTC (13 years, 1 month ago) by jpye
File length: 4956 byte(s)
Diff to previous 1436
Changes made at time of 0.9.5.110 update for Windows.

Revision 1436 - (view) (download) (annotate) - [select for diffs]
Modified Mon May 21 09:39:28 2007 UTC (13 years, 1 month ago) by jpye
File length: 4947 byte(s)
Diff to previous 1431
Fixed build for SCons 0.96.92. Needs testing.

Revision 1431 - (view) (download) (annotate) - [select for diffs]
Modified Fri May 18 09:20:26 2007 UTC (13 years, 1 month ago) by jpye
File length: 4926 byte(s)
Diff to previous 1423
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.

Revision 1423 - (view) (download) (annotate) - [select for diffs]
Modified Sat Apr 28 02:01:42 2007 UTC (13 years, 2 months ago) by jpye
File length: 4938 byte(s)
Diff to previous 1413
Fixed problem with installer name (WindowS)

Revision 1413 - (view) (download) (annotate) - [select for diffs]
Modified Tue Apr 24 13:34:35 2007 UTC (13 years, 2 months ago) by jpye
File length: 4932 byte(s)
Diff to previous 1408
Almost there with the debian package now

Revision 1408 - (view) (download) (annotate) - [select for diffs]
Modified Mon Apr 23 02:32:34 2007 UTC (13 years, 2 months ago) by jpye
File length: 4950 byte(s)
Diff to previous 1382
dos2unix nsis.py.
scons install will install .pyc files for .py in pygtk dir.

Revision 1382 - (view) (download) (annotate) - [select for diffs]
Modified Fri Apr 6 06:56:04 2007 UTC (13 years, 3 months ago) by jpye
File length: 4582 byte(s)
Diff to previous 1380
installer goes to the 'dist' directory instead of pygtk directory.

Revision 1380 - (view) (download) (annotate) - [select for diffs]
Modified Fri Apr 6 04:07:32 2007 UTC (13 years, 3 months ago) by jpye
File length: 4579 byte(s)
Diff to previous 1228
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.

Revision 1228 - (view) (download) (annotate) - [select for diffs]
Modified Thu Jan 25 06:57:40 2007 UTC (13 years, 5 months ago) by johnpye
File length: 4564 byte(s)
Diff to previous 1141
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.

Revision 1141 - (view) (download) (annotate) - [select for diffs]
Modified Mon Jan 15 04:44:12 2007 UTC (13 years, 5 months ago) by johnpye
File length: 4615 byte(s)
Diff to previous 1135
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.


Revision 1135 - (view) (download) (annotate) - [select for diffs]
Modified Sun Jan 14 12:41:13 2007 UTC (13 years, 5 months ago) by johnpye
File length: 4620 byte(s)
Diff to previous 1126
Added an explicit dependency on solver.i. Seemed to be necessary.

Revision 1126 - (view) (download) (annotate) - [select for diffs]
Modified Sat Jan 13 06:11:02 2007 UTC (13 years, 5 months ago) by johnpye
File length: 4605 byte(s)
Diff to previous 1112
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.

Revision 1112 - (view) (download) (annotate) - [select for diffs]
Modified Thu Jan 11 05:38:15 2007 UTC (13 years, 6 months ago) by johnpye
File length: 4594 byte(s)
Diff to previous 1111
Added writeBlockGraph to ascpy API: writes out a .dot file.

Revision 1111 - (view) (download) (annotate) - [select for diffs]
Modified Thu Jan 11 04:26:06 2007 UTC (13 years, 6 months ago) by johnpye
File length: 4364 byte(s)
Diff to previous 1096
fixed linking of mfgraph

Revision 1096 - (view) (download) (annotate) - [select for diffs]
Modified Wed Jan 10 02:01:56 2007 UTC (13 years, 6 months ago) by johnpye
File length: 4229 byte(s)
Diff to previous 979
Fixed ascend.in for local install (use execv to set required env vars)

Revision 979 - (view) (download) (annotate) - [select for diffs]
Modified Wed Dec 20 14:34:16 2006 UTC (13 years, 6 months ago) by johnpye
File length: 4150 byte(s)
Diff to previous 961
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.


Revision 961 - (view) (download) (annotate) - [select for diffs]
Modified Mon Dec 11 14:04:13 2006 UTC (13 years, 7 months ago) by johnpye
File length: 4149 byte(s)
Diff to previous 960
Fixed a silly bug with Integrator::setEngine.
Added test case for lotka.a4c to test.py

Revision 960 - (view) (download) (annotate) - [select for diffs]
Modified Sun Dec 10 03:14:24 2006 UTC (13 years, 7 months ago) by johnpye
File length: 4031 byte(s)
Diff to previous 938
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

Revision 938 - (view) (download) (annotate) - [select for diffs]
Modified Fri Nov 24 06:09:46 2006 UTC (13 years, 7 months ago) by johnpye
File length: 3995 byte(s)
Diff to previous 932
Added support for dmalloc (http://dmalloc.com)
Added Integrator::setEngine(string name)
Minor other stuff.

Revision 932 - (view) (download) (annotate) - [select for diffs]
Modified Thu Nov 23 13:23:33 2006 UTC (13 years, 7 months ago) by johnpye
File length: 3840 byte(s)
Diff to previous 929
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)

Revision 929 - (view) (download) (annotate) - [select for diffs]
Modified Wed Nov 22 11:01:06 2006 UTC (13 years, 7 months ago) by johnpye
File length: 3755 byte(s)
Diff to previous 925
Little more on removing stream redirection (ongoing)

Revision 925 - (view) (download) (annotate) - [select for diffs]
Modified Tue Nov 21 23:30:30 2006 UTC (13 years, 7 months ago) by johnpye
File length: 3715 byte(s)
Diff to previous 922
Suppressing -Wall warnings while building ascpy_wrap.cc

Revision 922 - (view) (download) (annotate) - [select for diffs]
Modified Wed Nov 8 05:25:37 2006 UTC (13 years, 8 months ago) by johnpye
File length: 3641 byte(s)
Diff to previous 908
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).


Revision 908 - (view) (download) (annotate) - [select for diffs]
Modified Thu Oct 26 10:18:53 2006 UTC (13 years, 8 months ago) by johnpye
File length: 3622 byte(s)
Diff to previous 897
first attempt at merging with Ben's changes on the trunk

Revision 897 - (view) (download) (annotate) - [select for diffs]
Modified Tue Oct 24 11:05:18 2006 UTC (13 years, 8 months ago) by johnpye
File length: 3626 byte(s)
Diff to previous 869
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.


Revision 869 - (view) (download) (annotate) - [select for diffs]
Modified Wed Oct 4 14:03:46 2006 UTC (13 years, 9 months ago) by johnpye
File length: 3610 byte(s)
Diff to previous 858
'hello world' works from external python module, correctly hooks into 'browser' object.

Revision 858 - (view) (download) (annotate) - [select for diffs]
Modified Mon Sep 25 15:04:48 2006 UTC (13 years, 9 months ago) by johnpye
File length: 3596 byte(s)
Diff to previous 811
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.

Revision 811 - (view) (download) (annotate) - [select for diffs]
Modified Thu Aug 10 17:08:16 2006 UTC (13 years, 11 months ago) by johnpye
File length: 3496 byte(s)
Diff to previous 770
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

Revision 770 - (view) (download) (annotate) - [select for diffs]
Modified Fri Jul 14 03:35:16 2006 UTC (14 years ago) by johnpye
File length: 3468 byte(s)
Diff to previous 743
Added 'use relation sharing' option to the PyGTK GUI.
Changed some debug output calls.
Tidied up headers in anoncopy, anonmerg, etc.

Revision 743 - (view) (download) (annotate) - [select for diffs]
Modified Thu Jul 6 14:22:26 2006 UTC (14 years ago) by johnpye
File length: 3455 byte(s)
Diff to previous 742
Few small changes to fix for Linux after the recent MSVC++ oriented changes.

Revision 742 - (view) (download) (annotate) - [select for diffs]
Modified Thu Jul 6 13:47:41 2006 UTC (14 years ago) by johnpye
File length: 3449 byte(s)
Diff to previous 734
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.

Revision 734 - (view) (download) (annotate) - [select for diffs]
Modified Wed Jul 5 01:18:43 2006 UTC (14 years ago) by johnpye
File length: 3401 byte(s)
Diff to previous 669
Added missing dependence for ascpy.py

Revision 669 - (view) (download) (annotate) - [select for diffs]
Modified Wed Jun 21 07:00:45 2006 UTC (14 years ago) by johnpye
File length: 3358 byte(s)
Diff to previous 631
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.

Revision 631 - (view) (download) (annotate) - [select for diffs]
Modified Wed May 24 05:14:20 2006 UTC (14 years, 1 month ago) by johnpye
File length: 3319 byte(s)
Diff to previous 629
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.

Revision 629 - (view) (download) (annotate) - [select for diffs]
Modified Wed May 24 04:34:25 2006 UTC (14 years, 1 month ago) by johnpye
File length: 3320 byte(s)
Diff to previous 628
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.

Revision 628 - (view) (download) (annotate) - [select for diffs]
Modified Wed May 24 01:45:02 2006 UTC (14 years, 1 month ago) by johnpye
File length: 3302 byte(s)
Diff to previous 625
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.

Revision 625 - (view) (download) (annotate) - [select for diffs]
Modified Thu May 18 16:07:09 2006 UTC (14 years, 1 month ago) by johnpye
File length: 3317 byte(s)
Diff to previous 615
Fixed incidences of INSTALL_DATA in SConscript files.

Revision 615 - (view) (download) (annotate) - [select for diffs]
Modified Wed May 17 06:29:40 2006 UTC (14 years, 1 month ago) by johnpye
File length: 3314 byte(s)
Diff to previous 579
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.

Revision 579 - (view) (download) (annotate) - [select for diffs]
Modified Tue May 9 06:21:18 2006 UTC (14 years, 2 months ago) by johnpye
File length: 3391 byte(s)
Diff to previous 578
Fixed for Ubuntu 5.10 (linking to libstdc++ when building _ascpy.so)
Tested with MinGW/WinXP, still OK.

Revision 578 - (view) (download) (annotate) - [select for diffs]
Modified Tue May 9 04:59:03 2006 UTC (14 years, 2 months ago) by johnpye
File length: 3378 byte(s)
Diff to previous 558
Customisable installer .exe names.
Moved NSIS tool into the scons subdirectory, reverted to standard NsisSconsBuilder from the SCons Wiki.

Revision 558 - (view) (download) (annotate) - [select for diffs]
Modified Wed May 3 00:01:46 2006 UTC (14 years, 2 months ago) by johnpye
File length: 3309 byte(s)
Diff to previous 552
Fixing some dependency issues with the building of the SWIG wrapper.
Added automatic SWIG dependency scanner (from the SCons Wiki).

Revision 552 - (view) (download) (annotate) - [select for diffs]
Modified Sat Apr 29 08:53:04 2006 UTC (14 years, 2 months ago) by johnpye
File length: 3128 byte(s)
Diff to previous 542
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.

Revision 542 - (view) (download) (annotate) - [select for diffs]
Modified Wed Apr 26 15:15:40 2006 UTC (14 years, 2 months ago) by johnpye
File length: 3193 byte(s)
Diff to previous 540
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.


Revision 540 - (view) (download) (annotate) - [select for diffs]
Modified Tue Apr 25 23:57:49 2006 UTC (14 years, 2 months ago) by johnpye
File length: 3181 byte(s)
Diff to previous 532
Fixing SCons Tcl/Tk build on Windows.

Revision 532 - (view) (download) (annotate) - [select for diffs]
Modified Mon Apr 24 02:23:08 2006 UTC (14 years, 2 months ago) by johnpye
File length: 3173 byte(s)
Diff to previous 531
Removed 'interface' directory in trunk/pygtk/interface (moved everything up a level)
Made corresponding changes to SCons* and spec files.

Revision 531 - (view) (download) (annotate) - [select for diffs]
Modified Mon Apr 24 02:04:02 2006 UTC (14 years, 2 months ago) by johnpye
Original Path: trunk/interface/SConscript
File length: 3173 byte(s)
Diff to previous 529
Removing extra subdir level in pygtk path

Revision 529 - (view) (download) (annotate) - [select for diffs]
Modified Sat Apr 22 06:26:23 2006 UTC (14 years, 2 months ago) by johnpye
Original Path: trunk/pygtk/interface/SConscript
File length: 3173 byte(s)
Diff to previous 519
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.

Revision 519 - (view) (download) (annotate) - [select for diffs]
Modified Fri Apr 21 02:07:11 2006 UTC (14 years, 2 months ago) by johnpye
Original Path: trunk/pygtk/interface/SConscript
File length: 2997 byte(s)
Diff to previous 510
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.

Revision 510 - (view) (download) (annotate) - [select for diffs]
Modified Wed Apr 19 06:38:42 2006 UTC (14 years, 2 months ago) by johnpye
Original Path: trunk/pygtk/interface/SConscript
File length: 2891 byte(s)
Diff to previous 509
Removing the chmod+x ascend thing, it's not right.

Revision 509 - (view) (download) (annotate) - [select for diffs]
Modified Wed Apr 19 05:13:08 2006 UTC (14 years, 2 months ago) by johnpye
Original Path: trunk/pygtk/interface/SConscript
File length: 2875 byte(s)
Diff to previous 508
SWIG < 1.3.28 can't do GCC visibility, so turn off for python interface in that case.

Revision 508 - (view) (download) (annotate) - [select for diffs]
Modified Wed Apr 19 04:48:32 2006 UTC (14 years, 2 months ago) by johnpye
Original Path: trunk/pygtk/interface/SConscript
File length: 2641 byte(s)
Diff to previous 507
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.


Revision 507 - (view) (download) (annotate) - [select for diffs]
Modified Wed Apr 19 02:44:25 2006 UTC (14 years, 2 months ago) by johnpye
Original Path: trunk/pygtk/interface/SConscript
File length: 2736 byte(s)
Diff to previous 505
Fixing for ubuntu GCC 4

Revision 505 - (view) (download) (annotate) - [select for diffs]
Modified Tue Apr 18 13:22:29 2006 UTC (14 years, 2 months ago) by johnpye
Original Path: trunk/pygtk/interface/SConscript
File length: 2659 byte(s)
Diff to previous 502
Add some 'Depends' to ensure that the PyGTK app gets built before the installer does.

Revision 502 - (view) (download) (annotate) - [select for diffs]
Modified Tue Apr 18 12:57:30 2006 UTC (14 years, 2 months ago) by johnpye
Original Path: trunk/pygtk/interface/SConscript
File length: 2609 byte(s)
Diff to previous 500
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.

Revision 500 - (view) (download) (annotate) - [select for diffs]
Modified Tue Apr 18 11:55:12 2006 UTC (14 years, 2 months ago) by johnpye
Original Path: trunk/pygtk/interface/SConscript
File length: 2259 byte(s)
Diff to previous 482
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++.

Revision 482 - (view) (download) (annotate) - [select for diffs]
Modified Mon Apr 17 12:22:31 2006 UTC (14 years, 2 months ago) by johnpye
Original Path: trunk/pygtk/interface/SConscript
File length: 2496 byte(s)
Diff to previous 480
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.

Revision 480 - (view) (download) (annotate) - [select for diffs]
Modified Mon Apr 17 10:45:23 2006 UTC (14 years, 2 months ago) by johnpye
Original Path: trunk/pygtk/interface/SConscript
File length: 2630 byte(s)
Diff to previous 478
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.

Revision 478 - (view) (download) (annotate) - [select for diffs]
Modified Mon Apr 17 08:10:48 2006 UTC (14 years, 2 months ago) by johnpye
Original Path: trunk/pygtk/interface/SConscript
File length: 2592 byte(s)
Diff to previous 476
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

Revision 476 - (view) (download) (annotate) - [select for diffs]
Modified Mon Apr 17 07:06:45 2006 UTC (14 years, 2 months ago) by johnpye
Original Path: trunk/pygtk/interface/SConscript
File length: 2427 byte(s)
Diff to previous 466
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.

Revision 466 - (view) (download) (annotate) - [select for diffs]
Modified Sun Apr 16 15:07:48 2006 UTC (14 years, 2 months ago) by johnpye
Original Path: trunk/pygtk/interface/SConscript
File length: 2376 byte(s)
Diff to previous 463
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.

Revision 463 - (view) (download) (annotate) - [select for diffs]
Modified Sun Apr 16 10:18:16 2006 UTC (14 years, 2 months ago) by johnpye
Original Path: trunk/pygtk/interface/SConscript
File length: 2273 byte(s)
Diff to previous 448
Converting to the new shared-object configuration (on email discussion with Ben)
First stage: PyGTK interface on windows. More to come.

Revision 448 - (view) (download) (annotate) - [select for diffs]
Modified Wed Apr 5 01:04:59 2006 UTC (14 years, 3 months ago) by johnpye
Original Path: trunk/pygtk/interface/SConscript
File length: 2449 byte(s)
Diff to previous 436
RPM build works now. The model library isn't being installed but the PyGTK interface opens up correctly.

Revision 436 - (view) (download) (annotate) - [select for diffs]
Modified Tue Apr 4 11:02:51 2006 UTC (14 years, 3 months ago) by johnpye
Original Path: trunk/pygtk/interface/SConscript
File length: 2369 byte(s)
Diff to previous 435
Implemented installer version of PyGTK interface. Use 'scons install' to
install. See 'scons -h' for new build options.

Revision 435 - (view) (download) (annotate) - [select for diffs]
Modified Tue Apr 4 10:09:09 2006 UTC (14 years, 3 months ago) by johnpye
Original Path: trunk/pygtk/interface/SConscript
File length: 2312 byte(s)
Diff to previous 404
Starting work on linux-based install process

Revision 404 - (view) (download) (annotate) - [select for diffs]
Modified Sat Apr 1 05:37:52 2006 UTC (14 years, 3 months ago) by johnpye
Original Path: trunk/pygtk/interface/SConscript
File length: 1957 byte(s)
Diff to previous 398
Added Tcl detection. Still to do: check that Tk version matches Tcl version.

Revision 398 - (view) (download) (annotate) - [select for diffs]
Modified Fri Mar 31 07:55:11 2006 UTC (14 years, 3 months ago) by johnpye
Original Path: trunk/pygtk/interface/SConscript
File length: 1956 byte(s)
Diff to previous 395
Added SWIG version detection.
Added some ignore patterns for files in the repository.

Revision 395 - (view) (download) (annotate) - [select for diffs]
Modified Fri Mar 31 06:09:03 2006 UTC (14 years, 3 months ago) by johnpye
Original Path: trunk/pygtk/interface/SConscript
File length: 2102 byte(s)
Diff to previous 393
Successful build of Python interface on Windows with MinGW/MSYS.

Revision 393 - (view) (download) (annotate) - [select for diffs]
Modified Thu Mar 30 14:46:37 2006 UTC (14 years, 3 months ago) by johnpye
Original Path: trunk/pygtk/interface/SConscript
File length: 1203 byte(s)
Diff to previous 392
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.

Revision 392 - (view) (download) (annotate) - [select for diffs]
Modified Thu Mar 30 12:36:15 2006 UTC (14 years, 3 months ago) by johnpye
Original Path: trunk/pygtk/interface/SConscript
File length: 1057 byte(s)
Diff to previous 391
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.

Revision 391 - (view) (download) (annotate) - [select for diffs]
Modified Thu Mar 30 07:19:05 2006 UTC (14 years, 3 months ago) by johnpye
Original Path: trunk/pygtk/interface/SConscript
File length: 850 byte(s)
Diff to previous 388
A little bit of progress on getting the windows build to work

Revision 388 - (view) (download) (annotate) - [select for diffs]
Modified Thu Mar 30 05:52:06 2006 UTC (14 years, 3 months ago) by johnpye
Original Path: trunk/pygtk/interface/SConscript
File length: 829 byte(s)
Diff to previous 387
Successful build of the PyGTK interface with SCons on Linux (FC4)

Revision 387 - (view) (download) (annotate) - [select for diffs]
Added Thu Mar 30 05:13:59 2006 UTC (14 years, 3 months ago) by johnpye
Original Path: trunk/pygtk/interface/SConscript
File length: 837 byte(s)
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.

  Diffs between and
  Type of Diff should be a

john.pye@anu.edu.au
ViewVC Help
Powered by ViewVC 1.1.22