Changeset 25f223b in sasview


Ignore:
Timestamp:
Feb 17, 2015 8:54:39 AM (9 years ago)
Author:
krzywon
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:
3ef5b2f, 66f21cd
Parents:
0c4bca6
Message:

Modified setup.py to look for defaults.json instead of defaults.xml when
loading the data loader Registry.

Files:
2 edited

Legend:

Unmodified
Added
Removed

  • sasview/installer.iss

    r3a39c2e r25f223b  
    3131Root: HKCR;     Subkey: ".asc\OpenWithList\SasView.exe";         Flags: uninsdeletekey noerror 
    3232Root: HKCR;     Subkey: ".dat\OpenWithList\SasView.exe";         Flags: uninsdeletekey noerror 
    33 Root: HKCR;     Subkey: ".tif\OpenWithList\SasView.exe";         Flags: uninsdeletekey noerror 
    3433Root: HKCR;     Subkey: ".abs\OpenWithList\SasView.exe";         Flags: uninsdeletekey noerror 
    3534Root: HKCR;     Subkey: ".d1d\OpenWithList\SasView.exe";         Flags: uninsdeletekey noerror 
    36 Root: HKCR;     Subkey: ".sas\OpenWithList\SasView.exe";         Flags: uninsdeletekey noerror 
     35Root: HKCR;     Subkey: ".sans\OpenWithList\SasView.exe";        Flags: uninsdeletekey noerror 
    3736Root: HKCR;     Subkey: ".nxs\OpenWithList\SasView.exe";         Flags: uninsdeletekey noerror 
    3837Root: HKCR; Subkey: "applications\SasView.exe\shell\open\command";      ValueType: string; ValueName: "";       ValueData: """{app}\SasView.exe""  ""%1""";      Flags: uninsdeletevalue noerror 
    … …  
    4140Root: HKCU;     Subkey: "Software\Classes\.asc\OpenWithList\SasView.exe";        Flags: uninsdeletekey noerror 
    4241Root: HKCU;     Subkey: "Software\Classes\.dat\OpenWithList\SasView.exe";        Flags: uninsdeletekey noerror 
    43 Root: HKCU;     Subkey: "Software\Classes\.tif\OpenWithList\SasView.exe";        Flags: uninsdeletekey noerror 
    4442Root: HKCU;     Subkey: "Software\Classes\.abs\OpenWithList\SasView.exe";        Flags: uninsdeletekey noerror 
    4543Root: HKCU;     Subkey: "Software\Classes\.d1d\OpenWithList\SasView.exe";        Flags: uninsdeletekey noerror 
    46 Root: HKCU;     Subkey: "Software\Classes\.sas\OpenWithList\SasView.exe";        Flags: uninsdeletekey noerror 
     44Root: HKCU;     Subkey: "Software\Classes\.sans\OpenWithList\SasView.exe";       Flags: uninsdeletekey noerror 
    4745Root: HKCU;     Subkey: "Software\Classes\.nxs\OpenWithList\SasView.exe";        Flags: uninsdeletekey noerror 
    4846Root: HKCU; Subkey: "Software\Classes\applications\SasView.exe\shell\open\command";     ValueType: string; ValueName: "";       ValueData: """{app}\SasView.exe""  ""%1""";      Flags: uninsdeletevalue noerror 

  • setup.py

    rd8c4019 r25f223b  
    187187# sas.dataloader 
    188188package_dir["sas.dataloader"] = os.path.join("src", "sas", "dataloader") 
    189 package_data["sas.dataloader.readers"] = ['defaults.xml','schema/*.xsd'] 
     189package_data["sas.dataloader.readers"] = ['defaults.json','schema/*.xsd'] 
    190190packages.extend(["sas.dataloader","sas.dataloader.readers","sas.dataloader.readers.schema"]) 
    191191 
Note: See TracChangeset for help on using the changeset viewer.