Changeset 2986

Timestamp:

06/12/08 01:15:45 (5 years ago)

Author:

boltrix

Message:

Fixed some things to make Umit run under Windows XP. The modifications of some paths was not properly fixed on BasePaths? and other installation scripts. From now, Umit is compiling and running ok, despite the fact I'm having problems to run Nmap on Windows.

Location:

trunk

Files:

• install_scripts/windows/setup.nsi (modified) (1 diff)
• install_scripts/windows/setup.py (modified) (2 diffs)
• install_scripts/windows/umit_compiled.nsi (modified) (2 diffs)
• umitCore/BasePaths.py (modified) (6 diffs)
• umitCore/NmapCommand.py (modified) (2 diffs)
• umitCore/Paths.py (modified) (2 diffs)
• umitGUI/App.py (modified) (1 diff)

trunk/install_scripts/windows/setup.nsi

@@ -1 +1 @@
 !define py2exeOutputDir 'dist'
 !define exe             'Umit.exe'
-!define icon            'C:\Umit\share\icons\umit_48.ico'
+!define icon            'C:\Umit\share\icons\umit\umit_48.ico'
 !define compressor      'lzma'  ;one of 'zlib', 'bzip2', 'lzma'
 !define onlyOneInstance

trunk/install_scripts/windows/setup.py

@@ -39 +39 @@
 # 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')
-locale_dir = os.path.join('share', 'umit', 'locale')
+pixmaps_dir = os.path.join('share', 'pixmaps', 'umit')
+icons_dir = os.path.join('share', 'icons', 'umit')
+locale_dir = os.path.join('share', 'locale')
 config_dir = os.path.join('share', 'umit', 'config')
-docs_dir = os.path.join('share', 'umit', 'docs')
+docs_dir = os.path.join('share', 'doc', 'umits')
 misc_dir = os.path.join('share', 'umit', 'misc')
 
