refs #9502 Merge branch 'master' into bugfix/9502_ConvToMDIssues

(fixing wiki changes) Conflicts: Code/Mantid/Framework/MDAlgorithms/src/ConvertToMD.cpp
mantidproject · Jun 4, 2014 · 92539ab · 92539ab
2 parents b404c36 + e2afd78
commit 92539ab
Show file tree

Hide file tree

Showing 1,358 changed files with 24,830 additions and 13,184 deletions.
diff --git a/.githooks/pre-commit b/.githooks/pre-commit
diff --git a/Code/Mantid/Build/Jenkins/buildscript b/Code/Mantid/Build/Jenkins/buildscript
@@ -35,7 +35,7 @@ if [[ ${JOB_NAME} == *clean* ]]; then
   # Set some variables relating to the linux packages created from clean builds
   if [[ $(uname) != 'Darwin' ]]; then
     if [[ ${JOB_NAME} == *master* ]]; then
-      PACKAGINGVARS="-DENVVARS_ON_INSTALL=False -DCMAKE_INSTALL_PREFIX=/opt/mantidnightly -DCPACK_PACKAGE_SUFFIX=nightly -DCPACK_SET_DESTDIR=OFF -DQT_ASSISTANT_FETCH_IMAGES=ON"
+      PACKAGINGVARS="-DENVVARS_ON_INSTALL=False -DCMAKE_INSTALL_PREFIX=/opt/mantidnightly -DCPACK_PACKAGE_SUFFIX=nightly -DCPACK_SET_DESTDIR=OFF"
     elif [[ ${JOB_NAME} == *develop* ]]; then
       PACKAGINGVARS="-DENVVARS_ON_INSTALL=False -DCMAKE_INSTALL_PREFIX=/opt/mantidunstable -DCPACK_PACKAGE_SUFFIX=unstable -DCPACK_SET_DESTDIR=OFF"
     fi
@@ -84,7 +84,6 @@ $SCL_ON_RHEL6 "ctest --output-on-failure -R MantidPlot"
 rm -f *.dmg *.rpm *.deb *.tar.gz
 # Always build a package on linux
 if [[ $(uname) != 'Darwin' ]]; then
-  $SCL_ON_RHEL6 "make -j$BUILD_THREADS qtassistant"
   $SCL_ON_RHEL6 "cpack"
 fi
 

diff --git a/Code/Mantid/Build/Jenkins/buildscript.bat b/Code/Mantid/Build/Jenkins/buildscript.bat
@@ -25,9 +25,6 @@ if "%JOB_NAME%"=="%JOB_NAME:clean=%" (
 ) else  (
     set CLEANBUILD=yes
     rmdir /S /Q build
-    if NOT "%JOB_NAME%"=="%JOB_NAME:master=%" (
-        set DOC_IMAGES=-DQT_ASSISTANT_FETCH_IMAGES=ON
-    )
 )
 
 :::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
@@ -39,7 +36,7 @@ cd %WORKSPACE%\build
 :::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
 :: CMake configuration
 :::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-"C:\Program Files (x86)\CMake 2.8\bin\cmake.exe" -G "Visual Studio 11 Win64" -DCONSOLE=OFF -DENABLE_CPACK=ON -DMAKE_VATES=ON -DParaView_DIR=%PARAVIEW_DIR% -DUSE_PRECOMPILED_HEADERS=ON %DOC_IMAGES% ..\Code\Mantid
+"C:\Program Files (x86)\CMake 2.8\bin\cmake.exe" -G "Visual Studio 11 Win64" -DCONSOLE=OFF -DENABLE_CPACK=ON -DMAKE_VATES=ON -DParaView_DIR=%PARAVIEW_DIR% -DUSE_PRECOMPILED_HEADERS=ON ..\Code\Mantid
 if ERRORLEVEL 1 exit /B %ERRORLEVEL%
 
 :::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
@@ -61,7 +58,6 @@ if ERRORLEVEL 1 exit /B %ERRORLEVEL%
 :: Create the install kit if this is a clean build
 :::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
 if "%CLEANBUILD%" EQU "yes" (
-    msbuild /nologo /m:%BUILD_THREADS% /nr:false /p:Configuration=Release docs/qtassistant/qtassistant.vcxproj
     if ERRORLEVEL 1 exit /B %ERRORLEVEL%
     cpack -C Release --config CPackConfig.cmake
 )