Changed the way we locate the natinfo/ directory.

master
Pacman Ghost 7 years ago
parent 71bcb6cd5a
commit 993df06c11
  1. 2
      _freeze.py
  2. 8
      main.py

@ -26,7 +26,7 @@ extra_files.extend( get_extra_files( "index/*.txt" ) )
extra_files.extend( get_extra_files( "resources/*.ico" ) ) extra_files.extend( get_extra_files( "resources/*.ico" ) )
extra_files.extend( get_extra_files( "resources/*.png" ) ) extra_files.extend( get_extra_files( "resources/*.png" ) )
extra_files.extend( get_extra_files( "ui/*.ui" ) ) extra_files.extend( get_extra_files( "ui/*.ui" ) )
extra_files.extend( get_extra_files( "natinfo/*" ) ) # nb: we need the natinfo directory, but it gets pulled in as part of the asl_cards module.
build_options = { build_options = {
"packages": [ "os" , "sqlalchemy" ] , "packages": [ "os" , "sqlalchemy" ] ,
"excludes": [ "tkinter" ] , "excludes": [ "tkinter" ] ,

@ -55,11 +55,9 @@ def do_main( args ) :
globals.debug_settings = QSettings( fname , QSettings.IniFormat ) globals.debug_settings = QSettings( fname , QSettings.IniFormat )
# initialize # initialize
dname = os.path.join( globals.base_dir , "natinfo" ) natinfo.load(
if not os.path.isdir( dname ) : os.path.join( globals.base_dir , "asl_cards/natinfo" )
# nb: for a dev environment (or you can create a symlink natinfo -> asl_cards/natinfo) )
dname = os.path.join( globals.base_dir , "asl_cards/natinfo" )
natinfo.load( dname )
# do main processing # do main processing
app = QApplication( sys.argv ) app = QApplication( sys.argv )

Loading…
Cancel
Save