/[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 743 - (view) (download) (annotate) - [select for diffs]
Modified Thu Jul 6 14:22:26 2006 UTC (14 years, 4 months 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, 4 months 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, 4 months 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, 5 months 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, 6 months 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, 6 months 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, 6 months 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, 6 months 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, 6 months 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, 6 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, 6 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, 7 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, 7 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, 7 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, 7 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, 7 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, 7 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, 7 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, 7 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, 7 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, 7 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, 7 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, 7 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, 7 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, 7 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, 7 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, 7 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, 7 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, 7 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, 7 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, 7 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, 7 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, 7 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, 7 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, 7 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, 8 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, 8 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, 8 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, 8 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, 8 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, 8 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, 8 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, 8 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