[mousetrap/gnome3-wip: 10/240] Move mousetrap.in and environment.py.in to mousetrap/



commit 167a3bbebeb700992e607e16952d6dc28f4446f3
Author: Stoney Jackson <dr stoney gmail com>
Date:   Thu Apr 17 09:05:50 2014 -0400

    Move mousetrap.in and environment.py.in to mousetrap/

 src/mousetrap/Makefile.am                 |   33 +++++++++++++++++++++++++++++
 src/mousetrap/app/Makefile.am             |   33 -----------------------------
 src/mousetrap/app/addons/cpu.py           |    2 +-
 src/mousetrap/app/addons/recalc.py        |    2 +-
 src/mousetrap/app/lib/httpd.py            |    2 +-
 src/mousetrap/app/lib/mouse.py            |    2 +-
 src/mousetrap/app/lib/settings.py         |    2 +-
 src/mousetrap/app/ui/main.py              |    2 +-
 src/mousetrap/app/ui/scripts/color.py     |    2 +-
 src/mousetrap/app/ui/scripts/joystick.py  |    2 +-
 src/mousetrap/app/ui/scripts/screen.py    |    2 +-
 src/mousetrap/app/ui/settings_gui.py      |    2 +-
 src/mousetrap/{app => }/environment.py.in |    0
 src/mousetrap/main.py                     |    2 +-
 src/mousetrap/{app => }/mousetrap.in      |    0
 15 files changed, 44 insertions(+), 44 deletions(-)
---
diff --git a/src/mousetrap/Makefile.am b/src/mousetrap/Makefile.am
index 44db681..5f08882 100644
--- a/src/mousetrap/Makefile.am
+++ b/src/mousetrap/Makefile.am
@@ -1,7 +1,13 @@
+mousetrap_SCRIPTS = \
+       mousetrap
+
+mousetrapdir=$(bindir)
+
 mousetrap_pathdir=$(pyexecdir)
 
 mousetrap_python_PYTHON = \
        __init__.py \
+       environment.py \
        main.py
 
 SUBDIRS = app ocvfw
@@ -10,3 +16,30 @@ mousetrap_pythondir=$(pyexecdir)/mousetrap/
 
 install-exec-hook:
        chmod a+rx $(DESTDIR)$(mousetrap_pythondir) -R
+
+##### START DIRECTORY VARIABLE SUBSTITUTIONS ##################################
+# Substitution of autotool's directory vars (outside of Makefiles) must be done
+# by make.
+
+# Needed for mousetrap.in
+
+edit = sed \
+               -e 's|@PYTHON[ ]|$(PYTHON)|g' \
+               -e 's|@pythondir[ ]|$(pythondir)|g' \
+               -e 's|@pyexecdir[ ]|$(pyexecdir)|g' \
+               -e 's|@pkgdatadir[ ]|$(pkgdatadir)|g' \
+               -e 's|@prefix[ ]|$(prefix)|g'
+
+
+mousetrap: Makefile
+       rm -f $@ $  tmp
+       srcdir=''; \
+               test -f ./$  in || srcdir=$(srcdir)/; \
+               $(edit) $${srcdir}$  in >$  tmp
+
+       chmod +x $  tmp
+       chmod a-w $  tmp
+       mv $  tmp $@
+
+mousetrap: $(srcdir)/mousetrap.in
+##### END DIRECTORY VARIABLE SUBSTITUTIONS ####################################
diff --git a/src/mousetrap/app/Makefile.am b/src/mousetrap/app/Makefile.am
index 0ed74d8..bf8f921 100644
--- a/src/mousetrap/app/Makefile.am
+++ b/src/mousetrap/app/Makefile.am
@@ -1,13 +1,6 @@
-
-mousetrap_SCRIPTS = \
-       mousetrap
-
-mousetrapdir=$(bindir)
-
 mousetrap_pathdir=$(pyexecdir)
 
 mousetrap_python_PYTHON = \
-       environment.py \
        debug.py \
        __init__.py
 
@@ -18,29 +11,3 @@ mousetrap_pythondir=$(pyexecdir)/mousetrap/app
 
 install-exec-hook:
        chmod a+rx $(DESTDIR)$(mousetrap_pythondir) -R
