Move help into the package tree

gtimelog · Dec 16, 2017 · c604b3d · c604b3d
1 parent 03484e3
commit c604b3d
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 5 deletions.
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -16,5 +16,5 @@ include benchmark.py
 recursive-include src *.png *.ui *.xml *.css *.rst gschemas.compiled
 recursive-include docs *.png *.rst
 recursive-include scripts *.py *.rst
-recursive-include help *.page *.xml *.png
+recursive-include src/gtimelog/help *.page *.xml *.png
 recursive-include src/gtimelog/po *.po *.pot *.in
diff --git a/help/C/figures/gtimelog.png → src/gtimelog/help/C/figures/gtimelog.png b/help/C/figures/gtimelog.png → src/gtimelog/help/C/figures/gtimelog.png
diff --git a/help/C/index.page → src/gtimelog/help/C/index.page b/help/C/index.page → src/gtimelog/help/C/index.page
diff --git a/help/C/legal.xml → src/gtimelog/help/C/legal.xml b/help/C/legal.xml → src/gtimelog/help/C/legal.xml
diff --git a/help/C/shortcuts.page → src/gtimelog/help/C/shortcuts.page b/help/C/shortcuts.page → src/gtimelog/help/C/shortcuts.page
diff --git a/src/gtimelog/main.py b/src/gtimelog/main.py
@@ -49,7 +49,7 @@ def mark_time(what=None, _prev=[0, 0]):
 
 HERE = os.path.dirname(__file__)
 
-SCHEMA_DIR = os.path.join(os.path.dirname(__file__), 'data')
+SCHEMA_DIR = os.path.join(HERE, 'data')
 if SCHEMA_DIR and not os.environ.get('GSETTINGS_SCHEMA_DIR'):
     # Have to do this before importing 'gi'.
     os.environ['GSETTINGS_SCHEMA_DIR'] = SCHEMA_DIR
@@ -93,11 +93,9 @@ def to_bytes(s):
 
 mark_time("gtimelog imports done")
 
-ROOT = os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
-
 # When the app is properly installed, use HELP_URI = 'help:gtimelog'
 HELP_URI = ''
-HELP_DIR = os.path.abspath(os.path.join(ROOT, 'help'))
+HELP_DIR = os.path.abspath(os.path.join(HERE, 'help'))
 
 UI_DIR = HERE