/[ascend]/trunk/SConstruct
ViewVC logotype

Log of /trunk/SConstruct

Parent Directory Parent Directory | Revision Log Revision Log


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

Revision 507 - (view) (download) (annotate) - [select for diffs]
Modified Wed Apr 19 02:44:25 2006 UTC (13 years, 11 months ago) by johnpye
File length: 28506 byte(s)
Diff to previous 506 , to selected 393
Fixing for ubuntu GCC 4

Revision 506 - (view) (download) (annotate) - [select for diffs]
Modified Tue Apr 18 14:30:39 2006 UTC (13 years, 11 months ago) by johnpye
File length: 28279 byte(s)
Diff to previous 503 , to selected 393
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.

Revision 503 - (view) (download) (annotate) - [select for diffs]
Modified Tue Apr 18 12:59:49 2006 UTC (13 years, 11 months ago) by johnpye
File length: 28335 byte(s)
Diff to previous 502 , to selected 393
woops, fixing typo that showed up with GCC visibility on MinGW.

Revision 502 - (view) (download) (annotate) - [select for diffs]
Modified Tue Apr 18 12:57:30 2006 UTC (13 years, 11 months ago) by johnpye
File length: 28335 byte(s)
Diff to previous 501 , to selected 393
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 501 - (view) (download) (annotate) - [select for diffs]
Modified Tue Apr 18 12:40:59 2006 UTC (13 years, 11 months ago) by johnpye
File length: 27622 byte(s)
Diff to previous 500 , to selected 393
Managing GCC visibility is the job of the build too, not ascConfig.h

Revision 500 - (view) (download) (annotate) - [select for diffs]
Modified Tue Apr 18 11:55:12 2006 UTC (13 years, 11 months ago) by johnpye
File length: 27572 byte(s)
Diff to previous 499 , to selected 393
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 499 - (view) (download) (annotate) - [select for diffs]
Modified Tue Apr 18 08:26:16 2006 UTC (13 years, 11 months ago) by johnpye
File length: 27063 byte(s)
Diff to previous 498 , to selected 393
Working on Linux again.
For some reason you need to run /sbin/ldconfig though. I'm going to
ask Ben about this.

Revision 498 - (view) (download) (annotate) - [select for diffs]
Modified Tue Apr 18 08:07:13 2006 UTC (13 years, 11 months ago) by johnpye
File length: 27054 byte(s)
Diff to previous 485 , to selected 393
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.

Revision 485 - (view) (download) (annotate) - [select for diffs]
Modified Tue Apr 18 04:47:11 2006 UTC (13 years, 11 months ago) by johnpye
File length: 26836 byte(s)
Diff to previous 478 , to selected 393
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?


Revision 478 - (view) (download) (annotate) - [select for diffs]
Modified Mon Apr 17 08:10:48 2006 UTC (13 years, 11 months ago) by johnpye
File length: 26696 byte(s)
Diff to previous 466 , to selected 393
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 466 - (view) (download) (annotate) - [select for diffs]
Modified Sun Apr 16 15:07:48 2006 UTC (13 years, 11 months ago) by johnpye
File length: 26645 byte(s)
Diff to previous 465 , to selected 393
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 465 - (view) (download) (annotate) - [select for diffs]
Modified Sun Apr 16 13:43:44 2006 UTC (13 years, 11 months ago) by johnpye
File length: 21688 byte(s)
Diff to previous 464 , to selected 393
Renamed 'WITHOUT_TCLTK_GUI' option to 'WITHOUT_TCLTK'.
Hard-wired path to c:\Python24 and c:\GTK\bin in Windows Python GUI installer.

Revision 464 - (view) (download) (annotate) - [select for diffs]
Modified Sun Apr 16 12:49:48 2006 UTC (13 years, 11 months ago) by johnpye
File length: 21696 byte(s)
Diff to previous 463 , to selected 393
Building Tcl/Tk with dynamic linking to shared libascend.dll.
Still some problems.

Revision 463 - (view) (download) (annotate) - [select for diffs]
Modified Sun Apr 16 10:18:16 2006 UTC (13 years, 11 months ago) by johnpye
File length: 21423 byte(s)
Diff to previous 460 , to selected 393
Converting to the new shared-object configuration (on email discussion with Ben)
First stage: PyGTK interface on windows. More to come.

