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

Log of /trunk/esysUtils/src/SConscript

Parent Directory Parent Directory | Revision Log Revision Log


Sticky Revision:
(Current path doesn't exist after revision 6000)

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


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


Revision 1628 - (view) (annotate) - [select for diffs]
Modified Fri Jul 11 13:12:46 2008 UTC (11 years, 2 months ago) by phornby
File length: 1542 byte(s)
Diff to previous 1388 , to selected 1312

Merge in /branches/windows_from_1456_trunk_1620_merged_in branch.

You will find a preserved pre-merge trunk in tags under tags/trunk_at_1625.
That will be useful for diffing & checking on my stupidity.

Here is a list of the conflicts and their resolution at this
point in time.


=================================================================================
(LLWS == looks like white space).

finley/src/Assemble_addToSystemMatrix.c - resolve to branch - unused var. may be wrong.....
finley/src/CPPAdapter/SystemMatrixAdapter.cpp - resolve to branch - LLWS
finley/src/CPPAdapter/MeshAdapter.cpp - resolve to branch - LLWS
paso/src/PCG.c - resolve to branch - unused var fixes.
paso/src/SolverFCT.c - resolve to branch - LLWS
paso/src/FGMRES.c - resolve to branch - LLWS
paso/src/Common.h - resolve to trunk version. It's omp.h's include... not sure it's needed,
but for the sake of saftey.....
paso/src/Functions.c - resolve to branch version, indentation/tab removal and return error
on bad unimplemented Paso_FunctionCall.
paso/src/SolverFCT_solve.c - resolve to branch version, unused vars
paso/src/SparseMatrix_MatrixVector.c - resolve to branch version, unused vars.
escript/src/Utils.cpp - resloved to branch, needs WinSock2.h
escript/src/DataExpanded.cpp - resolved to branch version - LLWS
escript/src/DataFactory.cpp - resolve to branch version
=================================================================================

This currently passes tests on linux (debian), but is not checked on windows or Altix yet.

This checkin is to make a trunk I can check out for windows to do tests on it.

Known outstanding problem is in the operator=() method of exceptions
causing warning messages on the intel compilers.

May the God of doughnuts have mercy on my soul.



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

Revision 1387 - (view) (annotate) - [select for diffs]
Modified Fri Jan 11 07:45:26 2008 UTC (11 years, 8 months ago) by trankine
Original Path: temp/esysUtils/src/SConscript
File length: 1338 byte(s)
Diff to previous 1384 , to selected 1312
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, 8 months ago) by phornby
Original Path: temp_trunk_copy/esysUtils/src/SConscript
File length: 1338 byte(s)
Diff to previous 1312
Make a temp copy of the trunk before checking in the windows changes



Revision 1312 - (view) (annotate) - [selected]
Modified Mon Sep 24 06:18:44 2007 UTC (11 years, 11 months ago) by ksteube
File length: 1338 byte(s)
Diff to previous 1235
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, 1 month ago) by phornby
File length: 1378 byte(s)
Diff to previous 1133 , to selected 1312
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 1133 - (view) (annotate) - [select for diffs]
Modified Tue May 8 07:19:33 2007 UTC (12 years, 4 months ago) by gross
File length: 1379 byte(s)
Diff to previous 700 , to selected 1312
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 700 - (view) (annotate) - [select for diffs]
Modified Thu Apr 6 00:13:40 2006 UTC (13 years, 5 months ago) by gross
File length: 1342 byte(s)
Diff to previous 682 , to selected 1312
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, 5 months ago) by robwdcock
File length: 1081 byte(s)
Diff to previous 468 , to selected 1312
+ 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 468 - (view) (annotate) - [select for diffs]
Modified Wed Jan 25 06:50:39 2006 UTC (13 years, 7 months ago) by jgs
File length: 547 byte(s)
Diff to previous 352 , to selected 1312
reorganised esysUtils to remove inc directory

Revision 352 - (view) (annotate) - [select for diffs]
Modified Wed Dec 14 02:21:37 2005 UTC (13 years, 9 months ago) by jgs
File length: 546 byte(s)
Diff to previous 225 , to selected 1312
turns out Install() targets should also be made Default()
targets if you want them to actually reliably work!


Revision 225 - (view) (annotate) - [select for diffs]
Modified Fri Nov 25 01:22:34 2005 UTC (13 years, 9 months ago) by jgs
File length: 536 byte(s)
Diff to previous 223 , to selected 1312
pass in correct options to archiver for static libraries

Revision 223 - (view) (annotate) - [select for diffs]
Modified Thu Nov 24 23:12:13 2005 UTC (13 years, 9 months ago) by jgs
File length: 498 byte(s)
Diff to previous 191 , to selected 1312
pass in cc/cxx settings from config file

Revision 191 - (view) (annotate) - [select for diffs]
Modified Mon Nov 21 04:10:12 2005 UTC (13 years, 10 months ago) by jgs
File length: 500 byte(s)
Diff to previous 190 , to selected 1312
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, 10 months ago) by jgs
File length: 698 byte(s)
Diff to previous 188 , to selected 1312
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, 10 months ago) by jgs
File length: 588 byte(s)
Diff to previous 180 , to selected 1312
explicitly add -fpic option to all compiler options lists
to ensure relocatable code is generated


Revision 180 - (view) (annotate) - [select for diffs]
Added Fri Nov 18 03:29:44 2005 UTC (13 years, 10 months ago) by jgs
File length: 582 byte(s)
Diff to selected 1312
first draft of scons config scripts for esysUtils library


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