/[escript]/trunk/finley/src/SConscript
ViewVC logotype

Log of /trunk/finley/src/SConscript

Parent Directory Parent Directory | Revision Log Revision Log


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

Revision 2484 - (view) (annotate) - [select for diffs]
Modified Mon Jun 22 04:22:19 2009 UTC (10 years, 4 months ago) by gross
File length: 5032 byte(s)
Diff to previous 2041 , to selected 1664
numarray removed from docu; Locator revised.

Revision 2041 - (view) (annotate) - [select for diffs]
Modified Sat Nov 15 12:45:15 2008 UTC (10 years, 11 months ago) by phornby
File length: 5031 byte(s)
Diff to previous 2033 , to selected 1664
ESYS_STATIC_LIB no longer needs to be defined in SConscript files.

Revision 2033 - (view) (annotate) - [select for diffs]
Modified Wed Nov 12 08:14:11 2008 UTC (10 years, 11 months ago) by phornby
File length: 5157 byte(s)
Diff to previous 2031 , to selected 1664
As in the last message, add an extra CPPDEFINE to py_local_wrapper_env



Revision 2031 - (view) (annotate) - [select for diffs]
Modified Wed Nov 12 08:02:33 2008 UTC (10 years, 11 months ago) by phornby
File length: 5088 byte(s)
Diff to previous 2027 , to selected 1664
Need finer control than INTERFACE_STATIC_LIB could exert. Now there is a
XXX_STATIC_LIB for each lib.



Revision 2027 - (view) (annotate) - [select for diffs]
Modified Tue Nov 11 02:52:24 2008 UTC (10 years, 11 months ago) by phornby
File length: 5031 byte(s)
Diff to previous 1847 , to selected 1664
Ensure ESCRIPT_EXPORTS is defined only while compiling escript on windows.
A similar comment applies to FINLEY_EXPORTS.

SConstruct:
Fixed a comment.
reformatted the Export() call, and added IS_WINDOWS_PLATFORM to the exports.

Revision 1847 - (view) (annotate) - [select for diffs]
Modified Fri Oct 3 06:45:34 2008 UTC (11 years ago) by phornby
File length: 4952 byte(s)
Diff to previous 1845 , to selected 1664
OK, these get the blahcpp.so names correct now.



Revision 1845 - (view) (annotate) - [select for diffs]
Modified Fri Oct 3 05:23:47 2008 UTC (11 years ago) by gross
File length: 4893 byte(s)
Diff to previous 1840 , to selected 1664
some naming problem for the installation of escriptcpp and finleycpp. Apparently this came is trough some mofifications in windows

Revision 1840 - (view) (annotate) - [select for diffs]
Modified Fri Oct 3 03:16:11 2008 UTC (11 years ago) by phornby
File length: 4939 byte(s)
Diff to previous 1839 , to selected 1664
These now install the correct .pyd files on windows.

Revision 1839 - (view) (annotate) - [select for diffs]
Modified Fri Oct 3 02:06:00 2008 UTC (11 years ago) by phornby
File length: 4768 byte(s)
Diff to previous 1811 , to selected 1664
temporary fix to get run_tests working

Revision 1811 - (view) (annotate) - [select for diffs]
Modified Thu Sep 25 23:11:13 2008 UTC (11 years ago) by ksteube
File length: 4805 byte(s)
Diff to previous 1705 , to selected 1664
Copyright updated in all files


Revision 1705 - (view) (annotate) - [select for diffs]
Modified Thu Aug 14 05:56:40 2008 UTC (11 years, 2 months ago) by ksteube
File length: 4828 byte(s)
Diff to previous 1664
Branch scons-dev is hereby closed.
Some parts of scons scripts have been re-written.


Revision 1664 - (view) (annotate) - [selected]
Modified Tue Jul 22 03:41:38 2008 UTC (11 years, 3 months ago) by ksteube
File length: 4039 byte(s)
Diff to previous 1568
Install() on Mac OS was naming shared libs file.dylib...not OK for our
libraries for python calling C++ (escriptcpp.so and finleycpp.so).
This is because python's dlopen() calls only look for .so files.


Revision 1568 - (view) (annotate) - [select for diffs]
Modified Sat May 24 03:15:08 2008 UTC (11 years, 5 months ago) by ksteube
File length: 4024 byte(s)
Diff to previous 1428 , to selected 1664
Some testing on ac.apac.edu.au, more work needed
New pyvisi example offscreen.py for offscreen rendering