Revision 460 - (view) (download) (annotate) - [select for diffs]
Modified Tue Apr 11 01:08:58 2006 UTC (13 years, 11 months ago) by johnpye
File length: 19943 byte(s)
Diff to previous 459 , to selected 393
Fixing for 'STATIC_TKTABLE' flags for Fedora Core 5

Revision 459 - (view) (download) (annotate) - [select for diffs]
Modified Fri Apr 7 08:05:05 2006 UTC (14 years ago) by johnpye
File length: 19589 byte(s)
Diff to previous 455 , to selected 393
Fixing default PackageOption values
Adding --library option to gtkbrowser for ASC_DEVELOPING override of 'models' path.

Revision 455 - (view) (download) (annotate) - [select for diffs]
Modified Wed Apr 5 07:50:22 2006 UTC (14 years ago) by johnpye
File length: 19534 byte(s)
Diff to previous 453 , to selected 393
Tidying up some debug output
Fixing up use of icon filenames on Windows
Removing reference to .svg file in glade/ascend.glade

Revision 453 - (view) (download) (annotate) - [select for diffs]
Modified Wed Apr 5 06:47:01 2006 UTC (14 years ago) by johnpye
File length: 19178 byte(s)
Diff to previous 451 , to selected 393
Remove default CUnit locations for failsafe 'scons -h' on Windows

Revision 451 - (view) (download) (annotate) - [select for diffs]
Modified Wed Apr 5 05:14:20 2006 UTC (14 years ago) by johnpye
File length: 19191 byte(s)
Diff to previous 449 , to selected 393
Got the test suite to compile with SCons. Seems that there are some
serious problems still though.

Revision 449 - (view) (download) (annotate) - [select for diffs]
Modified Wed Apr 5 01:32:45 2006 UTC (14 years ago) by johnpye
File length: 19202 byte(s)
Diff to previous 448 , to selected 393
Adding 'models' directory to SCons install

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

Revision 439 - (view) (download) (annotate) - [select for diffs]
Modified Tue Apr 4 11:42:58 2006 UTC (14 years ago) by johnpye
File length: 18939 byte(s)
Diff to previous 438 , to selected 393
Added ascend.spec (for 'rpmbuild -ta' command).
Fixed VERSION substitution in ascend.spec.in.

Revision 438 - (view) (download) (annotate) - [select for diffs]
Modified Tue Apr 4 11:34:34 2006 UTC (14 years ago) by johnpye
File length: 18175 byte(s)
Diff to previous 436 , to selected 393
Installation instructions and an RPM SPEC file (untested)

Revision 436 - (view) (download) (annotate) - [select for diffs]
Modified Tue Apr 4 11:02:51 2006 UTC (14 years ago) by johnpye
File length: 18707 byte(s)
Diff to previous 435 , to selected 393
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 ago) by johnpye
File length: 17919 byte(s)
Diff to previous 428 , to selected 393
Starting work on linux-based install process

Revision 428 - (view) (download) (annotate) - [select for diffs]
Modified Tue Apr 4 06:41:25 2006 UTC (14 years ago) by johnpye
File length: 17426 byte(s)
Diff to previous 427 , to selected 393
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.

Revision 427 - (view) (download) (annotate) - [select for diffs]
Modified Tue Apr 4 04:13:34 2006 UTC (14 years ago) by johnpye
File length: 16386 byte(s)
Diff to previous 416 , to selected 393
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.

Revision 416 - (view) (download) (annotate) - [select for diffs]
Modified Mon Apr 3 05:17:50 2006 UTC (14 years ago) by johnpye
File length: 14403 byte(s)
Diff to previous 415 , to selected 393
Debug output for MSVC build

Revision 415 - (view) (download) (annotate) - [select for diffs]
Modified Mon Apr 3 04:56:45 2006 UTC (14 years ago) by johnpye
File length: 14254 byte(s)
Diff to previous 414 , to selected 393
Small correction to keep MinGW build working

Revision 414 - (view) (download) (annotate) - [select for diffs]
Modified Mon Apr 3 04:55:35 2006 UTC (14 years ago) by johnpye
File length: 14230 byte(s)
Diff to previous 413 , to selected 393
Some progress on getting a MSVC build to work with SCons. Issues with linking still.

Revision 413 - (view) (download) (annotate) - [select for diffs]
Modified Mon Apr 3 03:57:09 2006 UTC (14 years ago) by johnpye
File length: 14075 byte(s)
Diff to previous 412 , to selected 393
Improved SWIG detection and version checking.

Revision 412 - (view) (download) (annotate) - [select for diffs]
Modified Mon Apr 3 03:31:30 2006 UTC (14 years ago) by johnpye
File length: 13990 byte(s)
Diff to previous 406 , to selected 393
Trying to fix problems with the parser 'yy' and 'zz' stuff so that it works with SCons and hopefuly autotools at same time.

Revision 406 - (view) (download) (annotate) - [select for diffs]
Modified Sat Apr 1 05:57:34 2006 UTC (14 years ago) by johnpye
File length: 13954 byte(s)
Diff to previous 405 , to selected 393
Woops

Revision 405 - (view) (download) (annotate) - [select for diffs]
Modified Sat Apr 1 05:54:19 2006 UTC (14 years ago) by johnpye
File length: 13997 byte(s)
Diff to previous 404 , to selected 393
Added Tk detection, improved reporting

Revision 404 - (view) (download) (annotate) - [select for diffs]
Modified Sat Apr 1 05:37:52 2006 UTC (14 years ago) by johnpye
File length: 13911 byte(s)
Diff to previous 403 , to selected 393
Added Tcl detection. Still to do: check that Tk version matches Tcl version.

Revision 403 - (view) (download) (annotate) - [select for diffs]
Modified Sat Apr 1 00:46:46 2006 UTC (14 years ago) by johnpye
File length: 12240 byte(s)
Diff to previous 402 , to selected 393
Fixed bug #251

Revision 402 - (view) (download) (annotate) - [select for diffs]
Modified Fri Mar 31 15:46:35 2006 UTC (14 years ago) by johnpye
File length: 12302 byte(s)
Diff to previous 401 , to selected 393
More work on tracking down Krishnan's problem with SWIG detection.

Revision 401 - (view) (download) (annotate) - [select for diffs]
Modified Fri Mar 31 14:22:06 2006 UTC (14 years ago) by johnpye
File length: 12270 byte(s)
Diff to previous 400 , to selected 393
Fixing up message about bad SWIG version

Revision 400 - (view) (download) (annotate) - [select for diffs]
Modified Fri Mar 31 10:59:36 2006 UTC (14 years ago) by johnpye
File length: 12256 byte(s)
Diff to previous 398 , to selected 393
Almost there with getting Jerry's tests to run. Just sorting out the linking.

Revision 398 - (view) (download) (annotate) - [select for diffs]
Modified Fri Mar 31 07:55:11 2006 UTC (14 years ago) by johnpye
File length: 9890 byte(s)
Diff to previous 396 , to selected 393
Added SWIG version detection.
Added some ignore patterns for files in the repository.

Revision 396 - (view) (download) (annotate) - [select for diffs]
Modified Fri Mar 31 06:24:11 2006 UTC (14 years ago) by johnpye
File length: 8644 byte(s)
Diff to previous 395 , to selected 393
Fixing python interface on FC4. Still a problem with detection of the full path to swig under
Windows.

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

Revision 393 - (view) (download) (annotate) - [selected]
Modified Thu Mar 30 14:46:37 2006 UTC (14 years ago) by johnpye
File length: 6842 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 ago) by johnpye
File length: 3754 byte(s)
Diff to previous 391 , to selected 393
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 ago) by johnpye
File length: 2928 byte(s)
Diff to previous 388 , to selected 393
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 ago) by johnpye
File length: 2489 byte(s)
Diff to previous 387 , to selected 393
Successful build of the PyGTK interface with SCons on Linux (FC4)

Revision 387 - (view) (download) (annotate) - [select for diffs]
Modified Thu Mar 30 05:13:59 2006 UTC (14 years ago) by johnpye
File length: 2431 byte(s)
Diff to previous 386 , to selected 393
Added SConscript for PyGTK interface.
It's not finding the lib files, something wrong with the -L options?

Revision 386 - (view) (download) (annotate) - [select for diffs]
Modified Thu Mar 30 04:46:48 2006 UTC (14 years ago) by johnpye
File length: 2049 byte(s)
Diff to previous 385 , to selected 393
Added SConscript to Tcl/Tk directory.
Still having some problems with linking.

Revision 385 - (view) (download) (annotate) - [select for diffs]
Added Thu Mar 30 04:14:29 2006 UTC (14 years ago) by johnpye
File length: 1544 byte(s)
Diff to selected 393
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.

  Diffs between and
  Type of Diff should be a

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