RE-structurate directory and change setup installation for gtk2

1 files changed, 54 insertions, 55 deletions

diff --git a/CeibalEncuesta/gtk2/setup.py b/CeibalEncuesta/gtk2/setup.py
index 2b0904f..9257572 100644
--- a/CeibalEncuesta/gtk2/setup.py
+++ b/CeibalEncuesta/gtk2/setup.py
@@ -1,64 +1,63 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
+import os
+import site
+import codecs
+import commands
 
 from distutils.core import setup
 
+APP_VERSION = "4.2"
+
+
+USER_BASE = site.getuserbase()
+USER_HOME = "%s/../" % USER_BASE
+USER_SITE_PACKAGES = site.getusersitepackages()
+APLICATION_PATH = USER_BASE + '/share/applications/'
+ESCRITORIO_PATH = '%sEscritorio/' % USER_HOME
+DESKTOP_PATH = '%sDesktop/' % USER_HOME
+
+
+desktop_entry = """[Desktop Entry]
+Version=%s
+Type=Application
+Terminal=false
+Exec=%s/bin/ceibalencuesta
+Name=CeibalEncuesta
+Icon=%s/CeibalEncuesta/Iconos/ceibal.png
+""" % (APP_VERSION, USER_BASE, USER_SITE_PACKAGES)
+
+
+with codecs.open("data/CeibalEncuesta.desktop", "w", "utf-8") as f:
+    f.write(desktop_entry)
+    f.close()
+
+
 setup(
     name = "CeibalEncuesta",
-    version = "4",
-    
-    scripts = ["ceibalencuesta", "ceibalencuestauninstall"],
-    
-    py_modules = ["CeibalEncuesta"],
+    version = APP_VERSION,
+
+    scripts = ["scripts/ceibalencuesta", "scripts/ceibalencuestauninstall"],
+
+    packages = ["CeibalEncuesta"],
+    package_dir={'CeibalEncuesta': 'CeibalEncuesta'},
+    package_data = {'CeibalEncuesta': ['Iconos/*', 'chardet/*']},
 
     data_files =[
-    ("/usr/share/applications/", ["CeibalEncuesta.desktop"]),
-    ("",
-    ["CeibalEncuestaUninstall.py",
-    "Widgets.py",
-    "Globales.py"]),
-    
-    ("Iconos/", [
-    "Iconos/ceibal.png",
-    "Iconos/screen.png"]),
-    
-    ("chardet/",[
-    "chardet/big5freq.py",
-    "chardet/big5prober.py",
-    "chardet/chardistribution.py",
-    "chardet/charsetgroupprober.py",
-    "chardet/charsetprober.py",
-    "chardet/codingstatemachine.py",
-    "chardet/constants.py",
-    "chardet/escprober.py",
-    "chardet/escsm.py",
-    "chardet/eucjpprober.py",
-    "chardet/euckrfreq.py",
-    "chardet/euckrprober.py",
-    "chardet/euctwfreq.py",
-    "chardet/euctwprober.py",
-    "chardet/gb2312freq.py",
-    "chardet/gb2312prober.py",
-    "chardet/hebrewprober.py",
-    "chardet/__init__.py",
-    "chardet/jisfreq.py",
-    "chardet/jpcntx.py",
-    "chardet/langbulgarianmodel.py",
-    "chardet/langcyrillicmodel.py",
-    "chardet/langgreekmodel.py",
-    "chardet/langhebrewmodel.py",
-    "chardet/langhungarianmodel.py",
-    "chardet/langthaimodel.py",
-    "chardet/latin1prober.py",
-    "chardet/mbcharsetprober.py",
-    "chardet/mbcsgroupprober.py",
-    "chardet/mbcssm.py",
-    "chardet/sbcharsetprober.py",
-    "chardet/sbcsgroupprober.py",
-    "chardet/sjisprober.py",
-    "chardet/universaldetector.py",
-    "chardet/utf8prober.py"])])
-    
-import commands
-commands.getoutput('chmod -R 755 /usr/local/share/CeibalEncuesta')
-commands.getoutput('chmod 755 /usr/share/applications/CeibalEncuesta.desktop')
+        (APLICATION_PATH, ["data/CeibalEncuesta.desktop"]),
+    ]
+)
+
+
+DESKTOP_ENTRY_PATH = "%sCeibalEncuesta.desktop" % APLICATION_PATH
+
+commands.getoutput('chmod -R 755 %s/ceibalencuesta' % USER_BASE)
+commands.getoutput('chmod 755 %s' % DESKTOP_ENTRY_PATH)
+
+if os.path.exists(ESCRITORIO_PATH):
+    status, out = commands.getstatusoutput(
+        'cp %s %s' % (DESKTOP_ENTRY_PATH, ESCRITORIO_PATH))
+
+if os.path.exists(DESKTOP_PATH):
+    status, out = commands.getstatusoutput(
+        'cp %s %s' % (DESKTOP_ENTRY_PATH, DESKTOP_PATH))