Changeset 4214

Show
Ignore:
Timestamp:
02/28/09 21:45:29 (4 years ago)
Author:
gpolo
Message:

Moved umitDB/sql to share/umit/sql, updated installers. This also fixes
ticket #220.

Location:
trunk
Files:
4 modified
1 moved

Legend:

Unmodified
Added
Removed

  • trunk/MANIFEST.in

    r4166 r4214  
    1 include umit umit-scheduler README 
     1include umit umit_scheduler.py README 
    22include COPYING COPYING_HIGWIDGETS COPYING_NMAP COPYING_WINPCAP 
    33recursive-include share/pixmaps/umit *.png *.svg *.xpm umit.opf umit.opt 
    … …  
    88recursive-include share/umit/config *.xml *.conf *.usp umit_version *.db *.log 
    99recursive-include share/umit/misc *.dmp 
     10recursive-include share/umit/sql *.sql 
    1011recursive-include umitCore *.py 
    1112recursive-include umitGUI *.py 

  • trunk/install_scripts/unix/setup.py

    r4213 r4214  
    9292 
    9393        # umitDB SQL 
    94         (sql_dir, glob(os.path.join('umitDB', 'sql', '*.sql'))), 
     94        (sql_dir, glob(os.path.join(sql_dir, '*.sql'))), 
    9595 
    9696        (misc_dir, glob(os.path.join(misc_dir, '*.dmp'))), 
    … …  
    249249                                 S_IROTH) 
    250250 
    251  
    252251    def fix_paths(self): 
    253252        interesting_paths = {"CONFIG_DIR":config_dir, 
    … …  
    292291              ("#"*10, VERSION, "#"*10) 
    293292        print 
    294  
    295293 
    296294 
    … …  
    329327              ("#" * 10, VERSION, "#" * 10) 
    330328        print 
     329 
    331330 
    332331##################### Umit banner ######################## 

  • trunk/install_scripts/windows/setup.py

    r4213 r4214  
    55# Copyright (C) 2007-2008 Adriano Monteiro Marques 
    66# 
    7 # Author: Adriano Monteiro Marques <adriano@umitproject.org> 
     7# Authors: Adriano Monteiro Marques <adriano@umitproject.org> 
     8#          Guilherme Polo <ggpolo@gmail.com> 
    89# 
    910# This program is free software; you can redistribute it and/or modify 
    … …  
    106107 
    107108        # umitDB SQL 
    108         (sql_dir, glob(os.path.join("umitDB/sql", "*.sql"))), 
     109        (sql_dir, glob(os.path.join(sql_dir, '*.sql'))), 
    109110 
    110111        (misc_dir, glob(os.path.join(misc_dir, '*.dmp'))), 

  • trunk/share/umit/sql

  • trunk/umitDB/setup/database_setup.py

    r4097 r4214  
    2525import sys 
    2626 
    27 _UMIT_ROOT = os.path.join(os.pardir, os.pardir) 
    28 _SQL_PATH = os.path.join(os.pardir, 'sql') 
     27_UMIT_ROOT = os.path.abspath( 
     28        os.path.join( 
     29            os.path.dirname(os.path.abspath(__file__)), os.pardir, os.pardir)) 
     30_SQL_PATH = os.path.join(_UMIT_ROOT, 'share', 'umit', 'sql') 
     31print _UMIT_ROOT, _SQL_PATH 
    2932sys.path.insert(0, _UMIT_ROOT) 
    3033from umitDB._database import sql, database