Changeset 1573220 in sasview

Timestamp:

Sep 11, 2017 8:28:58 AM (7 years ago)

Author:

wojciech

Branches:

master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

0cb184e

Parents:

96f00a0

Message:

added check if latex exists from build_sphinx

Files:

• build_tools/jenkins_linux_build.sh (modified) (1 diff)
• docs/sphinx-docs/build_sphinx.py (modified) (3 diffs)

build_tools/jenkins_linux_build.sh

@@ -64 +64 @@
 
 # CREATE PDF FROM LATEX
-cd $WORKSPACE
-cd sasview/docs/sphinx-docs/build/latex
-pdflatex SasView.tex
+#cd $WORKSPACE
+#cd sasview/docs/sphinx-docs/build/latex
+#pdflatex SasView.tex
 
 # INSTALL SASVIEW

docs/sphinx-docs/build_sphinx.py

@@ -18 +18 @@
 from distutils.dir_util import copy_tree
 from distutils.util import get_platform
+from distutils.spawn import find_executable
+
 from shutil import copy
 from os import listdir
@@ -371 +373 @@
 
     LATEXDIR = os.path.join(SPHINX_BUILD, "latex")
+    #TODO: Does it need to be done so many time?
     def pdflatex():
         subprocess.call(["pdflatex", "Sasview.tex"], cwd=LATEXDIR)
@@ -436 +439 @@
     apidoc()
     build()
-    #build_pdf()
+    if find_executable('latex'):
+        build_pdf()
     #convert_katex()
     #convert_mathjax()