Author: jannis Date: 2006-09-04 19:13:35 +0000 (Mon, 04 Sep 2006) New Revision: 23077
Modified: installit/trunk/ChangeLog installit/trunk/backends/Source.py installit/trunk/components/packages.py installit/trunk/tools/shell.py Log: * components/packages.py, backends/Source.py: Use PkgConfigModule class properly. Fixes several errors. Modified: installit/trunk/ChangeLog =================================================================== --- installit/trunk/ChangeLog 2006-09-04 19:11:27 UTC (rev 23076) +++ installit/trunk/ChangeLog 2006-09-04 19:13:35 UTC (rev 23077) @@ -1,5 +1,10 @@ 2006-09-04 Jannis Pohlmann <[EMAIL PROTECTED]> + * components/packages.py, backends/Source.py: Use PkgConfigModule class + properly. Fixes several errors. + +2006-09-04 Jannis Pohlmann <[EMAIL PROTECTED]> + * components/packages.py, tools/pkgconfig.py: Add support for pkg-config --cflags and --libs arguments. * backends/Source.py: Fix requirements page, which only worked properly Modified: installit/trunk/backends/Source.py =================================================================== --- installit/trunk/backends/Source.py 2006-09-04 19:11:27 UTC (rev 23076) +++ installit/trunk/backends/Source.py 2006-09-04 19:13:35 UTC (rev 23077) @@ -28,6 +28,7 @@ from tools.shell import Command from tools.env import Environment +from tools.pkgconfig import PkgConfigModule from components.mirrors import MirrorList from components.config import Config from components.packages import Program, Library, Package @@ -770,7 +771,9 @@ status.connect("clicked", lambda button: self._locateLibrary(library)) status.set_relief(gtk.RELIEF_NONE) - if isinstance(library, Package) or library.isResolved(): + if isinstance(library, Package) or \ + isinstance(library, PkgConfigModule) or \ + library.isResolved(): status.set_image(gtk.image_new_from_stock(gtk.STOCK_YES, gtk.ICON_SIZE_BUTTON)) else: @@ -789,7 +792,9 @@ label.show() # Locate manually via file chooser - if not isinstance(library, Package) and not library.isResolved(): + if not isinstance(library, Package) and \ + not isinstance(library, PkgConfigModule) and \ + not library.isResolved(): button = gtk.Button(_("Locate manually...")) button.connect("clicked", lambda button: self._locateLibrary(library)) Modified: installit/trunk/components/packages.py =================================================================== --- installit/trunk/components/packages.py 2006-09-04 19:11:27 UTC (rev 23076) +++ installit/trunk/components/packages.py 2006-09-04 19:13:35 UTC (rev 23077) @@ -165,6 +165,8 @@ if isinstance(library, PkgConfigModule): flags.add(library.getCompilerFlags()) + print flags + return " " + " ".join(flags) def getEnvironmentVars(self): @@ -605,11 +607,11 @@ pkg = self.getPackage(dep["name"], dep["version"], package.backend, True) except PackageNotFoundError, e: - pkg = Library(dep["name"], dep["version"]) try: - PkgConfig.resolve(dep["name"], dep["version"]) + pkg = PkgConfig.resolve(dep["name"], dep["version"]) pkg.resolved = True except PkgConfigModuleNotFound: + pkg = Library(dep["name"], dep["version"]) if Config.get("UseLibrarySearch"): if Environment.hasLibrary(library): pkg.resolved = True Modified: installit/trunk/tools/shell.py =================================================================== --- installit/trunk/tools/shell.py 2006-09-04 19:11:27 UTC (rev 23076) +++ installit/trunk/tools/shell.py 2006-09-04 19:13:35 UTC (rev 23077) @@ -81,6 +81,8 @@ #print "CPPFLAGS=%s" % env["CPPFLAGS"] #print + print env["LDFLAGS"] + # Start subprocess process = subprocess.Popen(self.command, bufsize=1, shell=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, _______________________________________________ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits