[Uludag-commits] r16248 - in branches/yali4: . yali4

[uludag-commits at pardus.org.tr]

Author: gokmen.goksel
Date: Wed Dec  5 14:56:26 2007
New Revision: 16248

Modified:
   branches/yali4/setup.py
   branches/yali4/yali4/__init__.py
Log:
yali4 yihoha

Modified: branches/yali4/setup.py
=================================================================
--- branches/yali4/setup.py	(original)
+++ branches/yali4/setup.py	Wed Dec  5 14:56:26 2007
@@ -22,28 +22,28 @@
 from distutils.command.install import install
 from distutils.spawn import find_executable, spawn
 
-import yali
+import yali4
 
-YALI_VERSION = yali.__version__
+YALI_VERSION = yali4.__version__
 
 def qt_ui_files():
-    p = "yali/gui/Ui/*.ui"
+    p = "yali4/gui/Ui/*.ui"
     return glob.glob(p)
 
 def gui_pics():
-    p = "yali/gui/pics"
+    p = "yali4/gui/pics"
     return glob.glob(p + "/*.png")
 
 def gui_slidepics():
-    p = "yali/gui/pics/slideshow/*.png"
+    p = "yali4/gui/pics/slideshow/*.png"
     return glob.glob(p)
 
 def user_faces():
-    p = "yali/user_faces/*.png"
+    p = "yali4/user_faces/*.png"
     return glob.glob(p)
 
 def data_files():
-    p = "yali/data/*.xml"
+    p = "yali4/data/*.xml"
     return glob.glob(p)
 
 def getRevision():
@@ -76,7 +76,7 @@
         py_file = py_file_name(ui_file)
         # lines in reverse order
         lines =  ["_ = __trans.ugettext",
-                 "__trans = gettext.translation('yali', fallback=True)\n",
+                 "__trans = gettext.translation('yali4', fallback=True)\n",
                  "import gettext\n"]
         f = open(py_file, "r").readlines()
         for l in lines:
@@ -88,10 +88,10 @@
 
     def compile_ui(self, ui_file):
         pyqt_configuration = pyqtconfig.Configuration()
-        pyuic_exe = find_executable('pyuic', pyqt_configuration.default_bin_dir)
+        pyuic_exe = find_executable('pyuic4', pyqt_configuration.default_bin_dir)
         if not pyuic_exe:
             # Search on the $Path.
-            pyuic_exe = find_executable('pyuic')
+            pyuic_exe = find_executable('pyuic4')
 
         cmd = [pyuic_exe, ui_file, '-o']
         cmd.append(py_file_name(ui_file))
@@ -129,12 +129,12 @@
         pass
 
     def run(self):
-        yali_dir = os.path.join(get_python_lib(), "yali")
+        yali_dir = os.path.join(get_python_lib(), "yali4")
         if os.path.exists(yali_dir):
             print "removing: ", yali_dir
             shutil.rmtree(yali_dir)
 
-        data_dir = "/usr/share/yali"
+        data_dir = "/usr/share/yali4"
         if os.path.exists(data_dir):
             print "removing: ", data_dir
             shutil.rmtree(data_dir)
@@ -164,7 +164,7 @@
                 pass
             shutil.copy("po/%s.mo" % lang, os.path.join(destpath, "%s.mo" % i18n_domain))
 
-setup(name="yali",
+setup(name="yali4",
       version= getVersion(),
       description="YALI (Yet Another Linux Installer)",
       long_description="Pardus System Installer.",
@@ -172,15 +172,15 @@
       author="Pardus Developers",
       author_email="yali at pardus.org.tr",
       url="http://www.pardus.org.tr/eng/yali/",
-      packages = ['yali', 'yali.gui', 'yali.gui.Ui'],
+      packages = ['yali4', 'yali4.gui', 'yali4.gui.Ui'],
       package_dir = {'': ''},
-      data_files = [('/usr/share/yali/pics', gui_pics()),
-                    ('/usr/share/yali/slideshow', gui_slidepics()),
-                    ('/usr/share/yali/user_faces', user_faces()),
-                    ('/usr/share/yali/data', data_files())],
-      scripts = ['yali-bin'],
-      ext_modules = [Extension('yali._sysutils',
-                               sources = ['yali/_sysutils.c'],
+      data_files = [('/usr/share/yali4/pics', gui_pics()),
+                    ('/usr/share/yali4/slideshow', gui_slidepics()),
+                    ('/usr/share/yali4/user_faces', user_faces()),
+                    ('/usr/share/yali4/data', data_files())],
+      scripts = ['yali4-bin'],
+      ext_modules = [Extension('yali4._sysutils',
+                               sources = ['yali4/_sysutils.c'],
                                libraries = ["ext2fs"],
                                extra_compile_args = ['-Wall'])],
       cmdclass = {

Modified: branches/yali4/yali4/__init__.py
=================================================================
--- branches/yali4/yali4/__init__.py	(original)
+++ branches/yali4/yali4/__init__.py	Wed Dec  5 14:56:26 2007
@@ -10,7 +10,7 @@
 # Please read the COPYING file.
 #
 
-__version__ = "1.1.7"
+__version__ = "2.0"
 
 import sys
 import exceptions
@@ -18,18 +18,18 @@
 import cStringIO
 
 import gettext
-__trans = gettext.translation('yali', fallback=True)
+__trans = gettext.translation('yali4', fallback=True)
 _ = __trans.ugettext
 
 import pisi
-from yali.exception import *
+from yali4.exception import *
 
 def default_runner():
-    import yali.gui.runner
+    import yali4.gui.runner
 
     sys.excepthook = exception_handler
 
-    return yali.gui.runner.Runner()
+    return yali4.gui.runner.Runner()
 
 exception_normal, exception_fatal, \
     exception_pisi, exception_informational, \
@@ -68,5 +68,5 @@
 
     sio.seek(0)
 
-    import yali.gui.runner
-    yali.gui.runner.showException(exception_type, unicode(sio.read()))
+    import yali4.gui.runner
+    yali4.gui.runner.showException(exception_type, unicode(sio.read()))