@@ -143 +143 @@
       cmdclass = {"py2exe":umit_py2exe},
       windows = [{"script" : "umit",
-                  "icon_resources" : [(1, os.path.join("share", "icons", "umit_48.ico"))]}],
+                  "icon_resources" : [(1, os.path.join(icons_dir,
+                                                       "umit_48.ico"))]}],
       options = {"py2exe":{"compressed":1,
                            "optimize":2,

trunk/install_scripts/windows/umit_compiled.nsi

@@ -5 +5 @@
 ;!define MUI_UNICON "share\icons\trash_32.ico" # Uninstaller icon
 !define MUI_HEADERIMAGE
-!define MUI_HEADERIMAGE_BITMAP "share\pixmaps\splash.bmp"
-!define MUI_HEADERIMAGE_UNBITMAP "share\pixmaps\splash.bmp"
+!define MUI_HEADERIMAGE_BITMAP "share\pixmaps\umit\splash.bmp"
+!define MUI_HEADERIMAGE_UNBITMAP "share\pixmaps\umit\splash.bmp"
 !define MUI_ABORTWARNING
 !define MUI_UNABORTWARNING
 
 !define APPLICATION_NAME "Umit"
-!define APPLICATION_VERSION "0.9.5RC1"
+!define APPLICATION_VERSION "0.9.5RC2"
 !define WINPCAP "winpcap-nmap-4.01.exe"
 
@@ -54 +54 @@
   File COPYING_WINPCAP
   File README
-  File share\icons\umit_*.ico
+  File share\icons\umit\umit_*.ico
 
   File /r dist\*.*

trunk/umitCore/BasePaths.py

@@ -37 +37 @@
 main_dir = os.path.abspath(os.path.dirname(sys.argv[0]))
 if hasattr(sys, "frozen"):
-    main_dir = dirname(sys.executable)
+    main_dir = os.path.dirname(sys.executable)
 
 CONFIG_DIR = os.path.join(main_dir, "share", "umit", "config")
@@ -57 +57 @@
                   umit_opf = 'umit.opf',
                   umit_opt = 'umit.opt',
-                  pixmaps_dir = os.path.join('share', 'pixmaps'),
-                  i18n_dir = os.path.join('share','locale'),
+                  pixmaps_dir = PIXMAPS_DIR,
+                  i18n_dir = LOCALE_DIR,
                   i18n_message_file = 'umit.mo',
                   scan_results_extension = 'usr',  # comes from umit scan result
@@ -65 +65 @@
                   basic_search_sequence = [HOME, CURRENT_DIR],
                   config_search_sequence = [HOME, CURRENT_DIR],
-                  pixmaps_search_sequence = [os.path.join(CURRENT_DIR, 'share', 'pixmaps'),
+                  pixmaps_search_sequence = [os.path.join(CURRENT_DIR, PIXMAPS_DIR),
                                              HOME],
-                  i18n_search_sequence = [os.path.join(CURRENT_DIR, 'share', 'locale'), HOME],
+                  i18n_search_sequence = [os.path.join(CURRENT_DIR, LOCALE_DIR), HOME],
                   umitdb = "umit.db",
                   services = "nmap-services",
@@ -84 +84 @@
                            config_search_sequence = [os.path.join(HOME, base_paths['config_dir']),
                                                      CURRENT_DIR, '/etc'],
-                           pixmaps_search_sequence = [os.path.join(CURRENT_DIR,
-                                                                   'share',
-                                                                   'pixmaps'),
-                                                      '/usr/share/pixmaps',
+                           pixmaps_search_sequence = [os.path.join(CURRENT_DIR, PIXMAPS_DIR),
+                                                      '/usr/share/pixmaps/umit',
                                                       '/opt/umit', HOME],
-                           i18n_search_sequence = [os.path.join(CURRENT_DIR, 'share', 'locale'),
+                           i18n_search_sequence = [os.path.join(CURRENT_DIR, LOCALE_DIR),
                                                    '/usr/share/locale',
                                                    HOME, CURRENT_DIR]))
@@ -95 +93 @@
     PROGRAM_FILES = os.environ.get("PROGRAMFILES", "\\")
     UMIT_DIR = os.path.join(PROGRAM_FILES, "Umit")
-    PIXMAPS_DIR = os.path.join(UMIT_DIR, 'share', 'pixmaps')
+    PIXMAPS_DIR = os.path.join(UMIT_DIR, PIXMAPS_DIR)
     
     base_paths.update(dict(\
@@ -101 +99 @@
         config_search_sequence = [UMIT_DIR, PROGRAM_FILES, HOME, CURRENT_DIR],
         pixmaps_search_sequence = [PIXMAPS_DIR, PROGRAM_FILES,
-                                   os.path.join(CURRENT_DIR, 'share', 'pixmaps'),
+                                   os.path.join(CURRENT_DIR, PIXMAPS_DIR),
                                    HOME],
         i18n_search_sequence = [UMIT_DIR, PROGRAM_FILES,
-                                os.path.join(CURRENT_DIR, 'share', 'locale'), HOME],))
+                                os.path.join(CURRENT_DIR, LOCALE_DIR), HOME],))
 
 elif PLATFORM == 'darwin':

trunk/umitCore/NmapCommand.py

@@ -22 +22 @@
 
 import sys
+sys.path.append(".")
 import os
 import re
@@ -432 +433 @@
                                   loadTestsFromTestCase(SplitQuotedTest))
 
-    scan = NmapCommand('%s -T4 -iL "/home/adriano/umit/test/targets\ teste"' % \
+    scan = NmapCommand('%s -T4 192.168.0.101"' % \
                        nmap_command_path)
     scan.run_scan()

trunk/umitCore/Paths.py

@@ -107 +107 @@
             config_dir = base_paths['user_dir']
             config_file = supposed_file
-            log.debug(">>> Using config files in user home \
-directory: %s" % config_file)
+            log.debug(">>> Using config files in user home directory: %s" \
+                      % config_file)
 
         elif not exists(supposed_file)\
@@ -156 +156 @@
 
         log.debug(">>> Config file: %s" % config_file)
+        log.debug(">>> Locale: %s" % self.locale_dir)
+        log.debug(">>> Pixmaps: %s" % self.pixmaps_dir)
+        log.debug(">>> Icons: %s" % self.icons_dir)
+        log.debug(">>> Misc: %s" % self.misc_dir)
+        log.debug(">>> Docs: %s" % self.docs_dir)
 
     def update_config_dir(self, config_dir):

trunk/umitGUI/App.py

@@ -117 +117 @@
         import gobject
         from umitGUI.Splash import Splash
+        log.info(">>> Pixmaps path: %s" % Path.pixmaps_dir)
 
         if not is_maemo():