Merge remote-tracking branch 'origin/bugfix/9629_fix_offline_docs_in_app_bundle'

Code/Mantid/Build/Jenkins/buildscript

@@ -34,12 +34,15 @@ if [[ ${JOB_NAME} == *clean* ]]; then
 
   # Set some variables relating to the linux packages created from clean builds
   if [[ $(uname) != 'Darwin' ]]; then
+    # Use different suffix for linux builds
     if [[ ${JOB_NAME} == *master* ]]; then
-      SUFFIX=nightly
+      PACKAGINGVARS="-DENVVARS_ON_INSTALL=False -DCMAKE_INSTALL_PREFIX=/opt/mantidnightly -DCPACK_PACKAGE_SUFFIX=nightly -DCPACK_SET_DESTDIR=OFF -DPACKAGE_DOCS=ON"
     elif [[ ${JOB_NAME} == *develop* ]]; then
-      SUFFIX=unstable
+      PACKAGINGVARS="-DENVVARS_ON_INSTALL=False -DCMAKE_INSTALL_PREFIX=/opt/mantidunstable -DCPACK_PACKAGE_SUFFIX=unstable -DCPACK_SET_DESTDIR=OFF -DPACKAGE_DOCS=ON"
     fi
-    PACKAGINGVARS="-DENVVARS_ON_INSTALL=False -DCMAKE_INSTALL_PREFIX=/opt/mantid${SUFFIX} -DCPACK_PACKAGE_SUFFIX=${SUFFIX} -DCPACK_SET_DESTDIR=OFF -DPACKAGE_DOCS=True"
+  else
+    # Mac packaging
+    PACKAGINGVARS="-DPACKAGE_DOCS=ON"
   fi
 fi
 

Code/Mantid/docs/CMakeLists.txt

@@ -109,16 +109,16 @@ if ( SPHINX_FOUND )
      # must "make qtassistant" before "make package" otherwise there will be a build failure
      install (FILES ${SPHINX_BUILD_DIR}/qthelp/MantidProject.qhc
                     ${SPHINX_BUILD_DIR}/qthelp/MantidProject.qch
-              DESTINATION ${HTML_DOCS_DEST} )
+              DESTINATION ${INBUNDLE}${HTML_DOCS_DEST} )
      install ( DIRECTORY  ${SPHINX_BUILD_DIR}/qthelp/
-              DESTINATION ${HTML_DOCS_DEST}
+              DESTINATION ${INBUNDLE}${HTML_DOCS_DEST}
               FILES_MATCHING PATTERN "*.html" )
      install ( DIRECTORY  ${SPHINX_BUILD_DIR}/qthelp/_images/
                           ${SPHINX_BUILD_DIR}/qthelp/_static/
-              DESTINATION ${HTML_DOCS_DEST} )
+              DESTINATION ${INBUNDLE}${HTML_DOCS_DEST} )
     else( QT_QCOLLECTIONGENERATOR_EXECUTABLE)
-      install ( DIRECTORY ${SPHINX_BUILD_DIR}/html
-               DESTINATION ${HTML_DOCS_DEST} )
+      install ( DIRECTORY ${SPHINX_BUILD_DIR}/html/
+               DESTINATION ${INBUNDLE}${HTML_DOCS_DEST} )
     endif ( QT_QCOLLECTIONGENERATOR_EXECUTABLE )
   endif ( PACKAGE_DOCS )
 else ( SPHINX_FOUND )