Merge lp:~jml/pkgme/rules-extra-targets into lp:pkgme

[Jonathan Lange]

Allow extra targets to be specified in rules.

This is a very simplistic attempt at adding support for customizing the
'rules' file generated by pkgme. It is my own poor attempt at accommodating
directhex's needs, described below in a slightly edited version of their own
words.

For my part, I'm worried that this is too unstructured, and have vague fears
that it will allow pkgme to become yet another broken packaging system. As
such, I defer to the expert while trying to unblock directhex in their work.

...

directhex has been working on adding support to pkgme for handling building
of mono projects with xbuild, a command-line tool which can build visual
studio project and solution files (which monodevelop uses as its native
project format).

It should give far greater coverage than relying on mono developers to create
automake projects.

A mono source tree can contain multiple solution (.sln) and project (.csproj)
files, without any guarantees as to which is the "correct" one to build.
This is especially common for multi-platform projects where they might ship a
different .sln with different defaults for windows, osx, linux, silverlight,
etc

The usual strategy is to specify which project to build in 'rules', much like
passing a -f value to "make" which is typically done by overriding
dh_auto_build and dh_auto_clean. However, pkgme doesn't seem to have any
support for overrides, since the template format assumes a pristine dh $@ is
enough for anybody in all situations.

...

Thanks,
jml

[James Westby (james-w)]

Let's give this a go and see what happens...

Thanks,

James

review: Approve

=== modified file 'pkgme/info_elements.py'
--- pkgme/info_elements.py	2012-07-05 13:42:09 +0000
+++ pkgme/info_elements.py	2012-07-09 10:53:19 +0000
@@ -65,6 +65,12 @@
     description = "The debhelper buildsystem to use to build the package."
 
 
+class ExtraTargets(InfoElement):
+
+    name = 'extra_targets'
+    description = "Extra targets for the 'rules' file."
+
+
 class PackageName(InfoElement):
 
     name = "package_name"
 
=== modified file 'pkgme/package_files.py'
--- pkgme/package_files.py	2012-07-05 13:34:22 +0000
+++ pkgme/package_files.py	2012-07-09 10:53:19 +0000
@@ -19,6 +19,7 @@
     Executable,
     ExtraFiles,
     ExtraFilesFromPaths,
+    ExtraTargets,
     Homepage,
     Icon,
     License,
@@ -164,6 +165,7 @@
     elements = [
         Buildsystem,
         DebhelperAddons,
+        ExtraTargets,
         ]
 
     filename = "rules"
 
=== modified file 'pkgme/templates/rules'
--- pkgme/templates/rules	2011-07-04 02:49:19 +0000
+++ pkgme/templates/rules	2012-07-09 10:53:19 +0000
@@ -9,3 +9,6 @@
 --with=${debhelper_addons} #slurp
 #end if
 
+#if $extra_targets
+${extra_targets}
+#end if
 
=== modified file 'pkgme/tests/test_package_files.py'
--- pkgme/tests/test_package_files.py	2012-07-05 14:16:12 +0000
+++ pkgme/tests/test_package_files.py	2012-07-09 10:53:19 +0000
@@ -18,6 +18,7 @@
     Executable,
     ExtraFiles,
     ExtraFilesFromPaths,
+    ExtraTargets,
     Homepage,
     Icon,
     InfoElement,
@@ -209,6 +210,20 @@
             "%%:\n\tdh $@ --with=%s \n" % debhelper_addons,
             package_file.get_contents())
 
+    def test_content_with_extra_targets(self):
+        extra_targets = """
+include /usr/share/cli-common/cli.make
+
+override_dh_auto_build:
+	xbuild $(CURDIR)/WideMargin.sln /p:Configuration=Release
+
+override_dh_auto_clean:
+	xbuild $(CURDIR)/WideMargin.sln /p:Configuration=Release /t:Clean
+"""
+        args = {ExtraTargets.name: extra_targets}
+        package_file = self.get_object(args)
+        self.assertIn(extra_targets, package_file.get_contents())
+
     def test_overwrite(self):
         package_file = self.get_object()
         self.assertEqual(True, package_file.overwrite)