[nanny/win32: 36/75] Add py2exe paths to client/gnome/*/__init__.py.in



commit 81b2a89d9f9adfc9c5496b9d340427984acacb07
Author: Roberto Majadas <roberto majadas openshine com>
Date:   Sat Sep 25 18:56:18 2010 +0200

    Add py2exe paths to client/gnome/*/__init__.py.in

 client/gnome/__init__.py.in             |   20 +++++++++++++-------
 client/gnome/admin/src/__init__.py.in   |   17 +++++++++++------
 client/gnome/systray/src/__init__.py.in |   20 +++++++++++++-------
 3 files changed, 37 insertions(+), 20 deletions(-)
---
diff --git a/client/gnome/__init__.py.in b/client/gnome/__init__.py.in
index b11d6db..ba9fff4 100644
--- a/client/gnome/__init__.py.in
+++ b/client/gnome/__init__.py.in
@@ -24,6 +24,7 @@
 # USA
 
 import os
+import sys
 import gettext
 import __builtin__
 
@@ -33,13 +34,18 @@ GETTEXT_DOMAIN = 'nanny'
 if os.name == "posix":
     locale_dir = os.path.join("@prefix@", "share/" ,"locale/")
 elif os.name == "nt":
-    file_dir = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
-    for x in range(7):
-        file_dir = os.path.dirname(file_dir)
-    
-    root_path = file_dir
-    locale_dir = os.path.join(root_path, "share" ,"locale")
-    print "LOCALE PATH = %s" % locale_dir
+    if not hasattr(sys, "frozen") :
+        file_dir = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+        for x in range(7):
+            file_dir = os.path.dirname(file_dir)
+
+        root_path = file_dir
+        locale_dir = os.path.join(root_path, "share" ,"locale")
+        print "LOCALE PATH = %s" % locale_dir
+    else:
+        root_path = os.path.dirname(os.path.dirname(unicode(sys.executable, sys.getfilesystemencoding( ))))
+        locale_dir = os.path.join(root_path, "share" ,"locale")
+        print "LOCALE PATH = %s" % locale_dir
 
 gettext.bindtextdomain(GETTEXT_DOMAIN, locale_dir)
 gettext.textdomain(GETTEXT_DOMAIN)
diff --git a/client/gnome/admin/src/__init__.py.in b/client/gnome/admin/src/__init__.py.in
index a8937ec..d5e9aad 100644
--- a/client/gnome/admin/src/__init__.py.in
+++ b/client/gnome/admin/src/__init__.py.in
@@ -25,17 +25,22 @@
 
 
 import os
+import sys
 import gtk
 
 if os.name == "posix" :
     share_files_dir= os.path.join("@prefix@","share/","nanny/client/gnome/admin/")
 elif os.name == "nt":
-    file_dir = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
-    for x in range(8):
-        file_dir = os.path.dirname(file_dir)
-    
-    root_path = file_dir
-    share_files_dir = os.path.join(root_path, "share" , "nanny", "client", "gnome", "admin")
+    if not hasattr(sys, "frozen") :
+        file_dir = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+        for x in range(8):
+            file_dir = os.path.dirname(file_dir)
+
+        root_path = file_dir
+        share_files_dir = os.path.join(root_path, "share" , "nanny", "client", "gnome", "admin")
+    else:
+        root_path = os.path.dirname(os.path.dirname(unicode(sys.executable, sys.getfilesystemencoding( ))))
+        share_files_dir = os.path.join(root_path, "share" , "nanny", "client", "gnome", "admin")
 
 ui_files_dir= os.path.join(share_files_dir,"ui")
 icons_files_dir= os.path.join(share_files_dir,"icons")
diff --git a/client/gnome/systray/src/__init__.py.in b/client/gnome/systray/src/__init__.py.in
index 0f4cbfc..ec515a5 100644
--- a/client/gnome/systray/src/__init__.py.in
+++ b/client/gnome/systray/src/__init__.py.in
@@ -24,6 +24,7 @@
 # USA
 
 import os
+import sys
 import gettext
 
 from SystrayNanny import SystrayNanny
@@ -32,13 +33,18 @@ if os.name == "posix":
     icons_files_dir= os.path.join("@prefix@","share/icons/hicolor")
     locale_dir = os.path.join("@prefix@", "share/" ,"locale/")
 elif os.name == "nt":
-    file_dir = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
-    for x in range(8):
-        file_dir = os.path.dirname(file_dir)
-    
-    root_path = file_dir
-    icons_files_dir = os.path.join(root_path, "share" , "icons", "hicolor" )
-    locale_dir = os.path.join(root_path, "share" ,"locale")
+    if not hasattr(sys, "frozen") :
+        file_dir = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+        for x in range(8):
+            file_dir = os.path.dirname(file_dir)
+
+        root_path = file_dir
+        icons_files_dir = os.path.join(root_path, "share" , "icons", "hicolor" )
+        locale_dir = os.path.join(root_path, "share" ,"locale")
+    else:
+        root_path = os.path.dirname(os.path.dirname(unicode(sys.executable, sys.getfilesystemencoding( ))))
+        icons_files_dir = os.path.join(root_path, "share" , "icons", "hicolor" )
+        locale_dir = os.path.join(root_path, "share" ,"locale")
 
 GETTEXT_DOMAIN = 'nanny'
 



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