Changeset 450c6f6 in sasview

Timestamp:

Oct 7, 2016 6:00:38 PM (8 years ago)

Author:

Piotr Rozyczko <rozyczko@…>

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, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

2abe6bf

Parents:

1efba268

git-author:

Piotr Rozyczko <rozyczko@…> (10/07/16 17:58:29)

git-committer:

Piotr Rozyczko <rozyczko@…> (10/07/16 18:00:38)

Message:

Fixed fallout from a file removal. Please test your commits!

Location:

sasview

Files:

• installer_generator.py (modified) (1 diff)
• setup_exe.py (modified) (1 diff)

sasview/installer_generator.py

@@ -203 +203 @@
     msg += """Source: "dist\config\custom_config.py";\tDestDir: "{userdesktop}\..\.sasview\config";\t""" 
     msg += """Flags: recursesubdirs createallsubdirs\n"""
-    msg += """Source: "dist\default_categories.json";    DestDir: "{userdesktop}\..\.sasview";\t""" 
-    msg += """DestName: "categories.json";\n"""
+    #msg += """Source: "dist\default_categories.json";    DestDir: "{userdesktop}\..\.sasview";\t""" 
+    #msg += """DestName: "categories.json";\n"""
     msg += """;\tNOTE: Don't use "Flags: ignoreversion" on any shared system files"""
     return msg

sasview/setup_exe.py

@@ -239 +239 @@
     data_files.append(('.', [f]))
 
-f = 'default_categories.json'
-if os.path.isfile(f):
-    data_files.append(('.', [f]))
+#f = 'default_categories.json'
+#if os.path.isfile(f):
+#    data_files.append(('.', [f]))
 
 # numerical libraries