Changeset 1060

Timestamp:

07/20/07 00:17:39 (6 years ago)

Author:

boltrix

Message:

Changed some paths to setup.py in order to normalize installation paths. It seens that I made a mess with the paths in the past, and now I'm getting it back to the rails.

Files:

• trunk/setup.py (modified) (2 diffs)

trunk/setup.py

@@ -55 +55 @@
 # Main Variables
 
-# Directories
+# Directories for POSIX operating systems
+# These are created after a "install" or "py2exe" command
+# These directories are relative to the installation or dist directory
+# Ex: python setup.py install --prefix=/tmp/umit
+# Will create the directory /tmp/umit with the following directories
 pixmaps_dir = os.path.join('share', 'pixmaps')
 icons_dir = os.path.join('share', 'icons')
@@ -296 +300 @@
 
     def adequate_umit_conf(self):
-        install_config_dir = os.path.join("config")
-        install_pixmaps_dir = os.path.join("share", "pixmaps")
-        install_icons_dir = os.path.join("share", "icons")
-        install_locale_dir = os.path.join("share", "locale")
-        install_docs_dir = os.path.join("docs")
-
-        config = dict(config_file = os.path.join(install_config_dir, 'umit.conf'),
-                      config_dir = install_config_dir,
+        # These are the paths that are going to be saved inside umit.conf
+        #install_config_dir = os.path.join("share", "umit", "config")
+        #install_pixmaps_dir = os.path.join("share", "pixmaps")
+        #install_icons_dir = os.path.join("share", "icons")
+        #install_locale_dir = os.path.join("share", "locale")
+        #install_misc_dir = os.path.join("share", "misc")
+        #install_docs_dir = os.path.join("docs")
+
+        config = dict(config_file = os.path.join(config_dir, 'umit.conf'),
+                      config_dir = config_dir,
                       user_dir = os.path.join(os.path.expanduser("~"), user_dir),
-                      docs_dir = install_docs_dir,
-                      pixmaps_dir = install_pixmaps_dir,
-                      icons_dir = install_icons_dir,
-                      locale_dir = install_locale_dir,
-                      umit_icon = os.path.join(install_icons_dir, "umit_48.ico"),
+                      docs_dir = docs_dir,
+                      pixmaps_dir = pixmaps_dir,
+                      icons_dir = icons_dir,
+                      locale_dir = locale_dir,
+                      misc_dir = misc_dir,
+                      umit_icon = os.path.join(icons_dir, "umit_48.ico"),
                       nmap_command_path = "nmap")