Changeset 9afc543 in sasview


Ignore:
Timestamp:
Feb 18, 2015 6:12:03 AM (9 years ago)
Author:
Peter Parker
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, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload
Children:
573e7034
Parents:
25ab07c
Message:

Allow the docs to reachable from inside the installer.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/sas/guiframe/documentation_window.py

    ra4340d1 r9afc543  
    99else: 
    1010    import wx.html as html 
     11from gui_manager import get_app_dir 
    1112 
    12     
     13PATH_APP = get_app_dir()  
     14 
    1315class DocumentationWindow(Frame): 
    1416    def __init__(self, parent, id, path, title='Help', size=(850, 540)): 
     
    1921            docs_path = os.path.join(os.environ[SPHINX_DOC_ENV]) 
    2022        else: 
    21             docs_path = os.path.join(PATH_APP, "..", "..", "doc") 
     23            # For the installer, docs are in a top-level directory.  We're not 
     24            # bothering to worry about docs when running using the old 
     25            # (non - run.py) way. 
     26            docs_path = os.path.join(PATH_APP, "doc") 
    2227 
    23         if (not os.path.exists(docs_path)): 
    24             print "logging" 
     28        if not os.path.exists(docs_path): 
    2529            logging.error("Could not find Sphinx documentation at %s \ 
    2630            -- has it been built?", docs_path) 
Note: See TracChangeset for help on using the changeset viewer.