Changeset 988deab in sasview

Timestamp:

Apr 20, 2018 9:07:13 AM (7 years ago)

Author:

Piotr Rozyczko <rozyczko@…>

Branches:

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

Children:

38f838e

Parents:

aefde77

Message:

modified the installer generator script for python3

File:

• installers/installer_generator.py (modified) (6 diffs, 1 prop)

installers/installer_generator.py

@@ -55 +55 @@
         for item in wild_cards:
             #['All (*.*)|*.*']
-            file_type, ext = string.split(item, "|*", 1)
+            file_type, ext = item.split("|*", 1)
             if ext.strip() not in ['.*', ''] and ext.strip() not in list_data:
                 list_data.append((ext, 'string', file_type))
@@ -61 +61 @@
         pass
     try:
-        file_type, ext = string.split(local_config.APPLICATION_WLIST, "|*", 1)
+        file_type, ext = local_config.APPLICATION_WLIST.split("|*", 1)
         if ext.strip() not in ['.', ''] and ext.strip() not in list_app:
             list_app.append((ext, 'string', file_type))
@@ -68 +68 @@
     try:
         for item in local_config.PLUGINS_WLIST:
-            file_type, ext = string.split(item, "|*", 1)
+            file_type, ext = item.split("|*", 1)
             if ext.strip() not in ['.', ''] and ext.strip() not in list_app:
                 list_app.append((ext, 'string', file_type))
@@ -83 +83 @@
     msg = ""
     if data_extension is not None and data_extension:
+        msg = "\n\n[Registry]\n"
         openwithlist = "OpenWithList\%s" % str(APPLICATION)
-        msg = "\n\n[Registry]\n"
         for (ext, type, _) in data_extension:
             list = os.path.join(ext, openwithlist)
@@ -192 +192 @@
     return msg
 
-dist_path = "dist"
+dist_path = "dist\sasview"
 def write_file():
     """
@@ -200 +200 @@
     msg += """Source: "%s\%s";\t""" % (dist_path, str(APPLICATION))
     msg += """DestDir: "{app}";\tFlags: ignoreversion\n"""
-    msg += """Source: "dist\*";\tDestDir: "{app}";\t"""
+    msg += """Source: "dist\sasview\*";\tDestDir: "{app}";\t"""
     msg += """Flags: ignoreversion recursesubdirs createallsubdirs\n"""
-    msg += """Source: "dist\plugin_models\*";\tDestDir: "{userdesktop}\..\.sasview\plugin_models";\t"""
+    msg += """Source: "dist\sasview\plugin_models\*";\tDestDir: "{userdesktop}\..\.sasview\plugin_models";\t"""
     msg += """Flags: recursesubdirs createallsubdirs\n"""
-    msg += """Source: "dist\compiled_models\*";\tDestDir: "{userdesktop}\..\.sasmodels\compiled_models";\t"""
-    msg += """Flags: recursesubdirs createallsubdirs\n"""
-    msg += """Source: "dist\config\custom_config.py";\tDestDir: "{userdesktop}\..\.sasview\config";\t"""
+    msg += """Source: "dist\sasview\custom_config.py";\tDestDir: "{userdesktop}\..\.sasview\config";\t"""
     msg += """Flags: recursesubdirs createallsubdirs\n"""
     #msg += """Source: "dist\default_categories.json";    DestDir: "{userdesktop}\..\.sasview";\t"""