From 503fcee4329f2ce5c4ee22306effed9f57167a17 Mon Sep 17 00:00:00 2001 From: Dion Moult Date: Tue, 7 Apr 2020 12:57:07 +1000 Subject: [PATCH] Remove uninstall feature, as the built-in Blender remove plugin now handles this --- .../blenderbim/scripts/addons/bim/__init__.py | 1 - .../blenderbim/scripts/addons/bim/operator.py | 38 ------------------- .../blenderbim/scripts/addons/bim/ui.py | 4 +- 3 files changed, 1 insertion(+), 42 deletions(-) diff --git a/src/ifcblenderexport/blenderbim/scripts/addons/bim/__init__.py b/src/ifcblenderexport/blenderbim/scripts/addons/bim/__init__.py index cbac52d71e..2558bd9bd3 100644 --- a/src/ifcblenderexport/blenderbim/scripts/addons/bim/__init__.py +++ b/src/ifcblenderexport/blenderbim/scripts/addons/bim/__init__.py @@ -94,7 +94,6 @@ if bpy is not None: operator.AssignContext, operator.SetViewPreset1, operator.OpenUpstream, - operator.Uninstall, prop.BcfTopic, prop.BcfTopicLabel, prop.BcfTopicFile, diff --git a/src/ifcblenderexport/blenderbim/scripts/addons/bim/operator.py b/src/ifcblenderexport/blenderbim/scripts/addons/bim/operator.py index 061a8dd84e..c545a2f047 100644 --- a/src/ifcblenderexport/blenderbim/scripts/addons/bim/operator.py +++ b/src/ifcblenderexport/blenderbim/scripts/addons/bim/operator.py @@ -1576,41 +1576,3 @@ class OpenUpstream(bpy.types.Operator): elif self.page == 'community': webbrowser.open('https://community.osarch.org/') return {'FINISHED'} - - -class Uninstall(bpy.types.Operator): - bl_idname = 'bim.uninstall' - bl_label = 'Uninstall BlenderBIM' - - def execute(self, context): - import shutil - import glob - - cwd = os.path.dirname(os.path.realpath(__file__)) - addon_dir = os.path.join(cwd, '..') - files = ['ifcdiff.py', 'ordered_set.py', 'pyparsing.py', 'six.py'] - directories = ['OCC', 'bcfplugin', 'dateutil', 'deepdiff', - 'elementpath', 'ifcopenshell', 'jsonpickle', 'lib', 'pystache', - 'pytz', 'svgwrite', 'xmlschema'] - - for f in files: - path = os.path.join(addon_dir, f) - if os.path.isfile(path): - os.remove(path) - - lib_dir = os.path.join(cwd, '..', 'lib') - lib_files = glob.glob(os.path.join(lib_dir, '..', '..', '..', 'lib*.so*')) - - for lib_file in lib_files: - try: - os.remove(lib_file) - except: - print('Error while deleting file: ', lib_file) - shutil.rmtree(os.path.join(lib_dir, '..', '..', '..', 'oce-0.17'), ignore_errors=True) - - for directory in directories: - path = os.path.join(addon_dir, directory) - shutil.rmtree(path, ignore_errors=True) - - bpy.ops.preferences.addon_remove(module='blenderbim') - return {'FINISHED'} diff --git a/src/ifcblenderexport/blenderbim/scripts/addons/bim/ui.py b/src/ifcblenderexport/blenderbim/scripts/addons/bim/ui.py index 4270d4099c..e3de5066b2 100644 --- a/src/ifcblenderexport/blenderbim/scripts/addons/bim/ui.py +++ b/src/ifcblenderexport/blenderbim/scripts/addons/bim/ui.py @@ -842,7 +842,7 @@ class BIM_UL_topics(bpy.types.UIList): class BIM_ADDON_preferences(bpy.types.AddonPreferences): - bl_idname = __package__ + bl_idname = 'blenderbim' def draw(self, context): layout = self.layout @@ -852,5 +852,3 @@ class BIM_ADDON_preferences(bpy.types.AddonPreferences): row = layout.row() row.operator('bim.open_upstream', text='Visit Wiki').page = 'wiki' row.operator('bim.open_upstream', text='Visit Community').page = 'community' - row = layout.row() - row.operator('bim.uninstall')