pkg-config 1.0.5 → 1.0.6

data/NEWS

@@ -1,5 +1,9 @@
 = NEWS
 
+== 1.0.6 - 2010/09/23
+
+* add PKGConfig.libs_only_L.
+
 == 1.0.5 - 2010/09/23
 
 * suppress duplicated configure arguments processing.

data/lib/pkg-config.rb

@@ -123,7 +123,7 @@ class PackageConfig
 
   def cflags
     path_flags, other_flags = collect_cflags
-    (other_flags + path_flags).join(" ")
+    (path_flags + other_flags).join(" ")
   end
 
   def cflags_only_I
@@ -132,7 +132,7 @@ class PackageConfig
 
   def libs
     path_flags, other_flags = collect_libs
-    (other_flags + path_flags).join(" ")
+    (path_flags + other_flags).join(" ")
   end
 
   def libs_only_l
@@ -145,6 +145,16 @@ class PackageConfig
     end.join(" ")
   end
 
+  def libs_only_L
+    collect_libs[0].find_all do |arg|
+      if @msvc_syntax
+        /\A\/libpath:/ =~ arg
+      else
+        /\A-L/ =~ arg
+      end
+    end.join(" ")
+  end
+
   def version
     declaration("Version")
   end
@@ -277,7 +287,7 @@ class PackageConfig
 end
 
 module PKGConfig
-  VERSION = "1.0.5"
+  VERSION = "1.0.6"
 
   @@paths = []
   @@override_variables = {}
@@ -314,6 +324,10 @@ module PKGConfig
     package_config(pkg).libs_only_l
   end
 
+  def libs_only_L(pkg)
+    package_config(pkg).libs_only_L
+  end
+
   def cflags(pkg)
     package_config(pkg).cflags
   end
@@ -348,7 +362,7 @@ module PKGConfig
   def have_package(pkg, major = nil, minor = 0, micro = 0)
     message = "#{pkg}"
     unless major.nil?
-      message << "version (>= #{major}.#{minor}.#{micro})"
+      message << " version (>= #{major}.#{minor}.#{micro})"
     end
     major ||= 0
     enough_version = checking_for(checking_message(message)) do

data/test/test_pkg_config.rb

@@ -2,8 +2,10 @@ require 'pkg-config'
 
 class PkgConfigTest < Test::Unit::TestCase
   def setup
-    @cairo = PackageConfig.new("cairo")
-    @cairo_png = PackageConfig.new("cairo-png")
+    @custom_libdir = "/tmp/local/lib"
+    options = {:override_variables => {"libdir" => @custom_libdir}}
+    @cairo = PackageConfig.new("cairo", options)
+    @cairo_png = PackageConfig.new("cairo-png", options)
   end
 
   def test_exist?
@@ -31,6 +33,7 @@ class PkgConfigTest < Test::Unit::TestCase
     @cairo.msvc_syntax = true
     result = pkg_config("cairo", "--libs")
     msvc_result = result.gsub(/-lcairo\b/, "cairo.lib")
+    msvc_result = msvc_result.gsub(/-L/, '/libpath:')
     assert_not_equal(msvc_result, result)
     assert_equal(msvc_result, @cairo.libs)
   end
@@ -46,6 +49,17 @@ class PkgConfigTest < Test::Unit::TestCase
     assert_equal(msvc_result, @cairo_png.libs_only_l)
   end
 
+  def test_libs_only_L
+    assert_pkg_config("cairo", ["--libs-only-L"], @cairo.libs_only_L)
+    assert_pkg_config("cairo-png", ["--libs-only-L"], @cairo_png.libs_only_L)
+
+    @cairo_png.msvc_syntax = true
+    result = pkg_config("cairo-png", "--libs-only-L")
+    msvc_result = result.gsub(/-L/, '/libpath:')
+    assert_not_equal(msvc_result, result)
+    assert_equal(msvc_result, @cairo_png.libs_only_L)
+  end
+
   def test_requires
     assert_equal([], @cairo.requires)
   end
@@ -85,6 +99,7 @@ class PkgConfigTest < Test::Unit::TestCase
 
   private
   def pkg_config(package, *args)
+    args.unshift("--define-variable=libdir=#{@custom_libdir}")
     args = args.collect {|arg| arg.dump}.join(' ')
     `pkg-config #{args} #{package}`.strip
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: pkg-config
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: false
   segments: 
   - 1
   - 0
-  - 5
-  version: 1.0.5
+  - 6
+  version: 1.0.6
 platform: ruby
 authors: 
 - Kouhei Sutou