Changeset f9505c30 in sasview


Ignore:
Timestamp:
Dec 18, 2011 4:57:59 PM (12 years ago)
Author:
Jae Cho <jhjcho@…>
Branches:
master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload
Children:
cd075e8
Parents:
f540e26
Message:

more fix for cleaner config folder

Files:
3 edited

Legend:

Unmodified
Added
Removed

  • sansguiframe/src/sans/guiframe/customdir.py

    r74b5523 rf9505c30  
    2424    if not os.path.isdir(dir): 
    2525        os.makedirs(dir) 
    26   
     26    file = os.path.join(dir, "custom_config.py") 
    2727    # Place example user models as needed 
    28     if not os.path.isfile(os.path.join(dir,"custom_config.py")): 
    29         shutil.copy(os.path.join(path, "custom_config.py"), dir) 
     28    if not os.path.isfile(file): 
     29        shutil.copyfile(os.path.join(path, "custom_config.py"), file) 
    3030         
    3131    return dir 

  • sansview/installer_new.iss

    rf540e26 rf9505c30  
    6868Source: "dist\SansView.exe";    DestDir: "{app}";       Flags: ignoreversion 
    6969Source: "dist\*";       DestDir: "{app}";       Flags: ignoreversion recursesubdirs createallsubdirs 
    70 Source: "dist\plugin_models\*"; DestDir: "{userappdata}\..\.sansview\plugins";  Flags: ignoreversion recursesubdirs createallsubdirs 
    71 Source: "dist\custom_config.py";        DestDir: "{userappdata}\..\.sansview\config";   Flags: ignoreversion recursesubdirs createallsubdirs 
     70Source: "dist\plugin_models\*"; DestDir: "{userappdata}\..\.sansview\plugins";  Flags: recursesubdirs createallsubdirs 
     71Source: "dist\config\custom_config.py"; DestDir: "{userappdata}\..\.sansview\config";   Flags: recursesubdirs createallsubdirs 
    7272;       NOTE: Don't use "Flags: ignoreversion" on any shared system files 
    7373 

  • sansview/setup_exe.py

    r13bc1b3a rf9505c30  
    217217f = 'custom_config.py' 
    218218if os.path.isfile(f): 
    219     data_files.append(('.', [f])) 
     219    data_files.append(('config', [f])) 
    220220f = 'local_config.py' 
    221221if os.path.isfile(f): 
Note: See TracChangeset for help on using the changeset viewer.