Merge lp:~francesco-marella/specto/fix-sdist into lp:specto

[Francesco Marella]

[Jeff Fortin Tam (kiddo)]

After uncompressing the tarball resulting from "python setup.py sdist", "sudo setup.py install" fails like so:

  running install_scripts
  copying build/scripts-2.7/specto -> /usr/bin
  changing mode of /usr/bin/specto to 755
  running install_data
  error: can't copy 'specto.desktop': doesn't exist or not a regular file

Then when you try to run "sudo python setup.py uninstall", you get:

  warning: uninstall: Could not read installed files list installed_files

review: Needs Fixing

=== removed file 'VERSION'
--- VERSION	2011-06-23 18:55:56 +0000
+++ VERSION	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-0.4

=== added directory 'data/desktop'
=== renamed file 'specto.desktop.in' => 'data/desktop/specto.desktop.in'
=== modified file 'setup.py'
--- setup.py	2011-01-07 12:40:33 +0000
+++ setup.py	2011-08-10 10:01:36 +0000
@@ -12,6 +12,17 @@
 
 INSTALLED_FILES = "installed_files"
 
+from spectlib import __pkg_version__ as version
+
+def give_files(dir, *extension):
+    files=[]
+    all_files=os.listdir(dir)
+    for file in all_files:
+        ext=(os.path.splitext(file))[1]
+        if ext in extension:
+            files.append(dir + file)
+    return files
+
 class install (_install):
 
     def run (self):
@@ -78,60 +89,46 @@
     print "Please specify operation : %s" % " | ".join (ops)
     raise SystemExit
 
-prefix = None
-if len (sys.argv) > 2:
-    i = 0
-    for o in sys.argv:
-        if o.startswith ("--prefix"):
-            if o == "--prefix":
-                if len (sys.argv) >= i:
-                    prefix = sys.argv[i + 1]
-                sys.argv.remove (prefix)
-            elif o.startswith ("--prefix=") and len (o[9:]):
-                prefix = o[9:]
-            sys.argv.remove (o)
-            break
-        i += 1
-if not prefix and "PREFIX" in os.environ:
-    prefix = os.environ["PREFIX"]
-if not prefix or not len (prefix):
-    prefix = "/usr/local"
-
-if sys.argv[1] in ("install", "uninstall") and len (prefix):
-    sys.argv += ["--prefix", prefix]
-
-with open("VERSION", "r") as version_file:
-    version = version_file.read().strip()
-
-with open(os.path.join ("spectlib/constants.py.in"), "rt") as file_in:
-    data = file_in.read ()
-    data = data.replace ("@prefix@", prefix)
-    data = data.replace ("@version@", version)
-    with open (os.path.join ("spectlib/constants.py"), "wt") as file_out:
-        file_out.write (data)
-
-with open(os.path.join("data/indicator/specto.in"), "rt") as file_in:
-    data = file_in.read()
-    data = data.replace("@prefix@", prefix)
-    with open (os.path.join ("data/indicator/specto"), "wt") as file_out:
-        file_out.write(data)
-
-cmd = "intltool-merge -d -u po/ specto.desktop.in specto.desktop".split(" ")
-try:
-    proc = subprocess.Popen(cmd)
-    proc.wait()
-except:
-    print "Error: intltool-merge not found, please install the intltool package."
-    raise SystemExit
-
-def give_files(dir, *extension):
-    files=[]
-    all_files=os.listdir(dir)
-    for file in all_files:
-        ext=(os.path.splitext(file))[1]
-        if ext in extension:
-            files.append(dir + file)
-    return files
+
+if sys.argv[1] in ("build", "install"):
+    prefix = None
+    if len (sys.argv) > 2:
+        i = 0
+        for o in sys.argv:
+            if o.startswith ("--prefix"):
+                if o == "--prefix":
+                    if len (sys.argv) >= i:
+                        prefix = sys.argv[i + 1]
+                    sys.argv.remove (prefix)
+                elif o.startswith ("--prefix=") and len (o[9:]):
+                    prefix = o[9:]
+                sys.argv.remove (o)
+                break
+            i += 1
+    if not prefix and "PREFIX" in os.environ:
+        prefix = os.environ["PREFIX"]
+    if not prefix or not len (prefix):
+        prefix = sys.prefix
+    if not prefix or not len (prefix):
+        prefix = "/usr/local"
+
+    if sys.argv[1] in ("install", "uninstall") and len (prefix):
+        sys.argv += ["--prefix", prefix]
+
+    if sys.argv[1] == "build":
+        with open(os.path.join("data/indicator/specto.in"), "rt") as file_in:
+            data = file_in.read()
+            data = data.replace("@prefix@", prefix)
+            with open (os.path.join ("data/indicator/specto"), "wt") as file_out:
+                file_out.write(data)
+
+        cmd = "intltool-merge -d -u po/ data/desktop/specto.desktop.in specto.desktop".split(" ")
+        try:
+            proc = subprocess.Popen(cmd)
+            proc.wait()
+        except:
+            print "Error: intltool-merge not found, please install the intltool package."
+            raise SystemExit
 
 custom_images = []
 
