Log of /release/release_2.0.0/scons/windows_mscv71_options.py
Parent Directory
| 
Revision Log
Revision
2005 -
(
view)
(
annotate)
-
[select for diffs]
Modified
Mon Nov 10 01:21:39 2008 UTC
(12 years, 5 months ago)
by
jfenwick
Original Path:
trunk/scons/windows_mscv71_options.py
File length: 2135 byte(s)
Diff to
previous 1832
Bringing all changes across from schroedinger.
(Note this does not mean development is done, just that it will happen
on the trunk for now).
If anyone notices any problems please contact me.
Revision
1628 -
(
view)
(
annotate)
-
[select for diffs]
Modified
Fri Jul 11 13:12:46 2008 UTC
(12 years, 9 months ago)
by
phornby
Original Path:
trunk/scons/windows_mscv71_options.py
File length: 2134 byte(s)
Diff to
previous 1427
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
1312 -
(
view)
(
annotate)
-
[select for diffs]
Modified
Mon Sep 24 06:18:44 2007 UTC
(13 years, 6 months ago)
by
ksteube
Original Path:
trunk/scons/windows_mscv71_options.py
File length: 1920 byte(s)
Diff to
previous 1245
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
1232 -
(
view)
(
annotate)
-
[select for diffs]
Modified
Fri Aug 10 06:44:04 2007 UTC
(13 years, 8 months ago)
by
phornby
Original Path:
trunk/scons/windows_mscv71_options.py
File length: 1167 byte(s)
Diff to
previous 1160
Reduce the number of IS_WINDOWS_PLATFORM references in SConstruct.
Change path to boost etc in windows_mscv71_options.py
Some of these changes are present in windows_mscv71_options.py, more changes needed once I get the mscv71 build going properly.
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.
