GNOME.org
 

[hamster-applet] separating launch code from lib - no more modifications to python path

commit a4a63464d68aa28731ff63f7a7a3d4e5fca83d91
Author: Toms Bauģis <toms baugis gmail com>
Date:   Fri Jan 22 22:28:56 2010 +0000

    separating launch code from lib - no more modifications to python path

 Makefile.am                                        |    2 +-
 configure.ac                                       |   11 ++++----
 po/POTFILES.in                                     |   26 ++++++++++----------
 src/Makefile.am                                    |   23 +++++++++++++++++
 {hamster => src}/hamster-applet.py                 |    7 +----
 {hamster => src/hamster}/.gitignore                |    0
 {hamster => src/hamster}/KeyBinder.py              |    0
 {hamster => src/hamster}/Makefile.am               |   20 ++-------------
 {hamster => src/hamster}/__init__.py               |    0
 {hamster => src/hamster}/about.py                  |    0
 {hamster => src/hamster}/applet.py                 |    0
 {hamster => src/hamster}/charting.py               |    0
 {hamster => src/hamster}/configuration.py          |    2 +-
 {hamster => src/hamster}/db.py                     |    0
 {hamster => src/hamster}/defs.py.in                |    0
 {hamster => src/hamster}/dispatcher.py             |    0
 {hamster => src/hamster}/edit_activity.py          |    0
 {hamster => src/hamster}/eds.py                    |    0
 {hamster => src/hamster}/graphics.py               |    0
 {hamster => src/hamster}/hamsterdbus.py            |    0
 {hamster => src/hamster}/i18n.py                   |    0
 {hamster => src/hamster}/idle.py                   |    0
 {hamster => src/hamster}/keybinder/.gitignore      |    0
 {hamster => src/hamster}/keybinder/Makefile.am     |    0
 {hamster => src/hamster}/keybinder/__init__.py     |    0
 {hamster => src/hamster}/keybinder/_keybinder.defs |    0
 .../hamster}/keybinder/_keybinder.override         |    0
 .../hamster}/keybinder/_keybindermodule.c          |    0
 .../hamster}/keybinder/eggaccelerators.c           |    0
 .../hamster}/keybinder/eggaccelerators.h           |    0
 {hamster => src/hamster}/keybinder/gen-defs.sh     |    0
 .../hamster}/keybinder/tomboykeybinder.c           |    0
 .../hamster}/keybinder/tomboykeybinder.h           |    0
 {hamster => src/hamster}/overview.py               |    0
 {hamster => src/hamster}/overview_activities.py    |    0
 {hamster => src/hamster}/overview_totals.py        |    0
 {hamster => src/hamster}/preferences.py            |    0
 {hamster => src/hamster}/pytweener.py              |    0
 {hamster => src/hamster}/reports.py                |    0
 {hamster => src/hamster}/stats.py                  |    0
 {hamster => src/hamster}/storage.py                |    0
 {hamster => src/hamster}/stuff.py                  |    0
 {hamster => src/hamster}/widgets/Makefile.am       |    0
 {hamster => src/hamster}/widgets/__init__.py       |    0
 {hamster => src/hamster}/widgets/activityentry.py  |    0
 {hamster => src/hamster}/widgets/dateinput.py      |    0
 {hamster => src/hamster}/widgets/dayline.py        |    0
 {hamster => src/hamster}/widgets/facttree.py       |    0
 .../hamster}/widgets/reportchooserdialog.py        |    0
 {hamster => src/hamster}/widgets/tags.py           |    0
 {hamster => src/hamster}/widgets/timechart.py      |    0
 {hamster => src/hamster}/widgets/timeinput.py      |    0
 52 files changed, 48 insertions(+), 43 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 67f3bab..e703d85 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = hamster data po help
+SUBDIRS = src data po help
 ACLOCAL_AMFLAGS = -I m4
 
 DISTCHECK_CONFIGURE_FLAGS = --disable-scrollkeeper
diff --git a/configure.ac b/configure.ac
index 77894a2..53cb770 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_INIT([hamster-applet],[2.29.6],[toms baugis gmail com])
-AC_CONFIG_SRCDIR(hamster/__init__.py)
+AC_CONFIG_SRCDIR(src/hamster/__init__.py)
 AC_CONFIG_HEADERS(config.h)
 AC_CONFIG_MACRO_DIR([m4])
 