@@ -145,47 +142,55 @@
 global_icon_path = "share/icons/hicolor"
 local_icon_path = "share/specto/icons/hicolor/"
 
-for dir, subdirs, files in os.walk("data/icons/"):
-    if dir == "data/icons/":
-        for file in files:
-            custom_images.append(dir + file)
-    else:
-        images = []
-        global_images = []
-
-        for file in files:
-            if file.find(".svg") or file.find(".png"):
-                file_path = "%s/%s" % (dir, file)
-                # global image
-                if file[:-4] == "specto":
-                    global_images.append(file_path)
-                # local image
-                else:
-                    images.append(file_path)
-        # local
-        if len(images) > 0:
-            data_files.append((local_icon_path + dir[10:], images))
-        # global
-        if len(global_images) > 0:
-            data_files.append((global_icon_path + dir[10:], global_images))
-
-data_files.append(("share/specto/icons/", custom_images))
-
-podir = os.path.join (os.path.realpath ("."), "po")
-if os.path.isdir (podir):
-    buildcmd = "msgfmt -o build/locale/%s/specto.mo po/%s.po"
-    mopath = "build/locale/%s/specto.mo"
-    destpath = "share/locale/%s/LC_MESSAGES"
-    for name in os.listdir (podir):
-        if name[-2:] == "po":
-            name = name[:-3]
-            if sys.argv[1] == "build" \
-               or (sys.argv[1] == "install" and \
-                   not os.path.exists (mopath % name)):
-                if not os.path.isdir ("build/locale/" + name):
-                    os.makedirs ("build/locale/" + name)
-                os.system (buildcmd % (name, name))
-            data_files.append ((destpath % name, [mopath % name]))
+if sys.argv[1] in ("build", "install"):
+    for dir, subdirs, files in os.walk("data/icons/"):
+        if dir == "data/icons/":
+            for file in files:
+                custom_images.append(dir + file)
+        else:
+            images = []
+            global_images = []
+
+            for file in files:
+                if file.find(".svg") or file.find(".png"):
+                    file_path = "%s/%s" % (dir, file)
+                    # global image
+                    if file[:-4] == "specto":
+                        global_images.append(file_path)
+                    # local image
+                    else:
+                        images.append(file_path)
+            # local
+            if len(images) > 0:
+                data_files.append((local_icon_path + dir[10:], images))
+            # global
+            if len(global_images) > 0:
+                data_files.append((global_icon_path + dir[10:], global_images))
+
+    data_files.append(("share/specto/icons/", custom_images))
+
+    podir = os.path.join (os.path.realpath ("."), "po")
+    if os.path.isdir (podir):
+        buildcmd = "msgfmt -o build/locale/%s/specto.mo po/%s.po"
+        mopath = "build/locale/%s/specto.mo"
+        destpath = "share/locale/%s/LC_MESSAGES"
+        for name in os.listdir (podir):
+            if name[-2:] == "po":
+                name = name[:-3]
+                if sys.argv[1] == "build" \
+                   or (sys.argv[1] == "install" and \
+                       not os.path.exists (mopath % name)):
+                    if not os.path.isdir ("build/locale/" + name):
+                        os.makedirs ("build/locale/" + name)
+                    os.system (buildcmd % (name, name))
+                data_files.append ((destpath % name, [mopath % name]))
+
+if sys.argv[1] == "clean":
+    try:
+        os.remove ("data/indicator/specto")
+        os.remove ("specto.desktop")
+    except:
+        pass
 
 
 setup(name = "specto",
@@ -202,13 +207,9 @@
                 "install_data" : install_data}
     )
 
-os.remove ("spectlib/constants.py")
-os.remove ("data/indicator/specto")
-os.remove ("specto.desktop")
-
 if sys.argv[1] == "install":
-    gtk_update_icon_cache = '''gtk-update-icon-cache -f -t \
-%s/share/icons/hicolor''' % prefix
+    gtk_update_icon_cache = "gtk-update-icon-cache -f -t \
+%s/share/icons/hicolor" % prefix
     root_specified = len (filter (lambda s: s.startswith ("--root"),
                                   sys.argv)) > 0
     if not root_specified:

=== modified file 'spectlib/__init__.py'
--- spectlib/__init__.py	2006-12-17 03:53:01 +0000
+++ spectlib/__init__.py	2011-08-10 10:01:36 +0000
@@ -0,0 +1,3 @@
+
+__pkg_name__ = 'specto'
+__pkg_version__ = '0.4.1'

=== removed file 'spectlib/constants.py.in'
--- spectlib/constants.py.in	2010-11-23 14:32:32 +0000
+++ spectlib/constants.py.in	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-# -*- coding: utf-8 -*-
-
-# The Specto version
-VERSION = "@version@"
-
-# The prefix were Specto is installed to.
-PREFIX = "@prefix@"

=== modified file 'spectlib/i18n.py'
--- spectlib/i18n.py	2010-11-23 15:28:11 +0000
+++ spectlib/i18n.py	2011-08-10 10:01:36 +0000
@@ -25,13 +25,13 @@
 import gettext
 import locale
 
-# If Specto is installed read prefix from constants module
+
 MESSAGES_DIR = ''
-try:
-    from spectlib.constants import PREFIX
-    MESSAGES_DIR = "%s/share/locale" % PREFIX
-except ImportError:
-    pass
+if os.path.exists("/usr/share/locale") and os.path.isdir("/usr/share/locale"):
+    MESSAGES_DIR = "/usr/share/locale"
+elif os.path.exists("/usr/local/share/locale") and \
+        os.path.isdir("/usr/local/share/locale"):
+    MESSAGES_DIR = "/usr/local/share/locale"
 
 def setup_locale_and_gettext():
     package_name = 'specto'

=== modified file 'spectlib/main.py'
--- spectlib/main.py	2011-06-23 15:23:11 +0000
+++ spectlib/main.py	2011-08-10 10:01:36 +0000
@@ -45,12 +45,7 @@
 from spectlib.tools import networkmanager as conmgr
 
 
-VERSION = "undefined"
-try:
-    from spectlib.constants import VERSION
-except ImportError:
-    with open("VERSION", 'r') as version_file:
-        VERSION = version_file.read().strip()
+from spectlib import __pkg_version__ as VERSION
 
 #create a gconf object
 specto_gconf = Specto_gconf("/apps/specto")

=== modified file 'spectlib/util.py'
--- spectlib/util.py	2010-11-23 16:19:28 +0000
+++ spectlib/util.py	2011-08-10 10:01:36 +0000
@@ -26,11 +26,12 @@
 
 from spectlib.tools.specto_gconf import Specto_gconf
 
+
 PREFIX = ''
-try:
-    from spectlib.constants import PREFIX
-except ImportError:
-    pass
+if os.path.exists("/usr") and os.path.isdir("/usr"):
+    PREFIX = "/usr"
+elif os.path.exists("/usr/local") and os.path.isdir("/usr/local"):
+    PREFIX = "/usr/local"
 
 def return_webpage(webpage):
     """ Open the webpage in the default browser. """