Merge lp:~shkn/bake/remove-pkg-config-autogeneration into lp:bake

[shuerhaaken]

Fixes Bug #1162704 - Remove pkg-config autogeneration

[Robert Ancell (robert-ancell)]

Thanks, I committed this along with a similar commit to remove the autogeneration from the C/C++ library support. Note if you do:
bzr commit -m "Remove pkg-config autogeneration" --fixes lp:1162704
it will automatically link this commit to the bug.

review: Approve

[shuerhaaken (shkn)]

Ok, next time with --fixes arg.

I'd be glad if you could use --author arg for my contributions next time ;)

I'm sorry I overlooked the pkg-config stuff in gcc module.

[Robert Ancell (robert-ancell)]

Ah, sorry. I thought bzr merge would just set me as the merge contributor, but checking with bzr blame shows it considers the merged branches to be my work. I'll set author from now on.

=== modified file 'src/module-vala.vala'
--- src/module-vala.vala	2013-04-05 23:48:29 +0000
+++ src/module-vala.vala	2013-04-06 21:40:26 +0000
@@ -48,27 +48,10 @@
         }
 
         /* Generate pkg-config file */
-        var filename = "%s-%s.pc".printf (library.name, major_version);
         var name = library.name;
-        var description = library.get_variable ("description", "");
-        var requires = library.get_variable ("requires", "");
 
         var include_directory = Path.build_filename (recipe.include_directory, "%s-%s".printf (library.name, major_version));
 
-        rule = recipe.add_rule ();
-        recipe.build_rule.add_input (filename);
-        rule.add_output (filename);
-        rule.add_status_command ("PKG-CONFIG %s".printf (filename));
-        rule.add_command ("@echo \"Name: %s\" > %s".printf (name, filename));
-        rule.add_command ("@echo \"Description: %s\" >> %s".printf (description, filename));
-        rule.add_command ("@echo \"Version: %s\" >> %s".printf (version, filename));
-        rule.add_command ("@echo \"Requires: %s\" >> %s".printf (requires, filename));
-        rule.add_command ("@echo \"Libs: -L%s -l%s\" >> %s".printf (library.install_directory, library.name, filename));
-        rule.add_command ("@echo \"Cflags: -I%s\" >> %s".printf (include_directory, filename));
-
-        if (library.install)
-            recipe.add_install_rule (filename, Path.build_filename (library.install_directory, "pkgconfig"));
-
         var h_filename = library.get_variable ("vala-header-name");
         if (h_filename == null)
             h_filename = "%s.h".printf (name);

=== modified file 'tests/vala-library-complex/expected'
--- tests/vala-library-complex/expected	2013-04-05 23:56:49 +0000
+++ tests/vala-library-complex/expected	2013-04-06 21:40:26 +0000
@@ -28,8 +28,6 @@
 cp libtest.so /usr/lib/libtest.so
 cp libtest.so.0 /usr/lib/libtest.so.0
 cp libtest.a /usr/lib/libtest.a
-mkdir -p /usr/lib/pkgconfig
-cp test-0.pc /usr/lib/pkgconfig/test-0.pc
 mkdir -p /usr/include/test-0
 cp test.h /usr/include/test-0/test.h
 mkdir -p /usr/share/vala/vapi
@@ -39,7 +37,6 @@
 rm -f /usr/lib/libtest.so
 rm -f /usr/lib/libtest.so.0
 rm -f /usr/lib/libtest.a
-rm -f /usr/lib/pkgconfig/test-0.pc
 rm -f /usr/include/test-0/test.h
 rm -f /usr/share/vala/vapi/test-0.vapi
 (exit SUCCESS)
@@ -50,6 +47,5 @@
 rm -f test-0.vapi
 rm -rf .built/
 rm -f libtest.so
-rm -f test-0.pc
 rm -f test.pot
 (exit SUCCESS)

=== modified file 'tests/vala-library-install-directory/expected'
--- tests/vala-library-install-directory/expected	2013-04-05 23:35:39 +0000
+++ tests/vala-library-install-directory/expected	2013-04-06 21:40:26 +0000
@@ -14,8 +14,6 @@
 cp libtest.so /usr/lib/test/libtest.so
 cp libtest.so.0 /usr/lib/test/libtest.so.0
 cp libtest.a /usr/lib/test/libtest.a
