Merge lp:~pefarrell/spud/diamond-setup into lp:spud

[Patrick Farrell]

This branch fixes the setup.py issues for diamond, and in the process simplifies it considerably.

The root problem (ha ha) was that the target directory of the data_files was supplied as

'//usr/share/whatever'

instead of

'/usr/share/whatever'. In my opinion that shouldn't matter, but in distutils' opinion, it means it should ignore the --root command for the data_files.

This means we can get rid of pulling the --root out of sys.argv ourselves, and get rid of looking up the environment variable DESTDIR.

[Tim Greaves (tim-greaves)]

Confused by the appearance of the config.guess and config.sub changes - are these intentional?

The rest looks good for removing the root and destdir complexity.

Probably silly question - but at what stage is the additional leading / being dealt with, given it's not apparent from this merge?

Thanks for looking at this!

[Stephan Kramer (s-kramer)]

> Confused by the appearance of the config.guess and config.sub changes - are these intentional?

That's probably related to this bug: https://bugs.launchpad.net/spud/+bug/942835

[Tim Greaves (tim-greaves)]

OK, yes, afraid I'm not keeping up too well today.

In which case - assuming we are dealing with the additional leading / elsewhere, this looks fine to simplify setup.py.in

review: Approve

[Cian Wilson (cwilson)]

Yes, I filed a separate bug report for those modified files - though they now don't get modified locally from this branch presumably because the changes have been committed.

I can confirm that this merge fixes bug #942831 for me, i.e. diamond opens successfully after being installed from packages that were built from the source.

Happy to approve assuming there's a conclusion about the unexpectedly modified files.

review: Approve

[Patrick Farrell (pefarrell)]

When I merge, I will only merge the code changes. We will fix lp:942835 separately.

Where is the leading '/' being dealt with? It is removed from lines 133/144 of setup.py.in.

[Tim Greaves (tim-greaves)]

I'm being blind, yes, I see now. Thanks.

=== modified file 'config.guess'
--- config.guess	2012-01-25 14:00:49 +0000
+++ config.guess	2012-02-29 12:22:18 +0000
@@ -1,10 +1,10 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
 #   Free Software Foundation, Inc.
 
-timestamp='2009-11-20'
+timestamp='2009-12-30'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -56,8 +56,9 @@
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
+Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."

=== modified file 'config.sub'
--- config.sub	2012-01-25 14:00:49 +0000
+++ config.sub	2012-02-29 12:22:18 +0000
@@ -1,10 +1,10 @@
 #! /bin/sh
 # Configuration validation subroutine script.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
 #   Free Software Foundation, Inc.
 
-timestamp='2009-11-20'
+timestamp='2010-01-22'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -75,8 +75,9 @@
 version="\
 GNU config.sub ($timestamp)
 
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
+Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -380,7 +381,8 @@
 	| sparclite-* \
 	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
 	| tahoe-* | thumb-* \
-	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \
+	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
+	| tile-* | tilegx-* \
 	| tron-* \
 	| ubicom32-* \
 	| v850-* | v850e-* | vax-* \
@@ -1085,6 +1087,11 @@
 		basic_machine=tic6x-unknown
 		os=-coff
 		;;
+        # This must be matched before tile*.
+        tilegx*)
+		basic_machine=tilegx-unknown
+		os=-linux-gnu
+		;;
 	tile*)
 		basic_machine=tile-unknown
 		os=-linux-gnu
@@ -1435,6 +1442,8 @@
 	-dicos*)
 		os=-dicos
 		;;
+        -nacl*)
+	        ;;
 	-none)
 		;;
 	*)

=== modified file 'diamond/setup.py.in'
--- diamond/setup.py.in	2012-02-27 17:09:38 +0000
+++ diamond/setup.py.in	2012-02-29 12:22:18 +0000
@@ -12,12 +12,6 @@
 # system. This will be a local directory to install into, and act as local '/'
 # as far as all paths are concerned. Check for this, and fail nicely if not set.
 
-try:
-  destdir = os.environ["DESTDIR"]
-except KeyError:
-  destdir = ""
-
-
 prefix = None
 import sys
 
@@ -35,8 +29,6 @@
 for i, arg in enumerate(sys.argv):
   if "--prefix" in arg:
     prefix = arg.split('=')[1]
-  if "--root" in arg:
-    destdir = arg.split('=')[1]
 
 # Given the above prefix possibilities, as well as root and DESTDIR, we need to
 # construct a list of data directories to be installed
@@ -44,8 +36,6 @@
 #   * configure-supplied prefixes are dealt with by substitution directly into
 #       this file, with @ PREFIX @ being replaced.
 #   * prefixes as command-line options are pushed by us
-#   * DESTDIR and root have now been condensed into 'destdir' and are pushed
-#       by us
 #
 # Note that in the case of this and other packages which supply prefix twice
 # (once in configure, and then again on the command line) we honour the prefix
@@ -56,19 +46,19 @@
 plugin_data_files = []
 for plugin in plugin_dirs:
   if prefix is None:
-    plugin_data_files.append((destdir + "@prefix@/share/diamond/plugins/" + plugin,
+    plugin_data_files.append(("@prefix@/share/diamond/plugins/" + plugin,
       glob.glob('plugins/' + plugin + '/*.py')))
   else:
-    plugin_data_files.append((destdir + "/" + prefix + "/share/diamond/plugins/" + plugin,
+    plugin_data_files.append((prefix + "/share/diamond/plugins/" + plugin,
       glob.glob('plugins/' + plugin + '/*.py')))
 
 # Now parse the GUI directories
 gui_data_files = []
 if prefix is None:
-  gui_data_files.append((destdir + "@prefix@/share/diamond/gui",
+  gui_data_files.append(("@prefix@/share/diamond/gui",
     ["gui/gui.glade", "gui/diamond.svg"]))
 else:
-  gui_data_files.append((destdir + "/" + prefix + "/share/diamond/gui",
+  gui_data_files.append((prefix + "/share/diamond/gui",
     ["gui/gui.glade", "gui/diamond.svg"]))
 
 # We now have all the information we need; run setup.