Revision 1428 - (view) (annotate) - [select for diffs]
Modified Wed Feb 27 08:07:11 2008 UTC (11 years, 7 months ago) by trankine
File length: 4022 byte(s)
Diff to previous 1388 , to selected 1664
Merge changes from windows port branch to test build on *nix not broken.

Revision 1388 - (view) (annotate) - [select for diffs]
Modified Fri Jan 11 07:45:58 2008 UTC (11 years, 9 months ago) by trankine
File length: 3628 byte(s)
Diff to previous 1387 , to selected 1664
And get the *(&(*&(* name right

Revision 1387 - (view) (annotate) - [select for diffs]
Modified Fri Jan 11 07:45:26 2008 UTC (11 years, 9 months ago) by trankine
Original Path: temp/finley/src/SConscript
File length: 3628 byte(s)
Diff to previous 1384 , to selected 1664
Restore the trunk that existed before the windows changes were committed to the (now moved to branches) old trunk.

Revision 1384 - (view) (annotate) - [select for diffs]
Modified Fri Jan 11 02:29:38 2008 UTC (11 years, 9 months ago) by phornby
Original Path: temp_trunk_copy/finley/src/SConscript
File length: 3628 byte(s)
Diff to previous 1312 , to selected 1664
Make a temp copy of the trunk before checking in the windows changes



Revision 1312 - (view) (annotate) - [select for diffs]
Modified Mon Sep 24 06:18:44 2007 UTC (12 years, 1 month ago) by ksteube
File length: 3628 byte(s)
Diff to previous 1235 , to selected 1664
The MPI branch is hereby closed. All future work should be in trunk.

Previously in revision 1295 I merged the latest changes to trunk into trunk-mpi-branch.
In this revision I copied all files from trunk-mpi-branch over the corresponding
trunk files. I did not use 'svn merge', it was a copy.


Revision 1235 - (view) (annotate) - [select for diffs]
Modified Mon Aug 13 00:25:29 2007 UTC (12 years, 2 months ago) by phornby
File length: 3510 byte(s)
Diff to previous 1139 , to selected 1664
Started the removal of IS_WINDOWS_PLATFORM, and now insis that the windows options file be kept up to date, and be complete.

boost_libs -> boost_lib.

Revision 1139 - (view) (annotate) - [select for diffs]
Modified Mon May 14 05:12:53 2007 UTC (12 years, 5 months ago) by ksteube
File length: 3523 byte(s)
Diff to previous 1133 , to selected 1664
Finished renaming of boost_lib to boost_libs and boost_lib_path to boost_libs_path.


Revision 1133 - (view) (annotate) - [select for diffs]
Modified Tue May 8 07:19:33 2007 UTC (12 years, 5 months ago) by gross
File length: 3519 byte(s)
Diff to previous 806 , to selected 1664
Changes needed for windows. This still does not work on and has not run on linux and the altix. 
 
There are a few changes in names in the scons script, in particular _libs is used rather than _lib and _libs is always a list. By default on windows MSVC is used. The location of python is at C:\Program Files\python<version>, boost at C:\Program Files\boost and netcdf at C:\Program Files\netcdf. 

 

Revision 806 - (view) (annotate) - [select for diffs]
Modified Thu Aug 10 11:58:52 2006 UTC (13 years, 2 months ago) by gross
File length: 3471 byte(s)
Diff to previous 757 , to selected 1664
Interface to the direct solver library UMLPACK is no implemented.



Revision 757 - (view) (annotate) - [select for diffs]
Modified Mon Jun 26 13:12:56 2006 UTC (13 years, 3 months ago) by woo409
File length: 3367 byte(s)
Diff to previous 707 , to selected 1664
+ Merge of intelc_win32 branch (revision 741:755) with trunk. Tested on iVEC altix (run_tests and py_tests all pass)


Revision 707 - (view) (annotate) - [select for diffs]
Modified Wed Apr 12 23:58:02 2006 UTC (13 years, 6 months ago) by gross
File length: 3319 byte(s)
Diff to previous 700 , to selected 1664
latex build documentation is working now

Revision 700 - (view) (annotate) - [select for diffs]
Modified Thu Apr 6 00:13:40 2006 UTC (13 years, 6 months ago) by gross
File length: 3077 byte(s)
Diff to previous 682 , to selected 1664
A few changes in the build mechanism and the file structure so scons can build release tar files:

  * paso/src/Solver has been moved to paso/src 
  * all test_.py are now run_.py files and are assumed to be passing python tests. they can run by 
    scons py_tests and are part of the release test set
  * escript/py_src/test_ are moved to escript/test/python and are installed in to the build directory 
    (rather then the PYTHONPATH).
  * all py files in test/python which don't start with run_ or test_ are now 'local_py_tests'. they are installed i
    by not run automatically.
  * CppUnitTest is now treated as a escript module (against previous decisions).
  * scons realse builds nor tar/zip files with relvant source code (src and tests in seperate files)

the python tests don't pass yet due to path problems.



Revision 682 - (view) (annotate) - [select for diffs]
Modified Mon Mar 27 02:43:09 2006 UTC (13 years, 7 months ago) by robwdcock
File length: 2857 byte(s)
Diff to previous 618 , to selected 1664
+ NEW BUILD SYSTEM

This commit contains the new build system with cross-platform support.
Most things work are before though you can have more control.

ENVIRONMENT settings have changed:
+ You no longer require LD_LIBRARY_PATH or PYTHONPATH to point to the
esysroot for building and testing performed via scons
+ ACcESS altix users: It is recommended you change your modules to load
the latest intel compiler and other libraries required by boost to match
the setup in svn (you can override). The correct modules are as follows

module load intel_cc.9.0.026
export
MODULEPATH=${MODULEPATH}:/data/raid2/toolspp4/modulefiles/gcc-3.3.6
module load boost/1.33.0/python-2.4.1
module load python/2.4.1
module load numarray/1.3.3



Revision 618 - (view) (annotate) - [select for diffs]
Modified Wed Mar 22 04:02:38 2006 UTC (13 years, 7 months ago) by gross
File length: 5034 byte(s)
Diff to previous 584 , to selected 1664
mmio moced to paso

Revision 584 - (view) (annotate) - [select for diffs]
Modified Thu Mar 9 23:03:38 2006 UTC (13 years, 7 months ago) by gross
File length: 5207 byte(s)
Diff to previous 532 , to selected 1664
eigenvalues: compiles and passes tests on altix now

Revision 532 - (view) (annotate) - [select for diffs]
Modified Wed Feb 15 09:45:53 2006 UTC (13 years, 8 months ago) by gross
File length: 5096 byte(s)
Diff to previous 484 , to selected 1664
first steps towards the reuse of the element jacobians

Revision 484 - (view) (annotate) - [select for diffs]
Modified Thu Feb 2 02:12:08 2006 UTC (13 years, 8 months ago) by jgs
File length: 5017 byte(s)
Diff to previous 481 , to selected 1664
add remainder of includes to SConscript includes install

Revision 481 - (view) (annotate) - [select for diffs]
Modified Wed Feb 1 05:57:50 2006 UTC (13 years, 8 months ago) by jgs
File length: 4518 byte(s)
Diff to previous 474 , to selected 1664
add mechanism to install .h files to inc directories
(still need to specify full lists of .h files to install)


Revision 474 - (view) (annotate) - [select for diffs]
Modified Mon Jan 30 04:23:44 2006 UTC (13 years, 8 months ago) by jgs
File length: 4322 byte(s)
Diff to previous 471 , to selected 1664
restructure escript source tree
move src/Data/* -> src
remove inc
modify #includes and cpppath settings accordingly


Revision 471 - (view) (annotate) - [select for diffs]
Modified Fri Jan 27 01:33:02 2006 UTC (13 years, 8 months ago) by jgs
File length: 4322 byte(s)
Copied from: trunk/finley/src/finley/SConscript revision 469
Diff to previous 468 , to selected 1664
reorganise finley src tree to remove inc dir and src/finley directory


Revision 468 - (view) (annotate) - [select for diffs]
Modified Wed Jan 25 06:50:39 2006 UTC (13 years, 9 months ago) by jgs
Original Path: trunk/finley/src/finley/SConscript
File length: 4336 byte(s)
Diff to previous 467 , to selected 1664
reorganised esysUtils to remove inc directory

Revision 467 - (view) (annotate) - [select for diffs]
Modified Wed Jan 25 05:43:46 2006 UTC (13 years, 9 months ago) by jgs
Original Path: trunk/finley/src/finley/SConscript
File length: 4336 byte(s)
Diff to previous 425 , to selected 1664
adjustments to includes to allow for new paso src tree structure

Revision 425 - (view) (annotate) - [select for diffs]
Modified Tue Jan 10 04:10:39 2006 UTC (13 years, 9 months ago) by gross
Original Path: trunk/finley/src/finley/SConscript
File length: 4336 byte(s)
Diff to previous 352 , to selected 1664
The sparse solver can be called by paso now. 

the building has been change to reduce some code redundancy:
now all scons SCscripts are importing scons/esys_options.py which
imports platform specific settings. 




Revision 352 - (view) (annotate) - [select for diffs]
Modified Wed Dec 14 02:21:37 2005 UTC (13 years, 10 months ago) by jgs
Original Path: trunk/finley/src/finley/SConscript
File length: 4303 byte(s)
Diff to previous 288 , to selected 1664
turns out Install() targets should also be made Default()
targets if you want them to actually reliably work!


Revision 288 - (view) (annotate) - [select for diffs]
Modified Fri Dec 2 01:55:04 2005 UTC (13 years, 10 months ago) by jgs
Original Path: trunk/finley/src/finley/SConscript
File length: 4276 byte(s)
Diff to previous 277 , to selected 1664
now automatically build unit tests as required based on dependencies
between unit tests and libraries


Revision 277 - (view) (annotate) - [select for diffs]
Modified Wed Nov 30 04:52:39 2005 UTC (13 years, 10 months ago) by jgs
Original Path: trunk/finley/src/finley/SConscript
File length: 4236 byte(s)
Diff to previous 223 , to selected 1664
explicitly define dependencies between modules


Revision 223 - (view) (annotate) - [select for diffs]
Modified Thu Nov 24 23:12:13 2005 UTC (13 years, 11 months ago) by jgs
Original Path: trunk/finley/src/finley/SConscript
File length: 3385 byte(s)
Diff to previous 204 , to selected 1664
pass in cc/cxx settings from config file

Revision 204 - (view) (annotate) - [select for diffs]
Modified Wed Nov 23 04:43:51 2005 UTC (13 years, 11 months ago) by jgs
Original Path: trunk/finley/src/finley/SConscript
File length: 3390 byte(s)
Diff to previous 201 , to selected 1664
revised scons files to account for new finley source tree structure


Revision 201 - (view) (annotate) - [select for diffs]
Modified Wed Nov 23 04:10:21 2005 UTC (13 years, 11 months ago) by jgs
Original Path: trunk/finley/src/finley/SConscript
File length: 2884 byte(s)
Copied from: trunk/finley/src/finleyC/SConscript revision 191
Diff to previous 191 , to selected 1664
copy finleyC and CPPAdapter to finley and finley/CPPAdapter to
facilitate scons builds


Revision 191 - (view) (annotate) - [select for diffs]
Modified Mon Nov 21 04:10:12 2005 UTC (13 years, 11 months ago) by jgs
Original Path: trunk/finley/src/finleyC/SConscript
File length: 2860 byte(s)
Diff to previous 190 , to selected 1664
push platform dependent compiler flags and include directories up to library level scons files - these will eventually be brought in from external config files

Revision 190 - (view) (annotate) - [select for diffs]
Modified Mon Nov 21 03:27:42 2005 UTC (13 years, 11 months ago) by jgs
Original Path: trunk/finley/src/finleyC/SConscript
File length: 3057 byte(s)
Diff to previous 188 , to selected 1664
pass in value for esysroot and use this to determine include file locations

Revision 188 - (view) (annotate) - [select for diffs]
Modified Mon Nov 21 01:20:26 2005 UTC (13 years, 11 months ago) by jgs
Original Path: trunk/finley/src/finleyC/SConscript
File length: 2832 byte(s)
Diff to previous 182 , to selected 1664
explicitly add -fpic option to all compiler options lists
to ensure relocatable code is generated


Revision 182 - (view) (annotate) - [select for diffs]
Added Fri Nov 18 05:07:36 2005 UTC (13 years, 11 months ago) by jgs
Original Path: trunk/finley/src/finleyC/SConscript
File length: 2826 byte(s)
Diff to selected 1664
first draft of config/construct files for finleyC/finleycpp libraries


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

  ViewVC Help
Powered by ViewVC 1.1.26