[prev in list] [next in list] [prev in thread] [next in thread]
List: klik-devel
Subject: [klik-devel] [klikclient commit] r1441 - in
From: codesite-noreply () google ! com
Date: 2008-03-24 23:29:18
Message-ID: 0016e644dee00449373474ae88e69082 () google ! com
[Download RAW message or body]
Author: KillerKiwi2005
Date: Mon Mar 24 16:29:02 2008
New Revision: 1441
Modified:
trunk/client/trunk/klikclient/lib/klik/execute.py
trunk/client/trunk/klikclient/lib/klik/fuse.py
trunk/client/trunk/klikclient/lib/klik/settings.py
trunk/client/trunk/klikclient/lib/klik/utils/xdg.py
Log:
complete new glibc loader... needs testing
Modified: trunk/client/trunk/klikclient/lib/klik/execute.py
==============================================================================
--- trunk/client/trunk/klikclient/lib/klik/execute.py (original)
+++ trunk/client/trunk/klikclient/lib/klik/execute.py Mon Mar 24
16:29:02 2008
@@ -100,7 +100,10 @@
# Update path to work across distros
os.environ["PATH"]
= "/usr/lib/sbin:/bin:/usr/sbin:/usr/bin:/usr/X11R6/bin:/usr/local/sbin:/usr/local/bin:/usr/games:" \
+ os.environ["PATH"]
- os.environ["LD_LIBRARY_PATH"]
= "/usr/lib:%s/lib:%s/lib:%s/usr/lib/:%s/opt/kde3/lib:%s/usr/X11R6/lib/" %
(cmg.mount_point_path, cmg.mount_point_path, cmg.mount_point_path,
cmg.mount_point_path, cmg.mount_point_path)
+ if not self.klik.settings.glibc_loader:
+ os.environ["LD_LIBRARY_PATH"]
= "/usr/lib:%s/lib:%s/lib:%s/usr/lib/:%s/opt/kde3/lib:%s/usr/X11R6/lib/" %
(cmg.mount_point_path, cmg.mount_point_path, cmg.mount_point_path,
cmg.mount_point_path, cmg.mount_point_path)
+ else:
+ os.environ["LD_LIBRARY_PATH"] = "/usr/lib:/lib:/opt/kde3/lib:/usr/X11R6/lib/"
# Recipe enviroment varibles
if cmg.recipe:
@@ -136,7 +139,10 @@
if cmg.cmg_version == 2:
directories = cmg.find_sub_directories("/usr/lib")
for dir in directories:
- os.environ["LD_LIBRARY_PATH"] = os.environ["LD_LIBRARY_PATH"]
+ ":" + os.path.join(cmg.mount_point_path, dir[1:])
+ if not self.klik.settings.glibc_loader:
+ os.environ["LD_LIBRARY_PATH"] = os.environ["LD_LIBRARY_PATH"]
+ ":" + os.path.join(cmg.mount_point_path, dir[1:])
+ else:
+ os.environ["LD_LIBRARY_PATH"] = os.environ["LD_LIBRARY_PATH"]
+ ":" + dir[1:]
# PYTHON MODULES
# fix python path for unregistered modules... note we arn't byte compiling...!!
Modified: trunk/client/trunk/klikclient/lib/klik/fuse.py
==============================================================================
--- trunk/client/trunk/klikclient/lib/klik/fuse.py (original)
+++ trunk/client/trunk/klikclient/lib/klik/fuse.py Mon Mar 24 16:29:02 2008
@@ -103,6 +103,10 @@
fusecram = os.path.abspath(os.path.join(self.klik.sys_path, os.path.pardir, \
"bin", "fusecram"))
command = [fusecram, "-n"]
+
+ # Advanced glibc loader
+ if self.klik.settings.glibc_loader:
+ command.append("-g")
# Add union
if union:
Modified: trunk/client/trunk/klikclient/lib/klik/settings.py
==============================================================================
--- trunk/client/trunk/klikclient/lib/klik/settings.py (original)
+++ trunk/client/trunk/klikclient/lib/klik/settings.py Mon Mar 24
16:29:02 2008
@@ -48,6 +48,9 @@
def __init__(self):
xdg = XdgUtils()
+
+ # Can we use a custom glib loader?
+ self.glibc_loader = os.path.exists("/lib/ld-klik2.so.2")
# Attempt to load version from svnversion file
svnversion_path = os.path.join(sys.path[0] , os.pardir, "share", "klik", \
"svnversion")
Modified: trunk/client/trunk/klikclient/lib/klik/utils/xdg.py
==============================================================================
--- trunk/client/trunk/klikclient/lib/klik/utils/xdg.py (original)
+++ trunk/client/trunk/klikclient/lib/klik/utils/xdg.py Mon Mar 24
16:29:02 2008
@@ -37,6 +37,7 @@
self.path = xdg_path
self.__get_is_gtk_installed = None
self.__desktop_dir = None
+ self.__installed_libs = None
# default location of custom xdg
if self.path == None or self.path == "":
@@ -295,52 +296,54 @@
def get_installed_libs(self):
- result = []
+ if self.__installed_libs == None:
+ result = []
- result.append("PYTHON")
+ result.append("PYTHON")
- if len(Popen(["which", "gnome-about"], stdout=PIPE,
stderr=open(os.devnull, "w")).communicate()[0].strip()) > 0:
- version = re.search("\d+(\.\d+)+",
Popen(["gnome-about", "--version"], stdout=PIPE, stderr=open(os.devnull, \
"w")).communicate()[0].strip()).group()
- result.append("GNOME " + version)
+ if len(Popen(["which", "gnome-about"], stdout=PIPE,
stderr=open(os.devnull, "w")).communicate()[0].strip()) > 0:
+ version = re.search("\d+(\.\d+)+",
Popen(["gnome-about", "--version"], stdout=PIPE, stderr=open(os.devnull, \
"w")).communicate()[0].strip()).group() + result.append("GNOME " + version)
+
+ if self.get_is_gtk_installed():
+ result.append("GTK")
+
+ if len(Popen(["which", "kde-config"], stdout=PIPE,
stderr=open(os.devnull, "w")).communicate()[0].strip()) > 0:
+ try:
+ if Popen(["kde-config" ,"--version"], stdout=PIPE,
stderr=open(os.devnull, "w")).communicate()[0].strip().count("KDE") > 0:
+ text = Popen(["kde-config" ,"--version"], stdout=PIPE, \
stderr=STDOUT).communicate()[0].strip() + version = re.search("(?<=KDE\: \
)\d+(\.\d+)+", text).group() + result.append("KDE " + version)
+
+ if Popen(["kde-config" ,"--version"], stdout=PIPE,
stderr=open(os.devnull, "w")).communicate()[0].strip().count("Qt: 3.")
> 0:
+ text = Popen(["kde-config" ,"--version"], stdout=PIPE, \
stderr=STDOUT).communicate()[0].strip() + version = re.search("(?<=Qt\: \
)\d+(\.\d+)+", text).group() + result.append("QT3 " + version)
+
+ if Popen(["kde-config" ,"--version"], stdout=PIPE,
stderr=open(os.devnull, "w")).communicate()[0].strip().count("Qt: 4.")
> 0:
+ text = Popen(["kde-config" ,"--version"], stdout=PIPE, \
stderr=STDOUT).communicate()[0].strip() + version = re.search("(?<=Qt\: \
)\d+(\.\d+)+", text).group() + result.append("QT4 " + version)
+ except:
+ pass
+ # Every thing after here is being collected out of intrest.. we are
not filtering based on these
+ # Although we may do in the future
+
+ if len(Popen(["which", "mono"], stdout=PIPE,
stderr=open(os.devnull, "w")).communicate()[0].strip()) > 0:
+ version = re.search("\d+(\.\d+)+", Popen(["mono", "--version"],
stdout=PIPE, stderr=open(os.devnull, "w")).communicate()[0].strip()).group()
+ result.append("MONO " + version)
+
+ if len(Popen(["which", "java"], stdout=PIPE,
stderr=open(os.devnull, "w")).communicate()[0].strip()) > 0:
+ text = Popen(["java", "-version"], stdout=PIPE, \
stderr=STDOUT).communicate()[0].strip() + version = re.search("\d+(\.\d+)+", \
text).group() + result.append("JAVA " + version)
+
+ if len(Popen(["which", "wine"], stdout=PIPE,
stderr=open(os.devnull, "w")).communicate()[0].strip()) > 0:
+ version = re.search("\d+(\.\d+)+", Popen(["wine", "--version"],
stdout=PIPE, stderr=STDOUT).communicate()[0].strip()).group()
+ result.append("WINE " + version)
- if self.get_is_gtk_installed():
- result.append("GTK")
-
- if len(Popen(["which", "kde-config"], stdout=PIPE,
stderr=open(os.devnull, "w")).communicate()[0].strip()) > 0:
- try:
- if Popen(["kde-config" ,"--version"], stdout=PIPE,
stderr=open(os.devnull, "w")).communicate()[0].strip().count("KDE") > 0:
- text = Popen(["kde-config" ,"--version"], stdout=PIPE, \
stderr=STDOUT).communicate()[0].strip()
- version = re.search("(?<=KDE\: )\d+(\.\d+)+", text).group()
- result.append("KDE " + version)
-
- if Popen(["kde-config" ,"--version"], stdout=PIPE,
stderr=open(os.devnull, "w")).communicate()[0].strip().count("Qt: 3.")
> 0:
- text = Popen(["kde-config" ,"--version"], stdout=PIPE, \
stderr=STDOUT).communicate()[0].strip()
- version = re.search("(?<=Qt\: )\d+(\.\d+)+", text).group()
- result.append("QT3 " + version)
-
- if Popen(["kde-config" ,"--version"], stdout=PIPE,
stderr=open(os.devnull, "w")).communicate()[0].strip().count("Qt: 4.")
> 0:
- text = Popen(["kde-config" ,"--version"], stdout=PIPE, \
stderr=STDOUT).communicate()[0].strip()
- version = re.search("(?<=Qt\: )\d+(\.\d+)+", text).group()
- result.append("QT4 " + version)
- except:
- pass
- # Every thing after here is being collected out of intrest.. we are
not filtering based on these
- # Although we may do in the future
-
- if len(Popen(["which", "mono"], stdout=PIPE,
stderr=open(os.devnull, "w")).communicate()[0].strip()) > 0:
- version = re.search("\d+(\.\d+)+", Popen(["mono", "--version"],
stdout=PIPE, stderr=open(os.devnull, "w")).communicate()[0].strip()).group()
- result.append("MONO " + version)
-
- if len(Popen(["which", "java"], stdout=PIPE,
stderr=open(os.devnull, "w")).communicate()[0].strip()) > 0:
- text = Popen(["java", "-version"], stdout=PIPE, \
stderr=STDOUT).communicate()[0].strip()
- version = re.search("\d+(\.\d+)+", text).group()
- result.append("JAVA " + version)
-
- if len(Popen(["which", "wine"], stdout=PIPE,
stderr=open(os.devnull, "w")).communicate()[0].strip()) > 0:
- version = re.search("\d+(\.\d+)+", Popen(["wine", "--version"],
stdout=PIPE, stderr=STDOUT).communicate()[0].strip()).group()
- result.append("WINE " + version)
-
- return (result)
+ self.__installed_libs = result
+ return self.__installed_libs
# TEST
if __name__ == "__main__":
_______________________________________________
klik-devel mailing list
klik-devel@kde.org
https://mail.kde.org/mailman/listinfo/klik-devel
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic