diff --git a/scripts/core_common/modules/html2.py b/scripts/core_common/modules/html2.py index 2e07111..d5cbc34 100644 --- a/scripts/core_common/modules/html2.py +++ b/scripts/core_common/modules/html2.py @@ -7,7 +7,27 @@ import base import os import subprocess +def clear_module(): + directories = ["gumbo-parser", "katana-parser"] + + for dir in directories: + if base.is_dir(dir): + base.delete_dir_with_access_error(dir) + def make(): + old_cur_dir = os.getcwd() + + print("[fetch]: html") + base_dir = base.get_script_dir() + "/../../core/Common/3dParty/html" + + os.chdir(base_dir) + base.check_module_version("2", clear_module) + os.chdir(old_cur_dir) + base.cmd_in_dir(base_dir, "python", ["fetch.py"]) return + +if __name__ == '__main__': + # manual compile + make() diff --git a/scripts/sln.py b/scripts/sln.py index 5b578d4..4170b68 100644 --- a/scripts/sln.py +++ b/scripts/sln.py @@ -97,7 +97,7 @@ def get_projects(pro_json_path, platform): records_src = data[module] records = get_full_projects_list(data, records_src) - print(records) + #print(records) for rec in records: params = [] @@ -164,6 +164,18 @@ def get_projects(pro_json_path, platform): if is_append: result.append(root_dir + record) + # delete duplicates + old_results = result + result = [] + + map_results = set() + for item in old_results: + proj = item.replace("\\", "/") + if proj in map_results: + continue + map_results.add(proj) + result.append(proj) + if is_log: print(result) return result diff --git a/version b/version index 56b6be4..9246c4f 100644 --- a/version +++ b/version @@ -1 +1 @@ -8.3.1 +8.3.2 \ No newline at end of file