Changes between Version 27 and Version 28 of Win32Build

Timestamp:

Feb 22, 2015 9:25:18 AM (10 years ago)

Author:

butler

Comment:

fist edit to migrate from svn instructions to git instructions

Win32Build

@@ -1 +1 @@
 = Build Instructions for Windows =
 
-- !SasView works with wxPython where there is currently no 64-bit version. If you have a 64-bit computer then please download 32-bit versions of python, wxpython and all the other external packages.  
+- !SasView is currently building on 32 bit.  However with the move to Wx3.0 it should be possible to build in 64 bit.  Make sure at least to download all 32 or all 64 bit packages.  
 
 == Install Python ==
-- Install 32-bit python 2.6 from [http://www.python.org/download/releases/][[BR]]
-''in principle Python 2.5 or 2.7 should also work but 2.6 is the official version''
+- Install python 2.7 from [http://www.python.org/download/releases/][[BR]]
 
 - If you have two or more versions of python then you will have to make sure you use the correct version of python when installing packages and running python. You can check this on the command terminal by entering
@@ -20 +19 @@
 }}}
 
-== Install wxPython 2.8 ==
-- Get 32-bit wxPython 2.8 (not 2.9) from [http://www.wxpython.org/download.php#stable]
+== Install wxPython 3.0 ==
+- Get wxPython 3.0 from [http://www.wxpython.org/download.php#stable]
 
 == Install other external packages ==
 - There are several external packages that need to be installed. A complete up to date list can be found [wiki:WinBuildDependencies here]
 
-- Some packages don't come in a friendly .exe file. To install these you will have to use the command terminal. There are two examples below of how to install. (The example installs periodictable using Python 2.6).
+- Some packages don't come in a friendly .exe file. To install these you will have to use the command terminal. There are two examples below of how to install. (The example installs periodictable using Python 2.7).
 
  -- Example 1 (Using correct version of Python)
 {{{
 c:\>python --version
-Python 2.6
+Python 2.7
 
 c:\>cd C:\Users\rqh12525\Desktop\Periodic table\periodictable-1.3.0
@@ -42 +41 @@
 c:\>cd C:\Users\rqh12525\Desktop\Periodic table\periodictable-1.3.0
 
-C:\Users\rqh12525\Desktop\Periodic table\periodictable-1.3.0>c:/Python26/python.exe setup.py install
+C:\Users\rqh12525\Desktop\Periodic table\periodictable-1.3.0>c:/Python27/python.exe setup.py install
 }}}
 
 
 == Get the source code ==
-- One of the ways of getting the source code is using subversion. You can get subversion [http://subversion.tigris.org/ here] if you haven't already got it. If you want to do it a harder way then you can download the source code [https://sourceforge.net/projects/sansviewproject/files/ here].
+- To obtain the source code you need to have git running.  if you haven't already got it, it can be obtained from [https://github.com/msysgit/msysgit/releases/ github].
 
-- Using subversion copy this onto the command line. It will allow you to checkout the code and put it into the directory 'c:/sasview'
+- Using git clone type the following onto the command line will allow you to checkout the code and put it into the directory 'c:/sasview'
 {{{
-c:\>svn co https://svn.code.sf.net/p/sasview/code/trunk
+c:\>git clone https://github.com/SasView/sasview.git C:\sasview
 }}}
 
-- An easier way to use subversion is by downloading [https://sourceforge.net/projects/tortoisesvn/files/ Tortoise SVN]. This is a GUI for subversion.
+- Alternatively one can install git with a GUI.  A good one can be obtained from [https://code.google.com/p/tortoisegit/ tortoise].
 
-- Note: You may need to add proxy settings for Subversion to work. Instructions on how to do this are [https://docs.opends.org/wiki/page/ConfiguringSubversionToUseAProxyServer?version=2 here]. It can be achieved using Tortoise SVN a lot simpler by going to ''TortoiseSVN ‣ Settings ‣ Network''.
 
 == Build !SasView ==
-- Now that the files are downloaded it's time to build. Go to where you downloaded !SasView and look for the folder named 'trunk'. Inside this folder you should have a file called 'setup.py' which we shall use to build !SasView. Use the code below on the command line in order to build !SasView.
+- Now that the files are downloaded it's time to build. Go to where you downloaded !SasView and look for a file called 'run.py' which we shall use to build !SasView. Use the code below on the command line in order to build !SasView.  Note that run.py will run setup.py build as needed but will only compile all the C if there have been changes to the C code.  Setup.py docs should be run after !SasView has been built.  This will run Sphinx to run the documentation
 
 {{{
-c:\sasview\trunk>python setup.py build
+c:\sasview>python run.py
+C:\sasview>python setup.py docs
 }}}
 
-- Note: You may get an error saying "Error: Python was built with Visual Studio 2003; extensions must be built with a compiler that can generate compatible binaries". To solve this issue we recommend using Cygwin and to compile with MinGW32. The best thing about this is that you don't have to actually use Cygwin. First go to the download page of MinGW and download the latest version. [https://sourceforge.net/projects/mingw/files/] (Making sure it's 32-bit compatible). Next make sure the PATH variable is set to the folder containing the MinGW32 GCC. (Usually found in 'C:\MinGW\bin'). Next enter the following into the command terminal.
+- Note: You may get an error saying "Error: Python was built with Visual Studio 2003; extensions must be built with a compiler that can generate compatible binaries". To solve this issue we recommend using Cygwin and to compile with MinGW32. The best thing about this is that you don't have to actually use Cygwin. First go to the download page of MinGW and download the latest version. [https://sourceforge.net/projects/mingw/files/] (Making sure it's 32-bit or 64 bit compatible depending on your setup). Next make sure the PATH variable is set to the folder containing the MinGW32 GCC. (Usually found in 'C:\MinGW\bin'). Next enter the following into the command terminal.
 
 {{{
-c:\sasview\trunk>python setup.py build -mingw32
+c:\sasview>python setup.py build -mingw32
 }}}