-mkdir -p /usr/lib/test/pkgconfig
-cp test-0.pc /usr/lib/test/pkgconfig/test-0.pc
 mkdir -p /usr/include/test-0
 cp test.h /usr/include/test-0/test.h
 mkdir -p /usr/share/vala/vapi
@@ -25,7 +23,6 @@
 rm -f /usr/lib/test/libtest.so
 rm -f /usr/lib/test/libtest.so.0
 rm -f /usr/lib/test/libtest.a
-rm -f /usr/lib/test/pkgconfig/test-0.pc
 rm -f /usr/include/test-0/test.h
 rm -f /usr/share/vala/vapi/test-0.vapi
 (exit SUCCESS)
@@ -36,5 +33,4 @@
 rm -f test-0.vapi
 rm -rf .built/
 rm -f libtest.so
-rm -f test-0.pc
 (exit SUCCESS)

=== modified file 'tests/vala-library-no-install/expected'
--- tests/vala-library-no-install/expected	2013-04-05 23:35:39 +0000
+++ tests/vala-library-no-install/expected	2013-04-06 21:40:26 +0000
@@ -20,5 +20,4 @@
 rm -f test-0.vapi
 rm -rf .built/
 rm -f libtest.so
-rm -f test-0.pc
 (exit SUCCESS)

=== modified file 'tests/vala-library-override-names/expected'
--- tests/vala-library-override-names/expected	2013-04-05 23:53:21 +0000
+++ tests/vala-library-override-names/expected	2013-04-06 21:40:26 +0000
@@ -14,8 +14,6 @@
 cp libtest.so /usr/lib/libtest.so
 cp libtest.so.0 /usr/lib/libtest.so.0
 cp libtest.a /usr/lib/libtest.a
-mkdir -p /usr/lib/pkgconfig
-cp test-0.pc /usr/lib/pkgconfig/test-0.pc
 mkdir -p /usr/include/test-0
 cp foo.h /usr/include/test-0/foo.h
 mkdir -p /usr/share/vala/vapi
@@ -25,7 +23,6 @@
 rm -f /usr/lib/libtest.so
 rm -f /usr/lib/libtest.so.0
 rm -f /usr/lib/libtest.a
-rm -f /usr/lib/pkgconfig/test-0.pc
 rm -f /usr/include/test-0/foo.h
 rm -f /usr/share/vala/vapi/foo.vapi
 (exit SUCCESS)
@@ -36,5 +33,4 @@
 rm -f foo.vapi
 rm -rf .built/
 rm -f libtest.so
-rm -f test-0.pc
 (exit SUCCESS)

=== modified file 'tests/vala-library-simple/expected'
--- tests/vala-library-simple/expected	2013-04-05 23:35:39 +0000
+++ tests/vala-library-simple/expected	2013-04-06 21:40:26 +0000
@@ -14,8 +14,6 @@
 cp libtest.so /usr/lib/libtest.so
 cp libtest.so.0 /usr/lib/libtest.so.0
 cp libtest.a /usr/lib/libtest.a
-mkdir -p /usr/lib/pkgconfig
-cp test-0.pc /usr/lib/pkgconfig/test-0.pc
 mkdir -p /usr/include/test-0
 cp test.h /usr/include/test-0/test.h
 mkdir -p /usr/share/vala/vapi
@@ -25,7 +23,6 @@
 rm -f /usr/lib/libtest.so
 rm -f /usr/lib/libtest.so.0
 rm -f /usr/lib/libtest.a
-rm -f /usr/lib/pkgconfig/test-0.pc
 rm -f /usr/include/test-0/test.h
 rm -f /usr/share/vala/vapi/test-0.vapi
 (exit SUCCESS)
@@ -36,5 +33,4 @@
 rm -f test-0.vapi
 rm -rf .built/
 rm -f libtest.so
-rm -f test-0.pc
 (exit SUCCESS)