-
-
-##### START DIRECTORY VARIABLE SUBSTITUTIONS ##################################
-# Substitution of autotool's directory vars (outside of Makefiles) must be done
-# by make.
-
-edit = sed \
-               -e 's|@PYTHON[ ]|$(PYTHON)|g' \
-               -e 's|@pythondir[ ]|$(pythondir)|g' \
-               -e 's|@pyexecdir[ ]|$(pyexecdir)|g' \
-               -e 's|@pkgdatadir[ ]|$(pkgdatadir)|g' \
-               -e 's|@prefix[ ]|$(prefix)|g'
-
-
-mousetrap: Makefile
-       rm -f $@ $  tmp
-       srcdir=''; \
-               test -f ./$  in || srcdir=$(srcdir)/; \
-               $(edit) $${srcdir}$  in >$  tmp
-
-       chmod +x $  tmp
-       chmod a-w $  tmp
-       mv $  tmp $@
-
-mousetrap: $(srcdir)/mousetrap.in
-##### END DIRECTORY VARIABLE SUBSTITUTIONS ####################################
diff --git a/src/mousetrap/app/addons/cpu.py b/src/mousetrap/app/addons/cpu.py
index 63dd4ff..8b8354c 100644
--- a/src/mousetrap/app/addons/cpu.py
+++ b/src/mousetrap/app/addons/cpu.py
@@ -21,7 +21,7 @@
 import os
 from gi.repository import GObject
 import mousetrap.app.debug as debug
-import mousetrap.app.environment as env
+import mousetrap.environment as env
 
 from subprocess import Popen, PIPE
 from mousetrap.app.addons.handler import AddonsBase
diff --git a/src/mousetrap/app/addons/recalc.py b/src/mousetrap/app/addons/recalc.py
index 707f4bb..640d725 100644
--- a/src/mousetrap/app/addons/recalc.py
+++ b/src/mousetrap/app/addons/recalc.py
@@ -21,7 +21,7 @@
 import os
 from gi.repository import Gtk
 import mousetrap.app.debug as debug
-import mousetrap.app.environment as env
+import mousetrap.environment as env
 
 from subprocess import Popen, PIPE
 from mousetrap.app.ui.i18n import _
diff --git a/src/mousetrap/app/lib/httpd.py b/src/mousetrap/app/lib/httpd.py
index 0e62cc2..586f4de 100644
--- a/src/mousetrap/app/lib/httpd.py
+++ b/src/mousetrap/app/lib/httpd.py
@@ -42,7 +42,7 @@ except ImportError:
     from http import server as BaseHTTPServer
 
 from .. import debug
