/[escript]/branches/domexper/scons/windows_mscv71_options.py
ViewVC logotype

Log of /branches/domexper/scons/windows_mscv71_options.py

Parent Directory Parent Directory | Revision Log Revision Log


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

Revision 3079 - (view) (annotate) - [select for diffs]
Modified Tue Aug 3 04:04:51 2010 UTC (8 years, 10 months ago) by jfenwick
File length: 2453 byte(s)
Diff to previous 2881 , to selected 1831
Some experiments on finley


Revision 2881 - (view) (annotate) - [select for diffs]
Modified Thu Jan 28 02:03:15 2010 UTC (9 years, 4 months ago) by jfenwick
Original Path: trunk/scons/windows_mscv71_options.py
File length: 2453 byte(s)
Diff to previous 2629 , to selected 1831
Don't panic.
Updating copyright stamps


Revision 2629 - (view) (annotate) - [select for diffs]
Modified Tue Aug 25 06:39:26 2009 UTC (9 years, 10 months ago) by trankine
Original Path: trunk/scons/windows_mscv71_options.py
File length: 2453 byte(s)
Diff to previous 2548 , to selected 1831
Changes to work on Windows with boost 1.39.0. Using command separator &. Note: there are still 2 CheckFunc that fail (but can be bypassed as the rest of the build works). 

Revision 2548 - (view) (annotate) - [select for diffs]
Modified Mon Jul 20 06:20:06 2009 UTC (9 years, 11 months ago) by jfenwick
Original Path: trunk/scons/windows_mscv71_options.py
File length: 2466 byte(s)
Diff to previous 2414 , to selected 1831
Updating copyright notices

Revision 2414 - (view) (annotate) - [select for diffs]
Modified Tue May 12 03:33:49 2009 UTC (10 years, 1 month ago) by gross
Original Path: trunk/scons/windows_mscv71_options.py
File length: 2466 byte(s)
Diff to previous 2042 , to selected 1831
added flags (commented out) to compile MPI version on Windows (Visual Studio 2003) using MPICH2

Revision 2042 - (view) (annotate) - [select for diffs]
Modified Sat Nov 15 12:52:46 2008 UTC (10 years, 7 months ago) by phornby
Original Path: trunk/scons/windows_mscv71_options.py
File length: 2291 byte(s)
Diff to previous 2013 , to selected 1831
Prevent Windows compilers from keeping their own program database file.
This allows the use of the -jn scons option on Windows.

Revision 2013 - (view) (annotate) - [select for diffs]
Modified Mon Nov 10 12:16:32 2008 UTC (10 years, 7 months ago) by phornby
Original Path: trunk/scons/windows_mscv71_options.py
File length: 2134 byte(s)
Diff to previous 2005 , to selected 1831
Add the tools_names vars to control the compiler toolset scons uses
on windows platforms. (See cgisrv3_options.py for example of use).

Revision 2005 - (view) (annotate) - [select for diffs]
Modified Mon Nov 10 01:21:39 2008 UTC (10 years, 7 months ago) by jfenwick
Original Path: trunk/scons/windows_mscv71_options.py
File length: 2135 byte(s)
Diff to previous 1832 , to selected 1831
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 1832 - (view) (annotate) - [select for diffs]
Modified Thu Oct 2 09:33:48 2008 UTC (10 years, 8 months ago) by phornby
Original Path: trunk/scons/windows_mscv71_options.py
File length: 2110 byte(s)
Diff to previous 1831
This one is closer to working.

Revision 1831 - (view) (annotate) - [selected]
Modified Thu Oct 2 08:55:16 2008 UTC (10 years, 8 months ago) by phornby
Original Path: trunk/scons/windows_mscv71_options.py
File length: 2123 byte(s)
Diff to previous 1810
First cut at a windows option file. I probably does not work. This is a backup commit.



Revision 1810 - (view) (annotate) - [select for diffs]
Modified Thu Sep 25 06:53:26 2008 UTC (10 years, 9 months ago) by ksteube
Original Path: trunk/scons/windows_mscv71_options.py
File length: 2208 byte(s)
Diff to previous 1633 , to selected 1831
Updated copyright for a few remaining python files


Revision 1633 - (view) (annotate) - [select for diffs]
Modified Sat Jul 12 07:45:17 2008 UTC (10 years, 11 months ago) by trankine
Original Path: trunk/scons/windows_mscv71_options.py
File length: 2231 byte(s)
Diff to previous 1628 , to selected 1831
Turn on netcdf in windows build. No new errors generated.... remarkable.

The correctly configured netCDF source and windows build config.
that matches enthought python25/vtk/PmdPyRT for windows, can be
obtained from

https://cgsrv1.arrc.csiro.au/subversion/swframeutils/thirdParty/netcdf/trunk

username & password needed. If you have access to our twiki, no new username is required,
but authorisation to read the repository will be required.


Revision 1628 - (view) (annotate) - [select for diffs]
Modified Fri Jul 11 13:12:46 2008 UTC (10 years, 11 months ago) by phornby
Original Path: trunk/scons/windows_mscv71_options.py
File length: 2134 byte(s)
Diff to previous 1427 , to selected 1831

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 1427 - (view) (annotate) - [select for diffs]
Modified Wed Feb 27 07:54:48 2008 UTC (11 years, 3 months ago) by trankine
Original Path: trunk/scons/windows_mscv71_options.py
File length: 1874 byte(s)
Diff to previous 1388 , to selected 1831
brought from the windows port branch. Should make no difference to *nix's

