Ticket #1389 (closed: fixed)

Opened 10 years ago

Last modified 5 years ago

Make necessary modifications to enable compilation on Visual Studio 2010

Reported by: Russell Taylor Owned by: Russell Taylor
Priority: major Milestone: Iteration 25
Component: Mantid Keywords:
Cc: Blocked By:
Blocking: Tester: Martyn Gigg

Description


Change History

comment:1 Changed 10 years ago by Russell Taylor

  • Status changed from new to accepted

comment:2 Changed 10 years ago by Russell Taylor

(In [5259]) Fix call to index past the end of a string that's picked up by Visual Studio 2010 in debug. Re #1389.

comment:3 Changed 10 years ago by Russell Taylor

(In [5352]) Get Windows error message printing out correctly when a library fails to load. Avoid reading past end of string in LogParser. Re #1389

comment:4 Changed 10 years ago by Russell Taylor

(In [5354]) Add Boost libraries for Visual Studio 2010. Re #1389.

comment:5 Changed 10 years ago by Russell Taylor

(In [5355]) Eliminate heinous import of entire standard library in Origin header file, which causes a clash with a type in tr1 when trying to compile using VS2010. Re #1389.

comment:6 Changed 10 years ago by Russell Taylor

(In [5421]) ChangeFramework code changes for Visual Studio 2010 happiness. For the reasons why the introduction of nullptr was necessary, see http://connect.microsoft.com/VisualStudio/feedback/details/520043/error-converting-from-null-to-a-pointer-type-in-std-pair Re #1389.

comment:7 Changed 10 years ago by Russell Taylor

(In [5422]) Forgot to add file. Re #1389.

comment:8 Changed 10 years ago by Russell Taylor

(In [5423]) Only one code change required for qtiplot in VS2010. Re #1389.

comment:9 Changed 10 years ago by Russell Taylor

(In [5424]) Upgrade Third Party Scons to version 1.3. Re #1389.

comment:10 Changed 10 years ago by Russell Taylor

(In [5425]) Add gsl 1.14 source and 2010 solution files for muparser. Re #1389.

comment:11 Changed 10 years ago by Russell Taylor

(In [5430]) Add Visual Studio 2010 solution and project files. The solution file has a temporary name to preserve the 2005 one for now (note: the library names are based on the name of the solution file). The project files have a different extension anyway. Re #1389.

comment:12 Changed 10 years ago by Russell Taylor

(In [5448]) Had to make this change to a pair constructor in the Poco 1.3.1 code to get the library to compile in MSVS2010. Re #1389.

comment:13 Changed 10 years ago by Russell Taylor

(In [5450]) Third Party changes for VS2010. Committed to the branch. Re #1389.

comment:14 Changed 10 years ago by Russell Taylor

(In [5451]) Remove gsl 1.12 source - now using 1.14 for VS2010. Re #1389.

comment:15 Changed 10 years ago by Russell Taylor

(In [5452]) Add new gsl headers. Re #1389.

comment:16 Changed 10 years ago by Russell Taylor

(In [5455]) Accidentally checked VS2010 changes into the trunk instead of the branch - reverting. Re #1389.

comment:17 Changed 10 years ago by Russell Taylor

(In [5511]) Ditch a test that Visual Studio 2010 doesn't like. Workspace iterators are in any case not much used/advised. Re #1389.

comment:18 Changed 10 years ago by Russell Taylor

(In [5512]) Remove gsl-1.12 from branch. Re #1389.

comment:19 Changed 10 years ago by Russell Taylor

(In [5514]) Minor changes to SConstruct for Visual Studio 2010. Protected by version tests so shouldn't affect 2005 compilation. Re #1389.

comment:20 Changed 10 years ago by Russell Taylor

(In [5557]) Remove VS2005 boost libraries from 2010 branch. Re #1389.

comment:21 Changed 10 years ago by Russell Taylor

(In [5560]) Fix some linking to old boost libraries + other tidying up. Re #1389.

comment:22 Changed 10 years ago by Russell Taylor

(In [5561]) Put protection around axis call. Re #1389.

comment:23 Changed 10 years ago by Martyn Gigg

(In [6114]) Visual Studio 2010 project updates. Added two property files that contain definitions that are shared across the multiple projects defined within the solution. This saves defining, in particular, preprocessor directives in every project. Also update Geometry code so that the headers can be included without having to find and include other headers first. Re #1389

comment:24 Changed 10 years ago by Martyn Gigg

(In [6115]) Remove unneeded boost unit test library from third_party branch. Re #1389

comment:25 Changed 10 years ago by Martyn Gigg

(In [6116]) Fix builds after last check in. Re #1389

comment:26 Changed 10 years ago by Martyn Gigg

(In [6119]) Missed a file on last checkin Re #1389

