Changeset 4265

Show
Ignore:
Timestamp:
03/04/09 16:06:45 (4 years ago)
Author:
luis
Message:

Merged revisions 4240-4247 via svnmerge from
http://svn.umitproject.org/svnroot/umit/trunk

........

r4240 | gpolo | 2009-03-02 16:15:33 +0000 (Mon, 02 Mar 2009) | 1 line


Restructuring umit, second step. See ticket #229.

........

r4241 | gpolo | 2009-03-02 16:19:09 +0000 (Mon, 02 Mar 2009) | 1 line


Removing old directories

........

r4242 | gpolo | 2009-03-02 16:19:42 +0000 (Mon, 02 Mar 2009) | 1 line


Removed umitInterfaceEditor now

........

r4243 | gpolo | 2009-03-02 16:21:20 +0000 (Mon, 02 Mar 2009) | 1 line


Fixed some remaining old umitCore imports

........

r4244 | gpolo | 2009-03-02 18:26:14 +0000 (Mon, 02 Mar 2009) | 1 line


Renamed UMIT_CONFIG_DIR to UMIT_CFG_DIR so the unix installer doesn't replace its content when installing umit.

........

r4245 | gpolo | 2009-03-02 18:50:36 +0000 (Mon, 02 Mar 2009) | 1 line


Adjusted installers for the new structure. This concludes ticket #229.

........

r4246 | gpolo | 2009-03-02 18:59:02 +0000 (Mon, 02 Mar 2009) | 1 line


Removed unused shell scripts.

........

r4247 | gpolo | 2009-03-02 19:03:54 +0000 (Mon, 02 Mar 2009) | 1 line


Updated version_update.py and ran it.

........

Location:
branch/InterfaceEditor
Files:
6 removed
9 modified
12 copied

Legend:

Unmodified
Added
Removed

  • branch/InterfaceEditor

    • Property svnmerge-integrated changed from /trunk:1-4239 to /trunk:1-4247

  • branch/InterfaceEditor/MANIFEST.in

    r4263 r4265  
    1 include umit umit_scheduler.py README 
     1include bin/umit bin/umit_scheduler.py README 
    22include COPYING COPYING_HIGWIDGETS COPYING_NMAP COPYING_WINPCAP 
    33recursive-include share/pixmaps/umit *.png *.svg *.xpm umit.opf umit.opt 
    … …  
    99recursive-include share/umit/misc *.dmp 
    1010recursive-include share/umit/sql *.sql 
    11 recursive-include umitCore *.py 
    12 recursive-include umitGUI *.py 
    13 recursive-include umitInventory *.py 
    14 recursive-include umitDB *.py 
    15 recursive-include umitPlugin *.py 
    16 recursive-include umitInterfaceEditor *.py 
     11recursive-include umit *.py 
    1712recursive-include higwidgets *.py 

  • branch/InterfaceEditor/higwidgets/higrichlists.py

    r4259 r4265  
    3030import gobject 
    3131from higwidgets.higbuttons import HIGButton 
    32 from umitCore.I18N import _ 
     32from umit.core.I18N import _ 
    3333 
    3434class HIGRichRow(gtk.EventBox): 

  • branch/InterfaceEditor/higwidgets/higtooltips.py

    r4259 r4265  
    99import cairo 
    1010 
    11 from umitCore.I18N import _ 
     11from umit.core.I18N import _ 
    1212 
    1313class HIGTooltipData(object): 

  • branch/InterfaceEditor/install_scripts/macosx/setup.py

    r4259 r4265  
    2828from glob import glob 
    2929 
    30 from umitCore.Version import VERSION 
     30from umit.core.Version import VERSION 
     31 
     32BIN_DIRNAME = 'bin' 
    3133 
    3234# Directories for POSIX operating systems 
    … …  
    109111Umit command creator wizards.""", 
    110112      version = VERSION, 
    111       scripts = ['umit.py'], 
    112       app = ["umit.py"], 
    113       packages = ['', 'umitCore', 'umitGUI', 'higwidgets'], 
     113      scripts = [ 
     114          os.path.join(BIN_DIRNAME, 'umit'), 
     115          os.path.join(BIN_DIRNAME, 'umit_scheduler.py')], 
     116      app = [os.path.join(BIN_DIRNAME, 'umit')], 
     117      packages = [ 
     118          'umit', 'umit.core', 'umit.core.radialnet', 'umit.db', 
     119          'umit.gui', 'umit.gui.radialnet', 'umit.interfaceeditor', 
     120          'umit.interfaceeditor.selectborder', 'umit.inventory', 
     121          'umit.plugin', 'higwidgets'], 
    114122      data_files = data_files, 
    115123      options=dict(py2app=dict(argv_emulation=True, 

  • branch/InterfaceEditor/install_scripts/unix/setup.py

    r4264 r4265  
    3434from stat import * 
    3535 
    36 from umitCore.Version import VERSION 
     36from umit.core.Version import VERSION 
    3737from utils import msgfmt 
    3838 
    … …  
    261261 
    262262        pcontent = "" 
    263         paths_file = os.path.join("umitCore", "BasePaths.py") 
     263        paths_file = os.path.join("umit", "core", "BasePaths.py") 
    264264        installed_files = self.get_outputs() 
    265265 
    … …  
    360360          os.path.join(BIN_DIRNAME, 'umit_scheduler.py')], 
    361361      packages = [ 
    362           'umitCore', 'umitCore.radialnet', 'umitDB', 'umitGUI', 
    363           'umitInventory', 'umitPlugin', 'umitGUI.radialnet', 
    364           'umitInterfaceEditor', 'umitInterfaceEditor.selectborder', 
    365           'higwidgets', 'utils'], 
     362          'umit', 'umit.core', 'umit.core.radialnet', 'umit.db', 
     363          'umit.gui', 'umit.gui.radialnet', 'umit.interfaceeditor', 
     364          'umit.interfaceeditor.selectborder', 'umit.inventory', 
     365          'umit.plugin', 'higwidgets', 'utils'], 
    366366      data_files = data_files, 
    367367      cmdclass = { 

  • branch/InterfaceEditor/install_scripts/utils/version_update.py

    r4259 r4265  
    3333 
    3434UMIT_VERSION = os.path.join("share", "umit", "config", "umit_version") 
    35 VERSION_PY = os.path.join("umitCore", "Version.py") 
     35VERSION_PY = os.path.join("umit", "core", "Version.py") 
    3636UMIT_COMPILED_NSI = os.path.join("install_scripts", "windows", "umit_compiled.nsi") 
    3737 
    3838def get_winpcap(): 
    3939    windeps = os.path.join("install_scripts", "windows", 
    40                            "win_dependencies", "winpcap*") 
     40                           "win_dependencies", "WinPcap*") 
    4141    return os.path.split(glob(windeps)[0])[1] 
    4242 

  • branch/InterfaceEditor/install_scripts/windows/setup.py

    r4264 r4265  
    2929from glob import glob 
    3030 
    31 from umitCore.Version import VERSION 
     31from umit.core.Version import VERSION 
    3232 
    3333BIN_DIRNAME = 'bin' 
    … …  
    191191          os.path.join(BIN_DIRNAME, 'umit_scheduler.py')], 
    192192      packages = [ 
    193           'umitCore','umitCore.radialnet', 'umitDB', 'umitGUI', 
    194           'umitInventory', 'umitPlugin', 'umitGUI.radialnet', 
    195           'umitInterfaceEditor', 'umitInterfaceEditor.selectborder', 
    196           'higwidgets'], 
     193          'umit', 'umit.core', 'umit.core.radialnet', 'umit.db', 
     194          'umit.gui', 'umit.gui.radialnet', 'umit.interfaceeditor', 
     195          'umit.interfaceeditor.selectborder', 'umit.inventory', 
     196          'umit.plugin', 'higwidgets'], 
    197197      data_files = data_files, 
    198198      zipfile = None, 

  • branch/InterfaceEditor/share/umit/config/umit_version

    r4259 r4265  
    1 0.9.5RC1 
     11.0beta2