Revision 1388 - (view) (annotate) - [select for diffs]
Modified Fri Jan 11 07:45:58 2008 UTC (11 years, 5 months ago) by trankine
Original Path: trunk/scons/windows_mscv71_options.py
File length: 1920 byte(s)
Diff to previous 1387 , to selected 1831
And get the *(&(*&(* name right

Revision 1387 - (view) (annotate) - [select for diffs]
Modified Fri Jan 11 07:45:26 2008 UTC (11 years, 5 months ago) by trankine
Original Path: temp/scons/windows_mscv71_options.py
File length: 1920 byte(s)
Diff to previous 1384 , to selected 1831
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, 5 months ago) by phornby
Original Path: temp_trunk_copy/scons/windows_mscv71_options.py
File length: 1920 byte(s)
Diff to previous 1312 , to selected 1831
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 (11 years, 9 months ago) by ksteube
Original Path: trunk/scons/windows_mscv71_options.py
File length: 1920 byte(s)
Diff to previous 1245 , to selected 1831
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 1245 - (view) (annotate) - [select for diffs]
Modified Mon Aug 13 14:27:20 2007 UTC (11 years, 10 months ago) by phornby
Original Path: trunk/scons/windows_mscv71_options.py
File length: 1492 byte(s)
Diff to previous 1241 , to selected 1831
Add in the netcdf libraries.

Revision 1241 - (view) (annotate) - [select for diffs]
Modified Mon Aug 13 06:41:05 2007 UTC (11 years, 10 months ago) by phornby
Original Path: trunk/scons/windows_mscv71_options.py
File length: 1495 byte(s)
Diff to previous 1232 , to selected 1831
New options for the default windows + MSC combination.

Revision 1232 - (view) (annotate) - [select for diffs]
Modified Fri Aug 10 06:44:04 2007 UTC (11 years, 10 months ago) by phornby
Original Path: trunk/scons/windows_mscv71_options.py
File length: 1167 byte(s)
Diff to previous 1160 , to selected 1831
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.

Revision 1160 - (view) (annotate) - [select for diffs]
Modified Wed May 23 00:44:01 2007 UTC (12 years, 1 month ago) by gross
Original Path: trunk/scons/windows_mscv71_options.py
File length: 1124 byte(s)
Diff to previous 1139 , to selected 1831
The OMP_NUM_THREADS environment variable is now imported into the scons evironment.

Revision 1139 - (view) (annotate) - [select for diffs]
Modified Mon May 14 05:12:53 2007 UTC (12 years, 1 month ago) by ksteube
Original Path: trunk/scons/windows_mscv71_options.py
File length: 1112 byte(s)
Diff to previous 1132 , to selected 1831
Finished renaming of boost_lib to boost_libs and boost_lib_path to boost_libs_path.


Revision 1132 - (view) (annotate) - [select for diffs]
Modified Tue May 8 05:58:46 2007 UTC (12 years, 1 month ago) by phornby
Original Path: trunk/scons/windows_mscv71_options.py
File length: 1110 byte(s)
Diff to previous 1041 , to selected 1831
c flags to suppress pragma warnings

Revision 1041 - (view) (annotate) - [select for diffs]
Modified Fri Mar 16 09:11:10 2007 UTC (12 years, 3 months ago) by phornby
Original Path: trunk/scons/windows_mscv71_options.py
File length: 1059 byte(s)
Diff to previous 1040 , to selected 1831
Change the netcdf path options to reflect the svn controlled netcdf path.



Revision 1040 - (view) (annotate) - [select for diffs]
Modified Fri Mar 16 08:43:08 2007 UTC (12 years, 3 months ago) by phornby
Original Path: trunk/scons/windows_mscv71_options.py
File length: 1071 byte(s)
Diff to previous 1036 , to selected 1831
Now links against netcdf and netcdf_cpp on windows.



Revision 1036 - (view) (annotate) - [select for diffs]
Modified Fri Mar 16 04:55:44 2007 UTC (12 years, 3 months ago) by phornby
Original Path: trunk/scons/windows_mscv71_options.py
File length: 1055 byte(s)
Diff to previous 1019 , to selected 1831
msvc7.1 options file for windows.



Revision 1019 - (view) (annotate) - [select for diffs]
Modified Mon Mar 12 10:04:54 2007 UTC (12 years, 3 months ago) by phornby
Original Path: trunk/scons/windows_mscv71_options.py
File length: 1012 byte(s)
Diff to previous 1018 , to selected 1831
More windows options changes.



Revision 1018 - (view) (annotate) - [select for diffs]
Modified Mon Mar 12 07:36:36 2007 UTC (12 years, 3 months ago) by phornby
Original Path: trunk/scons/windows_mscv71_options.py
File length: 1019 byte(s)
Copied from: trunk/scons/windows_mscv71_example.py revision 1017
Diff to previous 1017 , to selected 1831
Make Name consistent.



Revision 1017 - (view) (annotate) - [select for diffs]
Added Mon Mar 12 07:35:46 2007 UTC (12 years, 3 months ago) by phornby
Original Path: trunk/scons/windows_mscv71_example.py
File length: 1019 byte(s)
Diff to selected 1831
Windows options files.



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