Merge remote-tracking branch 'origin/main' into pic_build_try

PIC/XC8/cmake/pic/pic.cmake

@@ -1,4 +1,4 @@
 ## Get appropriate linker script.
-if(${MCU_NAME} MATCHES "^PIC.+$")
+if(${MCU_NAME} MATCHES "^PIC10F320$|^PIC10F322$|^PIC10LF320$|^PIC10LF322$|^PIC12C671$|^PIC12C672$|^PIC12CE673$|^PIC12CE674$|^PIC12F1501$|^PIC12F1571$|^PIC12F1572$|^PIC12F1612$|^PIC12F1822$|^PIC12F1840$|^PIC12F609$|^PIC12F615$|^PIC12F617$|^PIC12F629$|^PIC12F635$|^PIC12F675$|^PIC12F683$|^PIC12F752$|^PIC12HV609$|^PIC12HV615$|^PIC12HV752$|^PIC12LF1501$|^PIC12LF1552$|^PIC12LF1571$|^PIC12LF1572$|^PIC12LF1612$|^PIC12LF1822$|^PIC12LF1840$|^PIC16C432$|^PIC16C433$|^PIC16C620$|^PIC16C620A$|^PIC16C621$|^PIC16C621A$|^PIC16C622$|^PIC16C622A$|^PIC16C62A$|^PIC16C62B$|^PIC16C63$|^PIC16C63A$|^PIC16C642$|^PIC16C64A$|^PIC16C65A$|^PIC16C65B$|^PIC16C66$|^PIC16C662$|^PIC16C67$|^PIC16C71$|^PIC16C710$|^PIC16C711$|^PIC16C712$|^PIC16C715$|^PIC16C716$|^PIC16C717$|^PIC16C72$|^PIC16C72A$|^PIC16C73A$|^PIC16C73B$|^PIC16C745$|^PIC16C74A$|^PIC16C74B$|^PIC16C76$|^PIC16C765$|^PIC16C77$|^PIC16C770$|^PIC16C771$|^PIC16C773$|^PIC16C774$|^PIC16C781$|^PIC16C782$|^PIC16C923$|^PIC16C924$|^PIC16C925$|^PIC16C926$|^PIC16CE623$|^PIC16CE624$|^PIC16CE625$|^PIC16CR62$|^PIC16CR620A$|^PIC16CR63$|^PIC16CR64$|^PIC16CR65$|^PIC16CR72$|^PIC16CR83$|^PIC16CR84$|^PIC16CR926$|^PIC16F1454$|^PIC16F1455$|^PIC16F1459$|^PIC16F1503$|^PIC16F1507$|^PIC16F1508$|^PIC16F1509$|^PIC16F1512$|^PIC16F1513$|^PIC16F1516$|^PIC16F1517$|^PIC16F1518$|^PIC16F1519$|^PIC16F1526$|^PIC16F1527$|^PIC16F15313$|^PIC16F15323$|^PIC16F15324$|^PIC16F15325$|^PIC16F15344$|^PIC16F15345$|^PIC16F15354$|^PIC16F15355$|^PIC16F15356$|^PIC16F15375$|^PIC16F15376$|^PIC16F15385$|^PIC16F15386$|^PIC16F1574$|^PIC16F1575$|^PIC16F1578$|^PIC16F1579$|^PIC16F1613$|^PIC16F1614$|^PIC16F1615$|^PIC16F1618$|^PIC16F1619$|^PIC16F1703$|^PIC16F1704$|^PIC16F1705$|^PIC16F1707$|^PIC16F1708$|^PIC16F1709$|^PIC16F1713$|^PIC16F1716$|^PIC16F1717$|^PIC16F1718$|^PIC16F1719$|^PIC16F1764$|^PIC16F1765$|^PIC16F1768$|^PIC16F1769$|^PIC16F1773$|^PIC16F1776$|^PIC16F1777$|^PIC16F1778$|^PIC16F1779$|^PIC16F1782$|^PIC16F1783$|^PIC16F1784$|^PIC16F1786$|^PIC16F1787$|^PIC16F1788$|^PIC16F1789$|^PIC16F1823$|^PIC16F1824$|^PIC16F1825$|^PIC16F1826$|^PIC16F1827$|^PIC16F1828$|^PIC16F1829$|^PIC16F1829LIN$|^PIC16F18313$|^PIC16F18323$|^PIC16F18324$|^PIC16F18325$|^PIC16F18326$|^PIC16F18344$|^PIC16F18345$|^PIC16F18346$|^PIC16F1847$|^PIC16F18854$|^PIC16F18855$|^PIC16F18856$|^PIC16F18857$|^PIC16F18875$|^PIC16F18876$|^PIC16F18877$|^PIC16F19155$|^PIC16F19156$|^PIC16F19175$|^PIC16F19176$|^PIC16F19185$|^PIC16F19186$|^PIC16F19195$|^PIC16F19196$|^PIC16F19197$|^PIC16F1933$|^PIC16F1934$|^PIC16F1936$|^PIC16F1937$|^PIC16F1938$|^PIC16F1939$|^PIC16F1946$|^PIC16F1947$|^PIC16F610$|^PIC16F616$|^PIC16F627$|^PIC16F627A$|^PIC16F628$|^PIC16F628A$|^PIC16F630$|^PIC16F631$|^PIC16F636$|^PIC16F639$|^PIC16F648A$|^PIC16F676$|^PIC16F677$|^PIC16F684$|^PIC16F685$|^PIC16F687$|^PIC16F688$|^PIC16F689$|^PIC16F690$|^PIC16F707$|^PIC16F716$|^PIC16F72$|^PIC16F720$|^PIC16F721$|^PIC16F722$|^PIC16F722A$|^PIC16F723$|^PIC16F723A$|^PIC16F724$|^PIC16F726$|^PIC16F727$|^PIC16F73$|^PIC16F737$|^PIC16F74$|^PIC16F747$|^PIC16F753$|^PIC16F76$|^PIC16F767$|^PIC16F77$|^PIC16F777$|^PIC16F785$|^PIC16F818$|^PIC16F819$|^PIC16F83$|^PIC16F84$|^PIC16F84A$|^PIC16F87$|^PIC16F870$|^PIC16F871$|^PIC16F872$|^PIC16F873$|^PIC16F873A$|^PIC16F874$|^PIC16F874A$|^PIC16F876$|^PIC16F876A$|^PIC16F877$|^PIC16F877A$|^PIC16F88$|^PIC16F882$|^PIC16F883$|^PIC16F884$|^PIC16F886$|^PIC16F887$|^PIC16F913$|^PIC16F914$|^PIC16F916$|^PIC16F917$|^PIC16F946$|^PIC16HV610$|^PIC16HV616$|^PIC16HV753$|^PIC16HV785$|^PIC16LF1454$|^PIC16LF1455$|^PIC16LF1459$|^PIC16LF1503$|^PIC16LF1507$|^PIC16LF1508$|^PIC16LF1509$|^PIC16LF1512$|^PIC16LF1513$|^PIC16LF1516$|^PIC16LF1517$|^PIC16LF1518$|^PIC16LF1519$|^PIC16LF1526$|^PIC16LF1527$|^PIC16LF15313$|^PIC16LF15323$|^PIC16LF15324$|^PIC16LF15325$|^PIC16LF15344$|^PIC16LF15345$|^PIC16LF15354$|^PIC16LF15355$|^PIC16LF15356$|^PIC16LF15375$|^PIC16LF15376$|^PIC16LF15385$|^PIC16LF15386$|^PIC16LF1554$|^PIC16LF1559$|^PIC16LF1566$|^PIC16LF1567$|^PIC16LF1574$|^PIC16LF1575$|^PIC16LF1578$|^PIC16LF1579$|^PIC16LF1613$|^PIC16LF1614$|^PIC16LF1615$|^PIC16LF1618$|^PIC16LF1619$|^PIC16LF1703$|^PIC16LF1704$|^PIC16LF1705$|^PIC16LF1707$|^PIC16LF1708$|^PIC16LF1709$|^PIC16LF1713$|^PIC16LF1716$|^PIC16LF1717$|^PIC16LF1718$|^PIC16LF1719$|^PIC16LF1764$|^PIC16LF1765$|^PIC16LF1768$|^PIC16LF1769$|^PIC16LF1773$|^PIC16LF1776$|^PIC16LF1777$|^PIC16LF1778$|^PIC16LF1779$|^PIC16LF1782$|^PIC16LF1783$|^PIC16LF1784$|^PIC16LF1786$|^PIC16LF1787$|^PIC16LF1788$|^PIC16LF1789$|^PIC16LF1823$|^PIC16LF1824$|^PIC16LF1825$|^PIC16LF1826$|^PIC16LF1827$|^PIC16LF1828$|^PIC16LF1829$|^PIC16LF18313$|^PIC16LF18323$|^PIC16LF18324$|^PIC16LF18325$|^PIC16LF18326$|^PIC16LF18344$|^PIC16LF18345$|^PIC16LF18346$|^PIC16LF1847$|^PIC16LF18854$|^PIC16LF18855$|^PIC16LF18856$|^PIC16LF18857$|^PIC16LF18875$|^PIC16LF18876$|^PIC16LF18877$|^PIC16LF1902$|^PIC16LF1903$|^PIC16LF1904$|^PIC16LF1906$|^PIC16LF1907$|^PIC16LF19155$|^PIC16LF19156$|^PIC16LF19175$|^PIC16LF19176$|^PIC16LF19185$|^PIC16LF19186$|^PIC16LF19195$|^PIC16LF19196$|^PIC16LF19197$|^PIC16LF1933$|^PIC16LF1934$|^PIC16LF1936$|^PIC16LF1937$|^PIC16LF1938$|^PIC16LF1939$|^PIC16LF1946$|^PIC16LF1947$|^PIC16LF707$|^PIC16LF720$|^PIC16LF721$|^PIC16LF722$|^PIC16LF722A$|^PIC16LF723$|^PIC16LF723A$|^PIC16LF724$|^PIC16LF726$|^PIC16LF727$|^PIC18C242$|^PIC18C252$|^PIC18C442$|^PIC18C452$|^PIC18C601$|^PIC18C658$|^PIC18C801$|^PIC18C858$|^PIC18F1220$|^PIC18F1230$|^PIC18F1320$|^PIC18F1330$|^PIC18F13K22$|^PIC18F13K50$|^PIC18F14K22$|^PIC18F14K50$|^PIC18F2220$|^PIC18F2221$|^PIC18F2320$|^PIC18F2321$|^PIC18F2331$|^PIC18F23K20$|^PIC18F23K22$|^PIC18F2410$|^PIC18F242$|^PIC18F2420$|^PIC18F2423$|^PIC18F2431$|^PIC18F2439$|^PIC18F2450$|^PIC18F2455$|^PIC18F2458$|^PIC18F248$|^PIC18F2480$|^PIC18F24J10$|^PIC18F24J11$|^PIC18F24J50$|^PIC18F24K20$|^PIC18F24K22$|^PIC18F24K40$|^PIC18F24K42$|^PIC18F24K50$|^PIC18F2510$|^PIC18F2515$|^PIC18F252$|^PIC18F2520$|^PIC18F2523$|^PIC18F2525$|^PIC18F2539$|^PIC18F2550$|^PIC18F2553$|^PIC18F258$|^PIC18F2580$|^PIC18F2585$|^PIC18F25J10$|^PIC18F25J11$|^PIC18F25J50$|^PIC18F25K20$|^PIC18F25K22$|^PIC18F25K40$|^PIC18F25K42$|^PIC18F25K50$|^PIC18F25K80$|^PIC18F25K83$|^PIC18F2610$|^PIC18F2620$|^PIC18F2680$|^PIC18F2682$|^PIC18F2685$|^PIC18F26J11$|^PIC18F26J13$|^PIC18F26J50$|^PIC18F26J53$|^PIC18F26K20$|^PIC18F26K22$|^PIC18F26K40$|^PIC18F26K42$|^PIC18F26K80$|^PIC18F26K83$|^PIC18F27J13$|^PIC18F27J53$|^PIC18F27K40$|^PIC18F27K42$|^PIC18F4220$|^PIC18F4221$|^PIC18F4320$|^PIC18F4321$|^PIC18F4331$|^PIC18F43K20$|^PIC18F43K22$|^PIC18F4410$|^PIC18F442$|^PIC18F4420$|^PIC18F4423$|^PIC18F4431$|^PIC18F4439$|^PIC18F4450$|^PIC18F4455$|^PIC18F4458$|^PIC18F448$|^PIC18F4480$|^PIC18F44J10$|^PIC18F44J11$|^PIC18F44J50$|^PIC18F44K20$|^PIC18F44K22$|^PIC18F4510$|^PIC18F4515$|^PIC18F452$|^PIC18F4520$|^PIC18F4523$|^PIC18F4525$|^PIC18F4539$|^PIC18F4550$|^PIC18F4553$|^PIC18F458$|^PIC18F4580$|^PIC18F4585$|^PIC18F45J10$|^PIC18F45J11$|^PIC18F45J50$|^PIC18F45K20$|^PIC18F45K22$|^PIC18F45K40$|^PIC18F45K42$|^PIC18F45K50$|^PIC18F45K80$|^PIC18F4610$|^PIC18F4620$|^PIC18F4680$|^PIC18F4682$|^PIC18F4685$|^PIC18F46J11$|^PIC18F46J13$|^PIC18F46J50$|^PIC18F46J53$|^PIC18F46K20$|^PIC18F46K22$|^PIC18F46K40$|^PIC18F46K42$|^PIC18F46K80$|^PIC18F47J13$|^PIC18F47J53$|^PIC18F47K40$|^PIC18F47K42$|^PIC18F47Q10$|^PIC18F55K42$|^PIC18F56K42$|^PIC18F57K42$|^PIC18F57Q43$|^PIC18F6310$|^PIC18F6390$|^PIC18F6393$|^PIC18F63J11$|^PIC18F63J90$|^PIC18F6410$|^PIC18F6490$|^PIC18F6493$|^PIC18F64J11$|^PIC18F64J90$|^PIC18F6520$|^PIC18F6525$|^PIC18F6527$|^PIC18F6585$|^PIC18F65J10$|^PIC18F65J11$|^PIC18F65J15$|^PIC18F65J50$|^PIC18F65J90$|^PIC18F65J94$|^PIC18F65K22$|^PIC18F65K40$|^PIC18F65K80$|^PIC18F65K90$|^PIC18F6620$|^PIC18F6621$|^PIC18F6622$|^PIC18F6627$|^PIC18F6628$|^PIC18F6680$|^PIC18F66J10$|^PIC18F66J11$|^PIC18F66J15$|^PIC18F66J16$|^PIC18F66J50$|^PIC18F66J55$|^PIC18F66J60$|^PIC18F66J65$|^PIC18F66J90$|^PIC18F66J93$|^PIC18F66J94$|^PIC18F66K22$|^PIC18F66K40$|^PIC18F66K80$|^PIC18F66K90$|^PIC18F6720$|^PIC18F6722$|^PIC18F6723$|^PIC18F67J10$|^PIC18F67J11$|^PIC18F67J50$|^PIC18F67J60$|^PIC18F67J90$|^PIC18F67J93$|^PIC18F67J94$|^PIC18F67K22$|^PIC18F67K40$|^PIC18F67K90$|^PIC18F8310$|^PIC18F8390$|^PIC18F8393$|^PIC18F83J11$|^PIC18F83J90$|^PIC18F8410$|^PIC18F8490$|^PIC18F8493$|^PIC18F84J11$|^PIC18F84J90$|^PIC18F8520$|^PIC18F8525$|^PIC18F8527$|^PIC18F8585$|^PIC18F85J10$|^PIC18F85J11$|^PIC18F85J15$|^PIC18F85J50$|^PIC18F85J90$|^PIC18F85J94$|^PIC18F85K22$|^PIC18F85K90$|^PIC18F8620$|^PIC18F8621$|^PIC18F8622$|^PIC18F8627$|^PIC18F8628$|^PIC18F8680$|^PIC18F86J10$|^PIC18F86J11$|^PIC18F86J15$|^PIC18F86J16$|^PIC18F86J50$|^PIC18F86J55$|^PIC18F86J60$|^PIC18F86J65$|^PIC18F86J72$|^PIC18F86J90$|^PIC18F86J93$|^PIC18F86J94$|^PIC18F86K22$|^PIC18F86K90$|^PIC18F8720$|^PIC18F8722$|^PIC18F8723$|^PIC18F87J10$|^PIC18F87J11$|^PIC18F87J50$|^PIC18F87J60$|^PIC18F87J72$|^PIC18F87J90$|^PIC18F87J93$|^PIC18F87J94$|^PIC18F87K22$|^PIC18F87K90$|^PIC18F95J94$|^PIC18F96J60$|^PIC18F96J65$|^PIC18F96J94$|^PIC18F97J60$|^PIC18F97J94$|^PIC18LF1220$|^PIC18LF1230$|^PIC18LF1320$|^PIC18LF1330$|^PIC18LF13K22$|^PIC18LF13K50$|^PIC18LF14K22$|^PIC18LF14K50$|^PIC18LF2220$|^PIC18LF2221$|^PIC18LF2320$|^PIC18LF2321$|^PIC18LF2331$|^PIC18LF23K22$|^PIC18LF2410$|^PIC18LF2420$|^PIC18LF2423$|^PIC18LF2431$|^PIC18LF2450$|^PIC18LF2455$|^PIC18LF2458$|^PIC18LF2480$|^PIC18LF24J10$|^PIC18LF24J11$|^PIC18LF24J50$|^PIC18LF24K22$|^PIC18LF24K40$|^PIC18LF24K42$|^PIC18LF24K50$|^PIC18LF2510$|^PIC18LF2515$|^PIC18LF2520$|^PIC18LF2523$|^PIC18LF2525$|^PIC18LF2550$|^PIC18LF2553$|^PIC18LF2580$|^PIC18LF2585$|^PIC18LF25J10$|^PIC18LF25J11$|^PIC18LF25J50$|^PIC18LF25K22$|^PIC18LF25K40$|^PIC18LF25K42$|^PIC18LF25K50$|^PIC18LF25K80$|^PIC18LF2610$|^PIC18LF2620$|^PIC18LF2680$|^PIC18LF2682$|^PIC18LF2685$|^PIC18LF26J11$|^PIC18LF26J13$|^PIC18LF26J50$|^PIC18LF26J53$|^PIC18LF26K22$|^PIC18LF26K40$|^PIC18LF26K42$|^PIC18LF26K80$|^PIC18LF27J13$|^PIC18LF27J53$|^PIC18LF27K40$|^PIC18LF27K42$|^PIC18LF4220$|^PIC18LF4221$|^PIC18LF4320$|^PIC18LF4321$|^PIC18LF4331$|^PIC18LF43K22$|^PIC18LF4410$|^PIC18LF4420$|^PIC18LF4423$|^PIC18LF4431$|^PIC18LF4450$|^PIC18LF4455$|^PIC18LF4458$|^PIC18LF4480$|^PIC18LF44J10$|^PIC18LF44J11$|^PIC18LF44J50$|^PIC18LF44K22$|^PIC18LF4510$|^PIC18LF4515$|^PIC18LF4520$|^PIC18LF4523$|^PIC18LF4525$|^PIC18LF4550$|^PIC18LF4553$|^PIC18LF4580$|^PIC18LF4585$|^PIC18LF45J10$|^PIC18LF45J11$|^PIC18LF45J50$|^PIC18LF45K22$|^PIC18LF45K40$|^PIC18LF45K42$|^PIC18LF45K50$|^PIC18LF45K80$|^PIC18LF4610$|^PIC18LF4620$|^PIC18LF4680$|^PIC18LF4682$|^PIC18LF4685$|^PIC18LF46J11$|^PIC18LF46J13$|^PIC18LF46J50$|^PIC18LF46J53$|^PIC18LF46K22$|^PIC18LF46K40$|^PIC18LF46K42$|^PIC18LF46K80$|^PIC18LF47J13$|^PIC18LF47J53$|^PIC18LF47K40$|^PIC18LF47K42$|^PIC18LF55K42$|^PIC18LF56K42$|^PIC18LF57K42$|^PIC18LF6310$|^PIC18LF6390$|^PIC18LF6393$|^PIC18LF6410$|^PIC18LF6490$|^PIC18LF6493$|^PIC18LF6520$|^PIC18LF6527$|^PIC18LF65K40$|^PIC18LF65K80$|^PIC18LF6622$|^PIC18LF6627$|^PIC18LF6628$|^PIC18LF66K40$|^PIC18LF66K80$|^PIC18LF6722$|^PIC18LF6723$|^PIC18LF67K40$|^PIC18LF8310$|^PIC18LF8390$|^PIC18LF8393$|^PIC18LF8410$|^PIC18LF8490$|^PIC18LF8493$|^PIC18LF8520$|^PIC18LF8527$|^PIC18LF8622$|^PIC18LF8627$|^PIC18LF8628$|^PIC18LF8720$|^PIC18LF8722$|^PIC18LF8723$")
     list(APPEND fileListInclude def/${MCU_NAME}/mcu.h)
 endif()

