/[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 816 - (view) (download) (annotate) - [select for diffs]
Modified Tue Aug 15 14:40:33 2006 UTC (18 years, 3 months ago) by johnpye
File length: 39176 byte(s)
Diff to previous 811
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.

Revision 811 - (view) (download) (annotate) - [select for diffs]
Modified Thu Aug 10 17:08:16 2006 UTC (18 years, 4 months ago) by johnpye
File length: 37622 byte(s)
Diff to previous 804
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 804 - (view) (download) (annotate) - [select for diffs]
Modified Fri Aug 4 05:54:34 2006 UTC (18 years, 4 months ago) by johnpye
File length: 37808 byte(s)
Diff to previous 802
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.

Revision 802 - (view) (download) (annotate) - [select for diffs]
Modified Thu Aug 3 02:24:45 2006 UTC (18 years, 4 months ago) by johnpye
File length: 37812 byte(s)
Diff to previous 800
Removed incorrect copyright in extfntest.c.
Fixed CONOPT detection on linux in SConstruct.
Tidied up comments in instquery.h.

Revision 800 - (view) (download) (annotate) - [select for diffs]
Modified Tue Aug 1 12:22:09 2006 UTC (18 years, 4 months ago) by johnpye
File length: 37866 byte(s)
Diff to previous 797
Fixed for CONOPT under Windows.

Revision 797 - (view) (download) (annotate) - [select for diffs]
Modified Mon Jul 31 10:52:34 2006 UTC (18 years, 4 months ago) by johnpye
File length: 36960 byte(s)
Diff to previous 794
Added 'testcmslv' model.
Fixed error in CONOPT build test.

Revision 794 - (view) (download) (annotate) - [select for diffs]
Modified Fri Jul 28 06:38:35 2006 UTC (18 years, 4 months ago) by johnpye
File length: 36952 byte(s)
Diff to previous 784
Bumped version number 0.9.5.96

Revision 784 - (view) (download) (annotate) - [select for diffs]
Modified Wed Jul 26 12:44:00 2006 UTC (18 years, 4 months ago) by johnpye
File length: 36952 byte(s)
Diff to previous 783
Enabled the LRSLV solver, so that CMSLV will be able to function correctly.

Revision 783 - (view) (download) (annotate) - [select for diffs]
Modified Wed Jul 26 09:16:19 2006 UTC (18 years, 4 months ago) by johnpye
File length: 36944 byte(s)
Diff to previous 782
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.

Revision 782 - (view) (download) (annotate) - [select for diffs]
Modified Tue Jul 25 02:09:12 2006 UTC (18 years, 4 months ago) by johnpye
File length: 35408 byte(s)
Diff to previous 766
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.

Revision 766 - (view) (download) (annotate) - [select for diffs]
Modified Thu Jul 13 06:33:03 2006 UTC (18 years, 5 months ago) by johnpye
File length: 35974 byte(s)
Diff to previous 761
Added 'docs' target to run doxygen for libascend.

Revision 761 - (view) (download) (annotate) - [select for diffs]
Modified Thu Jul 13 04:46:13 2006 UTC (18 years, 5 months ago) by johnpye
File length: 35710 byte(s)
Diff to previous 748
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.

Revision 748 - (view) (download) (annotate) - [select for diffs]
Modified Tue Jul 11 05:54:26 2006 UTC (18 years, 5 months ago) by johnpye
File length: 35099 byte(s)
Diff to previous 743
Lot of svn ignore tagging.
Little more work on DSG model.

Revision 743 - (view) (download) (annotate) - [select for diffs]
Modified Thu Jul 6 14:22:26 2006 UTC (18 years, 5 months ago) by johnpye
File length: 35099 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 (18 years, 5 months ago) by johnpye
File length: 35081 byte(s)
Diff to previous 741
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 741 - (view) (download) (annotate) - [select for diffs]
Modified Thu Jul 6 08:54:42 2006 UTC (18 years, 5 months ago) by johnpye
File length: 35577 byte(s)
Diff to previous 740
Fixes for MSVC++

Revision 740 - (view) (download) (annotate) - [select for diffs]
Modified Thu Jul 6 06:06:11 2006 UTC (18 years, 5 months ago) by johnpye
File length: 36008 byte(s)
Diff to previous 739
Fixing build for Microsoft VC++ 8

Revision 739 - (view) (download) (annotate) - [select for diffs]
Modified Thu Jul 6 03:49:33 2006 UTC (18 years, 5 months ago) by johnpye
File length: 34906 byte(s)
Diff to previous 721
Working on fixing for MSVC on Windows.

Revision 721 - (view) (download) (annotate) - [select for diffs]
Modified Mon Jul 3 06:22:42 2006 UTC (18 years, 5 months ago) by johnpye
File length: 34828 byte(s)
Diff to previous 709
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 '.'

Revision 709 - (view) (download) (annotate) - [select for diffs]
Modified Wed Jun 28 16:28:57 2006 UTC (18 years, 5 months ago) by johnpye
File length: 34708 byte(s)
Diff to previous 705
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.

Revision 705 - (view) (download) (annotate) - [select for diffs]
Modified Tue Jun 27 02:37:49 2006 UTC (18 years, 5 months ago) by johnpye
File length: 34735 byte(s)
Diff to previous 684
Improved detection of math library.
Fixed bug that was affecting detection of CUnit library.

Revision 684 - (view) (download) (annotate) - [select for diffs]
Modified Wed Jun 21 14:50:17 2006 UTC (18 years, 5 months ago) by johnpye
File length: 33875 byte(s)
Diff to previous 683
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.

Revision 683 - (view) (download) (annotate) - [select for diffs]
Modified Wed Jun 21 13:49:40 2006 UTC (18 years, 5 months ago) by johnpye
File length: 33902 byte(s)
Diff to previous 680
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.

Revision 680 - (view) (download) (annotate) - [select for diffs]
Modified Wed Jun 21 11:14:49 2006 UTC (18 years, 5 months ago) by johnpye
File length: 33519 byte(s)
Diff to previous 673
Adding explicit dependency of tarball on 'ascend.spec'.
Use automated creation of SRCS lists in base/generic/general makefile.

Revision 673 - (view) (download) (annotate) - [select for diffs]
Modified Wed Jun 21 09:26:49 2006 UTC (18 years, 5 months ago) by johnpye
File length: 33487 byte(s)
Diff to previous 665
Fixing up incorrectly merged SConstruct
(merging r702-820 from dae branch to trunk)

Revision 665 - (view) (download) (annotate) - [select for diffs]
Modified Wed Jun 14 10:43:59 2006 UTC (18 years, 5 months ago) by johnpye
File length: 30042 byte(s)
Diff to previous 663
Small changes to CUnit detection.

Revision 663 - (view) (download) (annotate) - [select for diffs]
Modified Wed Jun 14 09:33:45 2006 UTC (18 years, 5 months ago) by johnpye
File length: 29851 byte(s)
Diff to previous 658
Bumping version number

Revision 658 - (view) (download) (annotate) - [select for diffs]
Modified Fri Jun 2 07:35:27 2006 UTC (18 years, 6 months ago) by johnpye
File length: 29851 byte(s)
Diff to previous 656
Fixing up for buildbot problem with null release ID

Revision 656 - (view) (download) (annotate) - [select for diffs]
Modified Fri Jun 2 06:36:32 2006 UTC (18 years, 6 months ago) by johnpye
File length: 29801 byte(s)
Diff to previous 651
Removed dependency on ccache.
Added RELEASE flag to allow BuildBot to control RPM versions.

Revision 651 - (view) (download) (annotate) - [select for diffs]
Modified Thu Jun 1 11:51:33 2006 UTC (18 years, 6 months ago) by johnpye
File length: 29535 byte(s)
Diff to previous 647
Bumped version to 0.9.5.93.
Added Tcl/Tk GUI to the GNOME applications menu.

Revision 647 - (view) (download) (annotate) - [select for diffs]
Modified Mon May 29 14:14:10 2006 UTC (18 years, 6 months ago) by johnpye
File length: 29535 byte(s)
Diff to previous 646
Turning off MSVC extensions when compiling

Revision 646 - (view) (download) (annotate) - [select for diffs]
Modified Mon May 29 13:19:54 2006 UTC (18 years, 6 months ago) by johnpye
File length: 29506 byte(s)
Diff to previous 644
Minor changes to bison/yacc detection, hoping this will make MSVC happier...

Revision 644 - (view) (download) (annotate) - [select for diffs]
Modified Mon May 29 07:19:36 2006 UTC (18 years, 6 months ago) by johnpye
File length: 29493 byte(s)
Diff to previous 643
Fixing up Yacc/Bison detection a little.

Revision 643 - (view) (download) (annotate) - [select for diffs]
Modified Mon May 29 07:07:50 2006 UTC (18 years, 6 months ago) by johnpye
File length: 29460 byte(s)
Diff to previous 642
woops

Revision 642 - (view) (download) (annotate) - [select for diffs]
Modified Mon May 29 07:01:52 2006 UTC (18 years, 6 months ago) by johnpye
File length: 29459 byte(s)
Diff to previous 637
Setting default Tcl path to one that MSVC likes as well as MINGW.

Revision 637 - (view) (download) (annotate) - [select for diffs]
Modified Mon May 29 06:25:54 2006 UTC (18 years, 6 months ago) by johnpye
File length: 29378 byte(s)
Diff to previous 636
...

Revision 636 - (view) (download) (annotate) - [select for diffs]
Modified Mon May 29 06:22:52 2006 UTC (18 years, 6 months ago) by johnpye
File length: 29377 byte(s)
Diff to previous 631
Fixed up some other small probs with MSVC2005

Revision 631 - (view) (download) (annotate) - [select for diffs]
Modified Wed May 24 05:14:20 2006 UTC (18 years, 6 months ago) by johnpye
File length: 29325 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 (18 years, 6 months ago) by johnpye
File length: 29035 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 (18 years, 6 months ago) by johnpye
File length: 28709 byte(s)
Diff to previous 627
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 627 - (view) (download) (annotate) - [select for diffs]
Modified Tue May 23 03:07:41 2006 UTC (18 years, 6 months ago) by johnpye
File length: 28463 byte(s)
Diff to previous 624
Fixing the windows build.
Added full support for Tcl/Tk version to the installer.

Revision 624 - (view) (download) (annotate) - [select for diffs]
Modified Thu May 18 15:39:38 2006 UTC (18 years, 6 months ago) by ben.allan
File length: 28393 byte(s)
Diff to previous 605
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...


Revision 605 - (view) (download) (annotate) - [select for diffs]
Modified Tue May 16 00:29:51 2006 UTC (18 years, 6 months ago) by johnpye
File length: 28394 byte(s)
Diff to previous 597
Completing missing part of RELATIVE_PATHS configuration for SCons, to address bug #262.

Revision 597 - (view) (download) (annotate) - [select for diffs]
Modified Fri May 12 12:29:45 2006 UTC (18 years, 7 months ago) by johnpye
File length: 28154 byte(s)
Diff to previous 596
Still working on a way to add options to config.h.in such that it doesn't break
autotools.

Revision 596 - (view) (download) (annotate) - [select for diffs]
Modified Fri May 12 11:37:24 2006 UTC (18 years, 7 months ago) by johnpye
File length: 27980 byte(s)
Diff to previous 595
fixed for scons, can't work out a way to allows @MISSING_SOMETHING@ to fallback safely, unfort.

Revision 595 - (view) (download) (annotate) - [select for diffs]
Modified Fri May 12 11:28:44 2006 UTC (18 years, 7 months ago) by johnpye
File length: 27938 byte(s)
Diff to previous 594
fixing so that Ben won't need to add this macro to autoconf, hopefully.

Revision 594 - (view) (download) (annotate) - [select for diffs]
Modified Fri May 12 11:10:34 2006 UTC (18 years, 7 months ago) by johnpye
File length: 27936 byte(s)
Diff to previous 593
Adding configuration option to turn off xterm colours in output.

Revision 593 - (view) (download) (annotate) - [select for diffs]
Modified Fri May 12 10:03:59 2006 UTC (18 years, 7 months ago) by johnpye
File length: 27735 byte(s)
Diff to previous 591
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.


Revision 591 - (view) (download) (annotate) - [select for diffs]
Modified Fri May 12 08:25:16 2006 UTC (18 years, 7 months ago) by johnpye
File length: 27583 byte(s)
Diff to previous 589
Added GCOV=1 option to SCons build, working on integrating LCOV tool with Buildbot.

Revision 589 - (view) (download) (annotate) - [select for diffs]
Modified Thu May 11 03:10:43 2006 UTC (18 years, 7 months ago) by johnpye
File length: 27334 byte(s)
Diff to previous 586
Fixing some malloc bugs.

Revision 586 - (view) (download) (annotate) - [select for diffs]
Modified Thu May 11 00:47:54 2006 UTC (18 years, 7 months ago) by johnpye
File length: 27274 byte(s)
Diff to previous 579
Working on improving handling of paths.

Revision 579 - (view) (download) (annotate) - [select for diffs]
Modified Tue May 9 06:21:18 2006 UTC (18 years, 7 months ago) by johnpye
File length: 27216 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 (18 years, 7 months ago) by johnpye
File length: 27209 byte(s)
Diff to previous 577
Customisable installer .exe names.
Moved NSIS tool into the scons subdirectory, reverted to standard NsisSconsBuilder from the SCons Wiki.

Revision 577 - (view) (download) (annotate) - [select for diffs]
Modified Tue May 9 04:08:53 2006 UTC (18 years, 7 months ago) by johnpye
File length: 32586 byte(s)
Diff to previous 569
Bumping the version number for NSIS and RPM pre-releases

Revision 569 - (view) (download) (annotate) - [select for diffs]
Modified Tue May 9 00:10:03 2006 UTC (18 years, 7 months ago) by johnpye
File length: 32586 byte(s)
Diff to previous 566
Changing from 'tcltk98' to 'tcltk', in progress.

Revision 566 - (view) (download) (annotate) - [select for diffs]
Modified Fri May 5 09:22:01 2006 UTC (18 years, 7 months ago) by johnpye
File length: 32619 byte(s)
Diff to previous 563
Remove dependency on perl5

Revision 563 - (view) (download) (annotate) - [select for diffs]
Modified Fri May 5 00:12:54 2006 UTC (18 years, 7 months ago) by johnpye
File length: 32613 byte(s)
Diff to previous 562
Manual override to set name of created tarball (for use with buildbot testing).

Revision 562 - (view) (download) (annotate) - [select for diffs]
Modified Thu May 4 08:25:01 2006 UTC (18 years, 7 months ago) by johnpye
File length: 32410 byte(s)
Diff to previous 561
RPM builds now, but has a dependency on perl(!?!)

Revision 561 - (view) (download) (annotate) - [select for diffs]
Modified Thu May 4 07:35:43 2006 UTC (18 years, 7 months ago) by johnpye
File length: 32261 byte(s)
Diff to previous 558
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.

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

Revision 556 - (view) (download) (annotate) - [select for diffs]
Modified Tue May 2 01:57:49 2006 UTC (18 years, 7 months ago) by johnpye
File length: 31615 byte(s)
Diff to previous 555
Some fixes to the 'disttar' thing for 'scons dist'

Revision 555 - (view) (download) (annotate) - [select for diffs]
Modified Tue May 2 01:33:10 2006 UTC (18 years, 7 months ago) by johnpye
File length: 31763 byte(s)
Diff to previous 554
Some more on the RPMs. The tarball still missing some files.

Revision 554 - (view) (download) (annotate) - [select for diffs]
Modified Tue May 2 00:51:02 2006 UTC (18 years, 7 months ago) by johnpye
File length: 31724 byte(s)
Diff to previous 552
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.

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

Revision 549 - (view) (download) (annotate) - [select for diffs]
Modified Fri Apr 28 10:01:39 2006 UTC (18 years, 7 months ago) by johnpye
File length: 30979 byte(s)
Diff to previous 546
More on RPM

Revision 546 - (view) (download) (annotate) - [select for diffs]
Modified Fri Apr 28 09:24:19 2006 UTC (18 years, 7 months ago) by johnpye
File length: 30985 byte(s)
Diff to previous 542
Adding 'gcc' to runtime requirements of RPM
Adding gccvisibility switch.

Revision 542 - (view) (download) (annotate) - [select for diffs]
Modified Wed Apr 26 15:15:40 2006 UTC (18 years, 7 months ago) by johnpye
File length: 30695 byte(s)
Diff to previous 541
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 541 - (view) (download) (annotate) - [select for diffs]
Modified Wed Apr 26 07:32:13 2006 UTC (18 years, 7 months ago) by johnpye
File length: 30711 byte(s)
Diff to previous 534
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.

Revision 534 - (view) (download) (annotate) - [select for diffs]
Modified Tue Apr 25 13:25:04 2006 UTC (18 years, 7 months ago) by johnpye
File length: 30634 byte(s)
Diff to previous 532
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.

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

Revision 529 - (view) (download) (annotate) - [select for diffs]
Modified Sat Apr 22 06:26:23 2006 UTC (18 years, 7 months ago) by johnpye
File length: 30715 byte(s)
Diff to previous 526
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 526 - (view) (download) (annotate) - [select for diffs]
Modified Fri Apr 21 13:47:31 2006 UTC (18 years, 7 months ago) by johnpye
File length: 30690 byte(s)
Diff to previous 521
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].

Revision 521 - (view) (download) (annotate) - [select for diffs]
Modified Fri Apr 21 05:35:59 2006 UTC (18 years, 7 months ago) by johnpye
File length: 30532 byte(s)
Diff to previous 511
Getting the modular version the Tcl/Tk GUI working. In progress.

Revision 511 - (view) (download) (annotate) - [select for diffs]
Modified Wed Apr 19 08:06:48 2006 UTC (18 years, 7 months ago) by wangym
File length: 28736 byte(s)
Diff to previous 509
SConstruct for python2.3

Revision 509 - (view) (download) (annotate) - [select for diffs]
Modified Wed Apr 19 05:13:08 2006 UTC (18 years, 7 months ago) by johnpye
File length: 28732 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 (18 years, 7 months ago) by johnpye
File length: 28742 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 (18 years, 7 months ago) by johnpye
File length: 28506 byte(s)
Diff to previous 506
Fixing for ubuntu GCC 4

Revision 506 - (view) (download) (annotate) - [select for diffs]
Modified Tue Apr 18 14:30:39 2006 UTC (18 years, 7 months ago) by johnpye
File length: 28279 byte(s)
Diff to previous 503
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 (18 years, 7 months ago) by johnpye
File length: 28335 byte(s)
Diff to previous 502
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 (18 years, 7 months ago) by johnpye
File length: 28335 byte(s)
Diff to previous 501
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 (18 years, 7 months ago) by johnpye
File length: 27622 byte(s)
Diff to previous 500
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 (18 years, 7 months ago) by johnpye
File length: 27572 byte(s)
Diff to previous 499
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 (18 years, 7 months ago) by johnpye
File length: 27063 byte(s)
Diff to previous 498
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 (18 years, 7 months ago) by johnpye
File length: 27054 byte(s)
Diff to previous 485
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 (18 years, 7 months ago) by johnpye
File length: 26836 byte(s)
Diff to previous 478
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 (18 years, 7 months ago) by johnpye
File length: 26696 byte(s)
Diff to previous 466
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 (18 years, 7 months ago) by johnpye
File length: 26645 byte(s)
Diff to previous 465
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 (18 years, 7 months ago) by johnpye
File length: 21688 byte(s)
Diff to previous 464
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 (18 years, 7 months ago) by johnpye
File length: 21696 byte(s)
Diff to previous 463
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 (18 years, 7 months ago) by johnpye
File length: 21423 byte(s)
Diff to previous 460
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 (18 years, 8 months ago) by johnpye
File length: 19943 byte(s)
Diff to previous 459
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 (18 years, 8 months ago) by johnpye
File length: 19589 byte(s)
Diff to previous 455
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 (18 years, 8 months ago) by johnpye
File length: 19534 byte(s)
Diff to previous 453
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 (18 years, 8 months ago) by johnpye
File length: 19178 byte(s)
Diff to previous 451
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 (18 years, 8 months ago) by johnpye
File length: 19191 byte(s)
Diff to previous 449
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 (18 years, 8 months ago) by johnpye
File length: 19202 byte(s)
Diff to previous 448
Adding 'models' directory to SCons install

Revision 448 - (view) (download) (annotate) - [select for diffs]
Modified Wed Apr 5 01:04:59 2006 UTC (18 years, 8 months ago) by johnpye
File length: 19079 byte(s)
Diff to previous 439
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 (18 years, 8 months ago) by johnpye
File length: 18939 byte(s)
Diff to previous 438
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 (18 years, 8 months ago) by johnpye
File length: 18175 byte(s)
Diff to previous 436
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 (18 years, 8 months ago) by johnpye
File length: 18707 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 (18 years, 8 months ago) by johnpye
File length: 17919 byte(s)
Diff to previous 428
Starting work on linux-based install process

Revision 428 - (view) (download) (annotate) - [select for diffs]
Modified Tue Apr 4 06:41:25 2006 UTC (18 years, 8 months ago) by johnpye
File length: 17426 byte(s)
Diff to previous 427
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 (18 years, 8 months ago) by johnpye
File length: 16386 byte(s)
Diff to previous 416
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 (18 years, 8 months ago) by johnpye
File length: 14403 byte(s)
Diff to previous 415
Debug output for MSVC build

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

Revision 414 - (view) (download) (annotate) - [select for diffs]
Modified Mon Apr 3 04:55:35 2006 UTC (18 years, 8 months ago) by johnpye
File length: 14230 byte(s)
Diff to previous 413
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 (18 years, 8 months ago) by johnpye
File length: 14075 byte(s)
Diff to previous 412
Improved SWIG detection and version checking.

Revision 412 - (view) (download) (annotate) - [select for diffs]
Modified Mon Apr 3 03:31:30 2006 UTC (18 years, 8 months ago) by johnpye
File length: 13990 byte(s)
Diff to previous 406
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 (18 years, 8 months ago) by johnpye
File length: 13954 byte(s)
Diff to previous 405
Woops

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

Revision 404 - (view) (download) (annotate) - [select for diffs]
Modified Sat Apr 1 05:37:52 2006 UTC (18 years, 8 months ago) by johnpye
File length: 13911 byte(s)
Diff to previous 403
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 (18 years, 8 months ago) by johnpye
File length: 12240 byte(s)
Diff to previous 402
Fixed bug #251

Revision 402 - (view) (download) (annotate) - [select for diffs]
Modified Fri Mar 31 15:46:35 2006 UTC (18 years, 8 months ago) by johnpye
File length: 12302 byte(s)
Diff to previous 401
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 (18 years, 8 months ago) by johnpye
File length: 12270 byte(s)
Diff to previous 400
Fixing up message about bad SWIG version

Revision 400 - (view) (download) (annotate) - [select for diffs]
Modified Fri Mar 31 10:59:36 2006 UTC (18 years, 8 months ago) by johnpye
File length: 12256 byte(s)
Diff to previous 398
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 (18 years, 8 months ago) by johnpye
File length: 9890 byte(s)
Diff to previous 396
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 (18 years, 8 months ago) by johnpye
File length: 8644 byte(s)
Diff to previous 395
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 (18 years, 8 months 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) - [select for diffs]
Modified Thu Mar 30 14:46:37 2006 UTC (18 years, 8 months 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 (18 years, 8 months ago) by johnpye
File length: 3754 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 (18 years, 8 months ago) by johnpye
File length: 2928 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 (18 years, 8 months ago) by johnpye
File length: 2489 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]
Modified Thu Mar 30 05:13:59 2006 UTC (18 years, 8 months ago) by johnpye
File length: 2431 byte(s)
Diff to previous 386
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 (18 years, 8 months ago) by johnpye
File length: 2049 byte(s)
Diff to previous 385
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 (18 years, 8 months ago) by johnpye
File length: 1544 byte(s)
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