Changeset 5865

Timestamp:

08/26/10 00:39:25 (3 years ago)

Author:

diogo

Message:

setup script fixed

Location:

network-scanner/branches/GSoC2010

Files:

• install_scripts/common.py (modified) (1 diff)
• setup.py (modified) (5 diffs)
• umit/core/qs/DataHandler.py (modified) (1 diff)

network-scanner/branches/GSoC2010/install_scripts/common.py

@@ -7 +7 @@
 BIN_DIRNAME = 'bin'
 UMIT_MAIN = os.path.join(BIN_DIRNAME, 'umit')
+QUICKSCAN_LAUNCHER = os.path.join(BIN_DIRNAME, 'quickscan_launcher.py')
 UMIT_SCHEDULER = os.path.join(BIN_DIRNAME, 'umit_scheduler.py')
 # These directories are relative to the installation or dist directory

network-scanner/branches/GSoC2010/setup.py

@@ -45 +45 @@
 from install_scripts import common
 
+NT = os.name == 'nt'
+
 py2exe_cmdclass = py2exe_options = py2app_options = revert_rename = None
 if 'py2exe' in sys.argv:
@@ -248 +250 @@
         self.build_mo_files()
         self.build_html_doc()
+        self.build_clann()
+        if not NT:
+            self.build_keybinder()
         build.run(self)
+        
+    def build_clann(self):
+        cur = os.getcwd()
+        os.chdir("umit/clann")
+        os.system("make")
+        os.chdir(cur)
+    
+    def build_keybinder(self):
+        cur = os.getcwd()
+        os.chdir("umit/libkeybinder")
+        os.system("make")
+        os.chdir(cur)
 
 
@@ -320 +337 @@
         # UMIT_SCHEDULER
         self._replace_path(os.path.join(common.UMIT_SCHEDULER))
+        # QUICKSCAN
+        self._replace_path(os.path.join(common.QUICKSCAN_LAUNCHER))
         
     def _replace_path(self, file):
@@ -429 +448 @@
         os.mkdir(os.path.join(folder_dist, PLUGINS_TEMP_DIR))
         os.mkdir(os.path.join(folder_dist, PLUGINS_DOWNLOAD_DIR))
+        
     def run(self):
         from distutils.filelist import FileList
@@ -520 +540 @@
         scripts = [
             common.UMIT_MAIN,
-            os.path.join(BIN_DIRNAME, 'umit_scheduler.py')],
+            os.path.join(BIN_DIRNAME, 'umit_scheduler.py'),
+            common.QUICKSCAN_LAUNCHER],
         packages = [
             'umit', 'umit.core', 'umit.core.radialnet', 'umit.db',
             'umit.gui', 'umit.gui.radialnet', 'umit.interfaceeditor',
             'umit.interfaceeditor.selectborder', 'umit.inventory',
-            'umit.merger', 'umit.plugin', 'higwidgets'],
+            'umit.merger', 'umit.plugin', 'higwidgets', 'umit.core.qs',
+            'umit.gui.qs', 'umit.scan', 'umit.scan.zion', 'umit.scan.zion.gui',
+            'umit.libkeybinder', 'umit.nsefacilitator', 'umit.preferences',
+            'umit.preferences.conf', 'umit.preferences.widgets'],
         data_files = data_files,
         cmdclass = cmdclasses,

network-scanner/branches/GSoC2010/umit/core/qs/DataHandler.py

@@ -48 +48 @@
     def handler(self):
         #to handle data
+        pass
 
     def return_result(self, someObj):