scripts/core_build.py

@@ -486,9 +486,19 @@ def get_core_from_def(file_path):
 
     return core
 
+def get_core_from_queries(file_path):
+    with open(file_path, 'r') as devices_json:
+        json_data = json.load(devices_json)
+    core = json.loads(json_data['sdk_config'])['CORE_NAME']
+
+    return core
+
 def get_core(mcuNames, package_name, cmake_file, source_dir, changes_dict):
     for mcu_name in mcuNames[cmake_file]['mcu_names']:
-        core = get_core_from_def(os.path.join(source_dir, "def", f"{mcu_name}.json"))
+        if 'gcc_clang' in package_name:
+            core = get_core_from_def(os.path.join(source_dir, "def", f"{mcu_name}.json"))
+        else:
+            core = get_core_from_queries(os.path.join(os.getcwd(), "resources/queries/mcus", mcu_name, 'Devices.json'))
         mcuNames[cmake_file]['cores'].add(core)
         changes_dict['mcu_list'].append(mcu_name)
 
@@ -680,7 +690,7 @@ def package_asset(source_dir, output_dir, arch, entry_name, changes_dict, es_ins
         # Copy packages to artifacts as well
         shutil.copytree(base_output_dir, os.path.join(testPath, "packages", f"{arch.lower()}_{entry_name.lower()}_{cmake_file}"))
 
-        index_package(f"{arch.lower()}_{entry_name.lower()}_{cmake_file}", mcuNames[cmake_file]['mcu_names'], es_instance, indexed_packages)
+        # index_package(f"{arch.lower()}_{entry_name.lower()}_{cmake_file}", mcuNames[cmake_file]['mcu_names'], es_instance, indexed_packages)
 
 # Writes the result dictionary to a JSON file and ensures testPath exists.
 def write_results_to_file(changes_dict):
@@ -776,8 +786,8 @@ def main():
     # Write all the used info for building to artifact folder.
     write_results_to_file(changes_dict)
 
-    for indexed_item in indexed_packages:
-        es_instance.delete(doc_type='_doc', doc_id=indexed_item)
+    # for indexed_item in indexed_packages:
+        # es_instance.delete(doc_type='_doc', doc_id=indexed_item)
 
     for item in changes_dict['build_status']:
         if 'UNDEFINED' in changes_dict['build_status'][item] or 'FAIL' in changes_dict['build_status'][item]: