Merge remote branch 'origin/feature/8150_osx_installer_readme_update'

mantidproject · Oct 25, 2013 · 91df30b · 91df30b
2 parents 960f558 + f64cf4b
commit 91df30b
Show file tree

Hide file tree

Showing 3 changed files with 60 additions and 12 deletions.
diff --git a/Code/Mantid/CMakeLists.txt b/Code/Mantid/CMakeLists.txt
@@ -173,7 +173,11 @@ if ( ENABLE_CPACK )
     include ( CPackCommon )
 
     # Mac Packagemaker settings
-    set ( CPACK_RESOURCE_FILE_README ${CMAKE_SOURCE_DIR}/Installers/MacInstaller/MacOSX-README.rtf )
+    if (OSX_VERSION VERSION_LESS 10.8)
+      set ( CPACK_RESOURCE_FILE_README ${CMAKE_SOURCE_DIR}/Installers/MacInstaller/MacOSX-README.rtf )
+    else()
+      set ( CPACK_RESOURCE_FILE_README ${CMAKE_SOURCE_DIR}/Installers/MacInstaller/MacOSX10-8-README.rtf )
+    endif ()
     set ( CPACK_RESOURCE_FILE_LICENSE ${CMAKE_SOURCE_DIR}/Installers/WinInstaller/License.rtf )
 
     IF ( ${CMAKE_SYSTEM_NAME} STREQUAL "Linux" )

diff --git a/Code/Mantid/Installers/MacInstaller/MacOSX-README.rtf b/Code/Mantid/Installers/MacInstaller/MacOSX-README.rtf
@@ -1,24 +1,24 @@
-{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf360
-{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
+{\rtf1\ansi\ansicpg1252\cocoartf1187\cocoasubrtf390
+\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;\f1\fmodern\fcharset0 CourierNewPSMT;}
 {\colortbl;\red255\green255\blue255;}
 {\info
-{\author Russell Taylor}}\paperw11900\paperh16840\margl1440\margr1440\vieww11900\viewh13120\viewkind1
+{\author Russell Taylor}}\paperw11900\paperh16840\margl1440\margr1440\vieww12200\viewh13420\viewkind1
 \deftab720
-\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\pardeftab720\ri0\ql\qnatural
+\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\pardeftab720\ri0
 
-\f0\b\fs24 \cf0 Install instructions for MantidPlot on OSX\
-\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\pardeftab720\ri0\ql\qnatural
+\f0\b\fs24 \cf0 Install instructions for MantidPlot on OS X\
+\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\pardeftab720\ri0
 
 \b0 \cf0  \
-\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\pardeftab720\ri0\ql\qnatural
+\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\pardeftab720\ri0
 
 \b \cf0 Requirements
 \b0 :-\
 \
-An Intel based Mac with OSX 10.6 (Snow Leopard) or above.\
+An Intel based Mac with OS X 10.6 (Snow Leopard) or above.\
 An admin password for the aforementioned computer.\
 \
-The Mac install of Mantid will install into the /Applications/MantidPlot.app directory. The sole requirement is the version of python 2.6 which ships with Snow Leopard and Lion.\
+The Mac install of Mantid will install into the /Applications/MantidPlot.app directory. The sole requirement is the version of python 2.6 which ships with Snow Leopard, Lion (10.7) & Mountain Lion (10.8).\
 \
 
 \b To start MantidPlot
@@ -28,7 +28,10 @@ The Mac install of Mantid will install into the /Applications/MantidPlot.app dir
 2. Navigate to Applications and click on the MantidPlot icon \
 \
 
-\b To start MantidScript (Mantid within Python)
+\b To import Mantid within Python
 \b0 :-\
 \
-Mantid will be available if starting Python (2.6) from a terminal, either via a "from MantidFramework import *" or by directly running scripts that do this.}
+You need to add 
+\f1 /Applications/MantidPlot.app/Contents/MacOS
+\f0  to both your PYTHONPATH & DYLD_LIBRARY_PATH environment variables.\
+Mantid will then be available if starting python2.6 from a terminal, either via an "import mantid" or by directly running scripts that do this.}
diff --git a/Code/Mantid/Installers/MacInstaller/MacOSX10-8-README.rtf b/Code/Mantid/Installers/MacInstaller/MacOSX10-8-README.rtf
@@ -0,0 +1,41 @@
+{\rtf1\ansi\ansicpg1252\cocoartf1187\cocoasubrtf390
+\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;\f1\fmodern\fcharset0 CourierNewPSMT;}
+{\colortbl;\red255\green255\blue255;}
+{\info
+{\author Russell Taylor}}\paperw11900\paperh16840\margl1440\margr1440\vieww12500\viewh13720\viewkind1
+\deftab720
+\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\pardeftab720\ri0
+
+\f0\b\fs24 \cf0 Install instructions for MantidPlot on OS X\
+\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\pardeftab720\ri0
+
+\b0 \cf0  \
+\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\pardeftab720\ri0
+
+\b \cf0 Requirements
+\b0 :-\
+\
+An Intel based Mac with OS X 10.8 (Mountain Lion) or above. \
+An admin password for the aforementioned computer.\
+\
+If you are running Snow Leopard (10.6) or Lion (10.7), please download and install the 'mantid-
+\i version
+\i0 -SnowLeopard.dmg' package instead.\
+\
+The Mac install of Mantid will install into the /Applications/MantidPlot.app directory. The sole requirement is the version of python 2.7 which ships with Mountain Lion.\
+\
+
+\b To start MantidPlot
+\b0 :-\
+\
+1. Use spotlight to locate the application MantidPlot, or\
+2. Navigate to Applications and click on the MantidPlot icon \
+\
+
+\b To import Mantid within Python
+\b0 :-\
+\
+You need to add 
+\f1 /Applications/MantidPlot.app/Contents/MacOS
+\f0  to both your PYTHONPATH & DYLD_LIBRARY_PATH environment variables.\
+Mantid will then be available if starting python (2.7) from a terminal, either via an "import mantid" or by directly running scripts that do this.}