comment:27 Changed 10 years ago by Martyn Gigg

(In [6121]) Build fixes. Re #1389

comment:28 Changed 10 years ago by Martyn Gigg

(In [6122]) Fix a test that I broke when trying to clear a warning. Re #1389

comment:29 Changed 10 years ago by Martyn Gigg

(In [6141]) Preparing to move windows installer code to 2010 by changing the location that the VC redistributable is taken from. It was in the toget directory now it is taken from program files directly. The toget/VCRedist directories have been removed. Note that the libraries are still VS 2005 not 2010. Re #1389

comment:30 Changed 10 years ago by Martyn Gigg

(In [6142]) Let's try that one again. Re #1389

comment:31 Changed 10 years ago by Martyn Gigg

(In [6150]) More separation of VS project variables so as to minimize copying between projects. Re #1389

comment:32 Changed 10 years ago by Martyn Gigg

(In [6158]) Add a 64-bit build configuration to VS 2010 and update project files to include the new configuration. Re #1389

comment:33 Changed 10 years ago by Martyn Gigg

(In [6189]) Update svn:ignore property on Mantid directory to ignore files automatically created by Visual Studio 2010. Re #1389

comment:34 Changed 10 years ago by Martyn Gigg

(In [6190]) Minor updates to fitting with Levenberg-Marquardt minimizer so that it recognises a change in the GSL error_code returns when a fit is not converging after 10 iterations. Re #1389

comment:35 Changed 10 years ago by Martyn Gigg

(In [6191]) Remove Visual Studio 2005 assembly merge module references from 64-bit installer build. Re #1389

comment:36 Changed 10 years ago by Martyn Gigg

(In [6192]) Updates to win64 section of Third Party libraries. Re #1389

comment:37 Changed 10 years ago by Martyn Gigg

(In [6193]) Updates to build files for 64-bit VS 2010 build. Re #1389

comment:38 Changed 10 years ago by Martyn Gigg

(In [6202]) What should hopefully be the last changes for 64-bit VS 2010 compilation. Re #1389

comment:39 Changed 10 years ago by Martyn Gigg

(In [6206]) Fix for library paths in test run. Re #1389

comment:40 Changed 10 years ago by Martyn Gigg

(In [6217]) Fix script for mac buildserver. Re #1389.

comment:41 Changed 10 years ago by Martyn Gigg

(In [6226]) Missed committing a 32-bit debug library for cblas. Re #1389

comment:42 Changed 10 years ago by Martyn Gigg

(In [6231]) Needed to update qwtplot3d library to VS 2010 to avoid 3D plot crashes. Done qwt as well just for good measure and included debug libraries. 64-bit to do. Re #1389

comment:43 Changed 10 years ago by Martyn Gigg

(In [6253]) While MS compiler versions differ, ensure the correct libraries are linked to. Re #1389

comment:44 Changed 10 years ago by Martyn Gigg

(In [6359]) Kill a warning about a nonsensical operator. Re #1389

comment:45 Changed 10 years ago by Martyn Gigg

(In [6379]) Merge Visual Studio 2010 libraries from branch back to the trunk. Re #1389

comment:46 Changed 10 years ago by Martyn Gigg

(In [6381]) Removed the MantidVS10.sln solution file and updated qt RunBuild to use VS 2010. Re #1389

comment:47 Changed 10 years ago by Martyn Gigg

(In [6382]) Update to qtiplot config file. Accidentally linked gsl debug libraries in release. Re #1389

comment:48 Changed 10 years ago by Russell Taylor

(In [6510]) Move FunctionFactoryTest from API to CurveFitting because it implicitly depends on BoundaryConstraint. Re #1389.

comment:49 Changed 10 years ago by Russell Taylor

(In [6528]) Add 64 bit python debug library. Re #1389.

comment:50 Changed 10 years ago by Russell Taylor

(In [6583]) Add 64 bit python debug executable. Re #1389.

comment:51 Changed 10 years ago by Martyn Gigg

(In [6592]) Update third_party win32 Python25 dlls to VS2010 and added debug executable. Re #1389

comment:52 Changed 10 years ago by Russell Taylor

  • Status changed from accepted to verify
  • Resolution set to fixed
  • Component set to Mantid

comment:53 Changed 10 years ago by Martyn Gigg

  • Status changed from verify to verifying
  • Tester set to Martyn Gigg

comment:54 Changed 10 years ago by Martyn Gigg

  • Status changed from verifying to closed

All of the ISIS developers are using 2010 now and everything appears to be working correctly.

As a separate issue I have raised a ticket for the next iteration, 1832, regarding the x64 compilers with /O2 optimizations bug.

comment:55 Changed 5 years ago by Stuart Campbell

This ticket has been transferred to github issue 2236

Note: See TracTickets for help on using tickets.