-from .. import environment as env
+import mousetrap.environment as env
 
 class _HTTPRequestHandler(BaseHTTPServer.BaseHTTPRequestHandler):
     """
diff --git a/src/mousetrap/app/lib/mouse.py b/src/mousetrap/app/lib/mouse.py
index a8992d5..8c3769b 100644
--- a/src/mousetrap/app/lib/mouse.py
+++ b/src/mousetrap/app/lib/mouse.py
@@ -31,7 +31,7 @@ import pyatspi
 from gi.repository import Gdk
 from gi.repository import Gtk
 import mousetrap.app.debug as debug
-import mousetrap.app.environment as env
+import mousetrap.environment as env
 import Xlib.ext.xtest as xtest
 
 from Xlib import X, display
diff --git a/src/mousetrap/app/lib/settings.py b/src/mousetrap/app/lib/settings.py
index 88aa459..9c131ea 100644
--- a/src/mousetrap/app/lib/settings.py
+++ b/src/mousetrap/app/lib/settings.py
@@ -34,7 +34,7 @@ try:
 except ImportError:
     import ConfigParser as configparser
 
-import mousetrap.app.environment as env
+import mousetrap.environment as env
 
 class Settings( configparser.ConfigParser ):
 
diff --git a/src/mousetrap/app/ui/main.py b/src/mousetrap/app/ui/main.py
index 88c6600..5460440 100644
--- a/src/mousetrap/app/ui/main.py
+++ b/src/mousetrap/app/ui/main.py
@@ -30,7 +30,7 @@ from gi.repository import GdkPixbuf
 from mousetrap.app.ui import dialogs
 from mousetrap.app.ui import settings_gui
 import mousetrap.app.debug as debug
-import mousetrap.app.environment as env
+import mousetrap.environment as env
 from mousetrap.app.addons import cpu
 import numpy
 
diff --git a/src/mousetrap/app/ui/scripts/color.py b/src/mousetrap/app/ui/scripts/color.py
index ab861a9..bb06280 100644
--- a/src/mousetrap/app/ui/scripts/color.py
+++ b/src/mousetrap/app/ui/scripts/color.py
@@ -27,7 +27,7 @@ __date__      = "$Date$"
 __copyright__ = "Copyright (c) 2008 Flavio Percoco Premoli"
 __license__   = "GPLv2"
 
-import mousetrap.app.environment as env
+import mousetrap.environment as env
 import mousetrap.app.lib.mouse as mouse
 import mousetrap.app.lib.settings as settings
 
diff --git a/src/mousetrap/app/ui/scripts/joystick.py b/src/mousetrap/app/ui/scripts/joystick.py
index cec625c..0a079b8 100644
--- a/src/mousetrap/app/ui/scripts/joystick.py
+++ b/src/mousetrap/app/ui/scripts/joystick.py
@@ -27,7 +27,7 @@ __date__      = "$Date$"
 __copyright__ = "Copyright (c) 2008 Flavio Percoco Premoli"
 __license__   = "GPLv2"
 
-import mousetrap.app.environment as env
+import mousetrap.environment as env
 import mousetrap.app.lib.mouse as mouse
 
 # pylint: disable-msg=F0401
diff --git a/src/mousetrap/app/ui/scripts/screen.py b/src/mousetrap/app/ui/scripts/screen.py
index 35d29fa..68fd063 100644
--- a/src/mousetrap/app/ui/scripts/screen.py
+++ b/src/mousetrap/app/ui/scripts/screen.py
@@ -27,7 +27,7 @@ __date__      = "$Date$"
 __copyright__ = "Copyright (c) 2008 Flavio Percoco Premoli"
 __license__   = "GPLv2"
 
-import mousetrap.app.environment as env
+import mousetrap.environment as env
 import mousetrap.app.lib.mouse as mouse
 
 # pylint: disable-msg=F0401
diff --git a/src/mousetrap/app/ui/settings_gui.py b/src/mousetrap/app/ui/settings_gui.py
index 8e9d672..e164c58 100644
--- a/src/mousetrap/app/ui/settings_gui.py
+++ b/src/mousetrap/app/ui/settings_gui.py
@@ -32,7 +32,7 @@ from gi.repository import Gtk
 from mousetrap.app.ui import dialogs
 from mousetrap.app.ui.i18n import _
 from mousetrap.ocvfw import pocv
-import mousetrap.app.environment as env
+import mousetrap.environment as env
 
 from mousetrap.app.ui.scripts import get_scripts_list
 from mousetrap.app.addons.handler import AddonsHandler
diff --git a/src/mousetrap/app/environment.py.in b/src/mousetrap/environment.py.in
similarity index 100%
rename from src/mousetrap/app/environment.py.in
rename to src/mousetrap/environment.py.in
diff --git a/src/mousetrap/main.py b/src/mousetrap/main.py
index 6d48ce9..0e9658d 100644
--- a/src/mousetrap/main.py
+++ b/src/mousetrap/main.py
@@ -43,7 +43,7 @@ sys.argv[0] = "mousetrap"
 from gi.repository import GObject
 from mousetrap.app import debug
 import getopt
-from mousetrap.app import environment as env
+import mousetrap.environment as env
 
 from mousetrap.ocvfw import pocv
 
diff --git a/src/mousetrap/app/mousetrap.in b/src/mousetrap/mousetrap.in
similarity index 100%
rename from src/mousetrap/app/mousetrap.in
rename to src/mousetrap/mousetrap.in


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]