Changeset 237

Timestamp:

07/13/07 05:51:30 (5 years ago)

Author:

marc

Message:

Reworked main core loader, fixes for Debian makefile and Locales.

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• Makefile (modified) (3 diffs)
• itaka.py (modified) (3 diffs)

trunk/ChangeLog

@@ -1 +1 @@
 1.0:
  * Added RPM packages
- * Added interface translations.
+ * Added interface translations #4
+ * Simplified and improved Makefile
  * Switch to GPLv3.
 

trunk/Makefile

@@ -8 +8 @@
 
 PREFIX = /usr
+# When debian builds it, it passes its own DESTDIR
 DESTDIR = $(PREFIX)
 
@@ -19 +20 @@
 MANDIR = $(DESTDIR)/share/man/man1
 
+# For debian compatibility, these are hardcoded
+REPLACEIMAGESDIR = $(PREFIX)/share/itaka/images/
+REPLACELOCALEDIR = $(PREFIX)/locale/
+
 PYFILES := $(shell $(FIND) . -name "*.py" -print)
 
 install: 
         mv config.py config.py.old
-        sed -e "s|/usr/share/itaka/images/|$(IMAGESDIR)|g" config.py.old > config.py
+        mv itaka.py itaka.py.old
+        sed -e "s|/usr/share/itaka/images/|$(REPLACEIMAGESDIR)|g" config.py.old > config.py
+        sed -e "s|/usr/share/locale/|$(REPLACELOCALEDIR)|g" itaka.py.old > itaka.py
         $(INSTALL) -m 755 -d $(BINDIR) $(DATADIR) $(LIBDIR) $(IMAGESDIR) $(APPLICATIONSDIR) $(ICONDIR) $(MANDIR)
         $(INSTALL) -m 755 *.py $(LIBDIR)
@@ -36 +43 @@
         chmod +x $(BINDIR)/itaka
         mv config.py.old config.py
+        mv itaka.py.old itaka.py
         
         for lang in locale/*; do 

trunk/itaka.py

@@ -23 +23 @@
 """ Itaka core """
 
-import sys, traceback, gettext, locale, __builtin__
+import sys, os, traceback, gettext, locale, __builtin__
 locale.setlocale(locale.LC_ALL, '')
-gettext.bindtextdomain('itaka', 'i18n/')
-gettext.textdomain('itaka')
+__builtin__._ = gettext.gettext
 
-__builtin__._ = gettext.gettext
+# Itaka core modules
+try:
+    import console
+    import config as itakaglobals
+    import uigtk as igui
+except ImportError:
+    print '[*] ERROR: Failed to import Itaka modules'
+    traceback.print_exc()
+    sys.exit(1)
+
+
+#: Locales directory
+locale_dir = os.path.join(os.path.dirname(os.path.abspath(sys.argv[0])), 'locale/')
+
+#: To be changed on install to specify where the installed files actually are
+locale_prefix = "/usr/share/locale/"
+
+if os.path.exists(locale_prefix):
+    locale_dir = locale_prefix
+
+# See if our locales are there before starting
+if not os.path.exists(locale_dir):
+    print_warning(_('Could not find locale directory %s, not using locales.' % (locale_dir)))
+else: 
+    gettext.bindtextdomain('itaka', locale_dir)
+    gettext.textdomain('itaka')
 
 validarguments = ('-help', '-debug')
@@ -40 +64 @@
     arguments = None
 
-# Itaka core modules
 try:
     # Initiate our Console and Configuration engines
-    import console
-    import config as itakaglobals
     configinstance = itakaglobals.ConfigParser(arguments)
     configinstance.load()
@@ -55 +76 @@
         traceback.print_exc()
         sys.exit(1)
-
-    import uigtk as igui
-except ImportError:
-    print_error(_('Failed to import Itaka modules'))
+except:
+    print_error(_('Could not initiate Configuration engine'))
     traceback.print_exc()
     sys.exit(1)