@@ -163,15 +163,16 @@ dnl * --------------------------------------------------------------------------
 dnl ****************************************************************************
 AC_CONFIG_FILES([
 Makefile
-hamster/Makefile
-hamster/defs.py
-hamster/keybinder/Makefile
+src/Makefile
+src/hamster/defs.py
+src/hamster/keybinder/Makefile
 data/Makefile
 data/art/Makefile
 po/Makefile.in
 ])
 AC_OUTPUT(
-hamster/widgets/Makefile
+src/hamster/Makefile
+src/hamster/widgets/Makefile
 help/Makefile
 )
 
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 645eb41..4ec0ffb 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -8,16 +8,16 @@ data/Hamster_Applet.xml
 [type: gettext/glade]data/stats.ui
 [type: gettext/glade]data/overview.ui
 [type: gettext/glade]data/overview_totals.ui
-hamster/about.py
-hamster/applet.py
-hamster/db.py
-hamster/edit_activity.py
-hamster/preferences.py
-hamster/reports.py
-hamster/overview.py
-hamster/overview_activities.py
-hamster/overview_totals.py
-hamster/stats.py
-hamster/stuff.py
-hamster/widgets/reportchooserdialog.py
-hamster/widgets/timechart.py
+src/hamster/about.py
+src/hamster/applet.py
+src/hamster/db.py
+src/hamster/edit_activity.py
+src/hamster/preferences.py
+src/hamster/reports.py
+src/hamster/overview.py
+src/hamster/overview_activities.py
+src/hamster/overview_totals.py
+src/hamster/stats.py
+src/hamster/stuff.py
+src/hamster/widgets/reportchooserdialog.py
+src/hamster/widgets/timechart.py
diff --git a/src/Makefile.am b/src/Makefile.am
new file mode 100644
index 0000000..2bbd014
--- /dev/null
+++ b/src/Makefile.am
@@ -0,0 +1,23 @@
+SUBDIRS = hamster
+ACLOCAL_AMFLAGS = -I m4
+
+CPPFLAGS = \
+	$(PYTHON_INCLUDES)
+
+hamster-applet: hamster-applet.py
+	$(AM_V_GEN)sed -e "s|\ PYTHONDIR\@|$(pyexecdir)|" $< > $@
+
+hamsterbindir = $(libdir)/hamster-applet
+hamsterbin_SCRIPTS = hamster-applet
+
+BUILT_SOURCES = \
+	hamster-applet
+
+CLEANFILES = \
+	$(BUILT_SOURCES)
+
+DISTCLEANFILES = \
+	$(CLEANFILES)
+
+EXTRA_DIST = \
+	hamster-applet.py
diff --git a/hamster/hamster-applet.py b/src/hamster-applet.py
similarity index 92%
rename from hamster/hamster-applet.py
rename to src/hamster-applet.py
index e21269c..53fc33d 100755
--- a/hamster/hamster-applet.py
+++ b/src/hamster-applet.py
@@ -91,12 +91,7 @@ if __name__ == "__main__":
                             format = log_format)
 
     try:
-        # by AUTHORS file determine if we run from sources or installed
-        name = os.path.join(os.path.dirname(__file__), '..')
-        if os.path.exists(os.path.join(name, 'AUTHORS')):
-            logging.info("Running from source folder, modifying PYTHONPATH")
-            sys.path.insert(0, os.path.join(name, "hamster", "keybinder", ".libs"))
-            sys.path.insert(0, name)
+        sys.path.append(os.path.join(os.path.dirname(__file__), "hamster", "keybinder", ".libs"))  # TODO - deal with this
 
         # Now the path is set, import our applet
         from hamster import defs
diff --git a/hamster/.gitignore b/src/hamster/.gitignore
similarity index 100%
rename from hamster/.gitignore
rename to src/hamster/.gitignore
diff --git a/hamster/KeyBinder.py b/src/hamster/KeyBinder.py
similarity index 100%
rename from hamster/KeyBinder.py
rename to src/hamster/KeyBinder.py
diff --git a/hamster/Makefile.am b/src/hamster/Makefile.am
similarity index 63%
rename from hamster/Makefile.am
rename to src/hamster/Makefile.am
index 122957a..4127575 100644
--- a/hamster/Makefile.am
+++ b/src/hamster/Makefile.am
@@ -2,13 +2,7 @@ SUBDIRS = keybinder widgets
 ACLOCAL_AMFLAGS = -I m4
 
 CPPFLAGS = \
-	$(PYTHON_INCLUDES) 
-
-hamster-applet: hamster-applet.py
-	$(AM_V_GEN)sed -e "s|\ PYTHONDIR\@|$(pyexecdir)|" $< > $@
-
-hamsterbindir = $(libdir)/hamster-applet
-hamsterbin_SCRIPTS = hamster-applet
+	$(PYTHON_INCLUDES)
 
 hamsterdir = $(pyexecdir)/hamster
 hamster_PYTHON = \
@@ -37,16 +31,8 @@ hamster_PYTHON = \
         pytweener.py \
 	__init__.py
 
-BUILT_SOURCES = \
-	hamster-applet
-
-CLEANFILES = \
-	$(BUILT_SOURCES)
-
 DISTCLEANFILES = \
-	defs.py \
-	$(CLEANFILES)
+	defs.py
 
 EXTRA_DIST = \
-	defs.py.in \
-	hamster-applet.py
+	defs.py.in
diff --git a/hamster/__init__.py b/src/hamster/__init__.py
similarity index 100%
rename from hamster/__init__.py
rename to src/hamster/__init__.py
diff --git a/hamster/about.py b/src/hamster/about.py
similarity index 100%
rename from hamster/about.py
rename to src/hamster/about.py
diff --git a/hamster/applet.py b/src/hamster/applet.py
similarity index 100%
rename from hamster/applet.py
rename to src/hamster/applet.py
diff --git a/hamster/charting.py b/src/hamster/charting.py
similarity index 100%
rename from hamster/charting.py
rename to src/hamster/charting.py
diff --git a/hamster/configuration.py b/src/hamster/configuration.py
similarity index 99%
rename from hamster/configuration.py
rename to src/hamster/configuration.py
index 8a786ed..03cb7a4 100644
--- a/hamster/configuration.py
+++ b/src/hamster/configuration.py
@@ -62,7 +62,7 @@ class RuntimeStore(Singleton):
         if os.path.realpath(__file__).startswith(defs.PYTHONDIR):
             data_dir = os.path.join(defs.DATA_DIR, "hamster-applet")
         else:
-            data_dir = os.path.realpath(os.path.join(os.path.dirname(__file__), '..', 'data'))
+            data_dir = os.path.realpath(os.path.join(os.path.dirname(__file__), '..', '..', 'data'))
         self.data_dir = data_dir
         self.dispatcher = Dispatcher()
         self.storage = Storage(self.dispatcher)
diff --git a/hamster/db.py b/src/hamster/db.py
similarity index 100%
rename from hamster/db.py
rename to src/hamster/db.py
diff --git a/hamster/defs.py.in b/src/hamster/defs.py.in
similarity index 100%
rename from hamster/defs.py.in
rename to src/hamster/defs.py.in
diff --git a/hamster/dispatcher.py b/src/hamster/dispatcher.py
similarity index 100%
rename from hamster/dispatcher.py
rename to src/hamster/dispatcher.py
diff --git a/hamster/edit_activity.py b/src/hamster/edit_activity.py
similarity index 100%
rename from hamster/edit_activity.py
rename to src/hamster/edit_activity.py
diff --git a/hamster/eds.py b/src/hamster/eds.py
similarity index 100%
rename from hamster/eds.py
rename to src/hamster/eds.py
diff --git a/hamster/graphics.py b/src/hamster/graphics.py
similarity index 100%
rename from hamster/graphics.py
rename to src/hamster/graphics.py
diff --git a/hamster/hamsterdbus.py b/src/hamster/hamsterdbus.py
similarity index 100%
rename from hamster/hamsterdbus.py
rename to src/hamster/hamsterdbus.py
diff --git a/hamster/i18n.py b/src/hamster/i18n.py
similarity index 100%
rename from hamster/i18n.py
rename to src/hamster/i18n.py
diff --git a/hamster/idle.py b/src/hamster/idle.py
similarity index 100%
rename from hamster/idle.py
rename to src/hamster/idle.py
diff --git a/hamster/keybinder/.gitignore b/src/hamster/keybinder/.gitignore
similarity index 100%
rename from hamster/keybinder/.gitignore
rename to src/hamster/keybinder/.gitignore
diff --git a/hamster/keybinder/Makefile.am b/src/hamster/keybinder/Makefile.am
similarity index 100%
rename from hamster/keybinder/Makefile.am
rename to src/hamster/keybinder/Makefile.am
diff --git a/hamster/keybinder/__init__.py b/src/hamster/keybinder/__init__.py
similarity index 100%
rename from hamster/keybinder/__init__.py
rename to src/hamster/keybinder/__init__.py
diff --git a/hamster/keybinder/_keybinder.defs b/src/hamster/keybinder/_keybinder.defs
similarity index 100%
rename from hamster/keybinder/_keybinder.defs
rename to src/hamster/keybinder/_keybinder.defs
diff --git a/hamster/keybinder/_keybinder.override b/src/hamster/keybinder/_keybinder.override
similarity index 100%
rename from hamster/keybinder/_keybinder.override
rename to src/hamster/keybinder/_keybinder.override
diff --git a/hamster/keybinder/_keybindermodule.c b/src/hamster/keybinder/_keybindermodule.c
similarity index 100%
rename from hamster/keybinder/_keybindermodule.c
rename to src/hamster/keybinder/_keybindermodule.c
diff --git a/hamster/keybinder/eggaccelerators.c b/src/hamster/keybinder/eggaccelerators.c
similarity index 100%
rename from hamster/keybinder/eggaccelerators.c
rename to src/hamster/keybinder/eggaccelerators.c
diff --git a/hamster/keybinder/eggaccelerators.h b/src/hamster/keybinder/eggaccelerators.h
similarity index 100%
rename from hamster/keybinder/eggaccelerators.h
rename to src/hamster/keybinder/eggaccelerators.h
diff --git a/hamster/keybinder/gen-defs.sh b/src/hamster/keybinder/gen-defs.sh
similarity index 100%
rename from hamster/keybinder/gen-defs.sh
rename to src/hamster/keybinder/gen-defs.sh
diff --git a/hamster/keybinder/tomboykeybinder.c b/src/hamster/keybinder/tomboykeybinder.c
similarity index 100%
rename from hamster/keybinder/tomboykeybinder.c
rename to src/hamster/keybinder/tomboykeybinder.c
diff --git a/hamster/keybinder/tomboykeybinder.h b/src/hamster/keybinder/tomboykeybinder.h
similarity index 100%
rename from hamster/keybinder/tomboykeybinder.h
rename to src/hamster/keybinder/tomboykeybinder.h
diff --git a/hamster/overview.py b/src/hamster/overview.py
similarity index 100%
rename from hamster/overview.py
rename to src/hamster/overview.py
diff --git a/hamster/overview_activities.py b/src/hamster/overview_activities.py
similarity index 100%
rename from hamster/overview_activities.py
rename to src/hamster/overview_activities.py
diff --git a/hamster/overview_totals.py b/src/hamster/overview_totals.py
similarity index 100%
rename from hamster/overview_totals.py
rename to src/hamster/overview_totals.py
diff --git a/hamster/preferences.py b/src/hamster/preferences.py
similarity index 100%
rename from hamster/preferences.py
rename to src/hamster/preferences.py
diff --git a/hamster/pytweener.py b/src/hamster/pytweener.py
similarity index 100%
rename from hamster/pytweener.py
rename to src/hamster/pytweener.py
diff --git a/hamster/reports.py b/src/hamster/reports.py
similarity index 100%
rename from hamster/reports.py
rename to src/hamster/reports.py
diff --git a/hamster/stats.py b/src/hamster/stats.py
similarity index 100%
rename from hamster/stats.py
rename to src/hamster/stats.py
diff --git a/hamster/storage.py b/src/hamster/storage.py
similarity index 100%
rename from hamster/storage.py
rename to src/hamster/storage.py
diff --git a/hamster/stuff.py b/src/hamster/stuff.py
similarity index 100%
rename from hamster/stuff.py
rename to src/hamster/stuff.py
diff --git a/hamster/widgets/Makefile.am b/src/hamster/widgets/Makefile.am
similarity index 100%
rename from hamster/widgets/Makefile.am
rename to src/hamster/widgets/Makefile.am
diff --git a/hamster/widgets/__init__.py b/src/hamster/widgets/__init__.py
similarity index 100%
rename from hamster/widgets/__init__.py
rename to src/hamster/widgets/__init__.py
diff --git a/hamster/widgets/activityentry.py b/src/hamster/widgets/activityentry.py
similarity index 100%
rename from hamster/widgets/activityentry.py
rename to src/hamster/widgets/activityentry.py
diff --git a/hamster/widgets/dateinput.py b/src/hamster/widgets/dateinput.py
similarity index 100%
rename from hamster/widgets/dateinput.py
rename to src/hamster/widgets/dateinput.py
diff --git a/hamster/widgets/dayline.py b/src/hamster/widgets/dayline.py
similarity index 100%
rename from hamster/widgets/dayline.py
rename to src/hamster/widgets/dayline.py
diff --git a/hamster/widgets/facttree.py b/src/hamster/widgets/facttree.py
similarity index 100%
rename from hamster/widgets/facttree.py
rename to src/hamster/widgets/facttree.py
diff --git a/hamster/widgets/reportchooserdialog.py b/src/hamster/widgets/reportchooserdialog.py
similarity index 100%
rename from hamster/widgets/reportchooserdialog.py
rename to src/hamster/widgets/reportchooserdialog.py
diff --git a/hamster/widgets/tags.py b/src/hamster/widgets/tags.py
similarity index 100%
rename from hamster/widgets/tags.py
rename to src/hamster/widgets/tags.py
diff --git a/hamster/widgets/timechart.py b/src/hamster/widgets/timechart.py
similarity index 100%
rename from hamster/widgets/timechart.py
rename to src/hamster/widgets/timechart.py
diff --git a/hamster/widgets/timeinput.py b/src/hamster/widgets/timeinput.py
similarity index 100%
rename from hamster/widgets/timeinput.py
rename to src/hamster/widgets/timeinput.py
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]