From 5897655bb957c25aab1b9edb5c900598506d7c33 Mon Sep 17 00:00:00 2001 From: Donna Wu Date: Thu, 24 Mar 2016 11:28:33 +0800 Subject: [PATCH] Windows: delete useless code of installing extensions --- windows/lib/WixSDK.js | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/windows/lib/WixSDK.js b/windows/lib/WixSDK.js index a6e3d36..f0840cf 100644 --- a/windows/lib/WixSDK.js +++ b/windows/lib/WixSDK.js @@ -257,20 +257,14 @@ function(app_path, xwalk_path, meta_data, callback) { }); } - // Extensions are supposed to be in the source application root dir: app_path. - // Then we copy them to the sub-directory of the installer folder: - // app_files_folder/xwalk-extensions - // So, if we still fully copy the source application root directory, all the - // extensions will be duplicated. - // Extensions can be divided by categories in seperate directories. + // Only .dll files in extension folders will be picked up into + // app_files_folder/xwalk-extensions. this._manifest.extensions.forEach(function(extDir) { installExtensionDlls(extDir, app_extensions_folder); - if (path.normalize(path.dirname(extDir)) == path.normalize(app_path)) { - extensions_relative_dir.push(path.relative(app_path, extDir)); - } }.bind(this)); // Skip in-folder extensions copying to avoid duplication. + // Because the needed extension files has already be installed by previous step. installFiles(app_path, app_files_folder, this._manifest.extensions); var program_menu_folder_ref = product.ele('DirectoryRef', { Id: 'ApplicationProgramsFolder' });