Commit bac09e09 authored by sumpfralle's avatar sumpfralle

moved the gtk interface files to a separate "share" directory


git-svn-id: https://pycam.svn.sourceforge.net/svnroot/pycam/trunk@588 bbaffbd6-741e-11dd-a85d-61de82d9cad9
parent d4762468
...@@ -5,9 +5,10 @@ include COPYING.TXT ...@@ -5,9 +5,10 @@ include COPYING.TXT
include README.TXT include README.TXT
include Changelog include Changelog
include release_info.txt include release_info.txt
include pycamGUI include pycam
recursive-include desktop * recursive-include desktop *
recursive-include man * recursive-include man *
recursive-include src * recursive-include src *
recursive-include share *
recursive-include Samples * recursive-include Samples *
recursive-include Tests * recursive-include Tests *
...@@ -15,5 +15,5 @@ index 3046304..9f66f6d 100755 ...@@ -15,5 +15,5 @@ index 3046304..9f66f6d 100755
- "release_info.txt"]), - "release_info.txt"]),
+ "Changelog"]), + "Changelog"]),
("share/python-pycam/ui", [ ("share/python-pycam/ui", [
os.path.join("pycam", "Gui", "gtk-interface", "pycam-project.ui"), os.path.join("share", "gtk-interface", "pycam-project.ui"),
os.path.join("pycam", "Gui", "gtk-interface", "menubar.xml"), os.path.join("share", "gtk-interface", "menubar.xml"),
[bdist_wininst] [bdist_wininst]
install_script = pycam_win32_postinstall.py install_script = pycam_win32_postinstall.py
bitmap = pycam/Gui/gtk-interface/logo_gui_vertical.bmp bitmap = share/gtk-interface/logo_gui_vertical.bmp
[bdist_rpm] [bdist_rpm]
packager = Lars Kruse <devel@sumpfralle.de> packager = Lars Kruse <devel@sumpfralle.de>
......
...@@ -86,9 +86,9 @@ Basically you will need Python, GTK and OpenGL. ...@@ -86,9 +86,9 @@ Basically you will need Python, GTK and OpenGL.
"Changelog", "Changelog",
"release_info.txt"]), "release_info.txt"]),
("share/python-pycam/ui", [ ("share/python-pycam/ui", [
os.path.join("src", "pycam", "Gui", "gtk-interface", "pycam-project.ui"), os.path.join("share", "gtk-interface", "pycam-project.ui"),
os.path.join("src", "pycam", "Gui", "gtk-interface", "menubar.xml"), os.path.join("share", "gtk-interface", "menubar.xml"),
os.path.join("src", "pycam", "Gui", "gtk-interface", "logo_gui.png"), os.path.join("share", "gtk-interface", "logo_gui.png"),
]), ]),
("share/python-pycam/samples", ("share/python-pycam/samples",
glob.glob(os.path.join("Samples","STL","*.stl"))), glob.glob(os.path.join("Samples","STL","*.stl"))),
......
...@@ -49,7 +49,9 @@ import os ...@@ -49,7 +49,9 @@ import os
import sys import sys
DATA_DIR_ENVIRON_KEY = "PYCAM_DATA_DIR" DATA_DIR_ENVIRON_KEY = "PYCAM_DATA_DIR"
DATA_BASE_DIRS = [os.path.join(os.path.dirname(__file__), "gtk-interface"), os.path.join(sys.prefix, "share", "python-pycam", "ui")] DATA_BASE_DIRS = [os.path.join(os.path.dirname(__file__), os.pardir, os.pardir,
os.pardir, "share", "gtk-interface"),
os.path.join(sys.prefix, "share", "python-pycam", "ui")]
if DATA_DIR_ENVIRON_KEY in os.environ: if DATA_DIR_ENVIRON_KEY in os.environ:
DATA_BASE_DIRS.insert(0, os.environ[DATA_DIR_ENVIRON_KEY]) DATA_BASE_DIRS.insert(0, os.environ[DATA_DIR_ENVIRON_KEY])
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment