From 65a1a9e6c6373770a1fdd0ad3a1a5c6abe621f94 Mon Sep 17 00:00:00 2001 From: Kelvin Sherlock Date: Mon, 14 Sep 2020 18:24:09 -0400 Subject: [PATCH] move agat 7/9 to their own category since they are very different. adjusted clone category list a little bit, --- Ample/Resources/models.plist | 173 ++++++++++++++++++----------------- python/mkmodels.py | 8 +- 2 files changed, 96 insertions(+), 85 deletions(-) diff --git a/Ample/Resources/models.plist b/Ample/Resources/models.plist index 88d1d27..eae516f 100644 --- a/Ample/Resources/models.plist +++ b/Ample/Resources/models.plist @@ -140,76 +140,6 @@ value apple3 - - description - Laser - value - laser128 - children - - - description - Laser //c - value - laser2c - - - description - Laser 128 (version 4.2) - value - laser128 - - - description - Laser 128ex (version 4.5) - value - las128ex - - - description - Laser 128ex2 (version 6.1) - value - las128e2 - - - - - description - China Education Computer - children - - - description - China Education Computer 2000 - value - cec2000 - - - description - China Education Computer E - value - cece - - - description - China Education Computer G - value - cecg - - - description - China Education Computer I - value - ceci - - - description - China Education Computer M - value - cecm - - - description II Clones @@ -221,18 +151,6 @@ value ace100 - - description - Agat-7 - value - agat7 - - - description - Agat-9 - value - agat9 - description Albert @@ -368,5 +286,96 @@ + + description + Laser + value + laser128 + children + + + description + Laser //c + value + laser2c + + + description + Laser 128 (version 4.2) + value + laser128 + + + description + Laser 128ex (version 4.5) + value + las128ex + + + description + Laser 128ex2 (version 6.1) + value + las128e2 + + + + + description + Agat + value + agat7 + children + + + description + Agat-7 + value + agat7 + + + description + Agat-9 + value + agat9 + + + + + description + China Education Computer + children + + + description + China Education Computer 2000 + value + cec2000 + + + description + China Education Computer E + value + cece + + + description + China Education Computer G + value + cecg + + + description + China Education Computer I + value + ceci + + + description + China Education Computer M + value + cecm + + + diff --git a/python/mkmodels.py b/python/mkmodels.py index e041715..689a933 100644 --- a/python/mkmodels.py +++ b/python/mkmodels.py @@ -15,13 +15,14 @@ apple2e_children = ["apple2e", "apple2ees", "apple2euk", "apple2ep", "apple2ee", apple2c_children = ["apple2c", "apple2cp"] apple2gs_children = ["apple2gsr0", "apple2gsr1", "apple2gs"] laser_children = ["laser2c", "laser128", "las128ex", "las128e2"] -ii_clones_children = ["ace100", "agat7", "agat9", "albert", +ii_clones_children = ["ace100", "albert", "am100", "am64", "basis108", "craft2p", "dodo", "elppa", "hkc8800a", "ivelultr", "maxxi", "microeng", "prav82", "prav8m", "space84", "uniap2en", "uniap2pt", "uniap2ti"] iie_clones_children = ["mprof3", "prav8c", "spectred", "zijini"] cec_children = ["cec2000", "cece", "cecg", "ceci", "cecm"] +agat_children = ["agat7", "agat9"] tree = [ ("Apple I", "apple1", apple1_children), @@ -30,10 +31,11 @@ tree = [ ("Apple //c", "apple2c", apple2c_children), ("Apple IIgs", "apple2gs", apple2gs_children), ("Apple ///", "apple3", apple3_children), - ("Laser", "laser128", laser_children), - ("China Education Computer", None, cec_children), ("II Clones", None, ii_clones_children), ("IIe Clones", None, iie_clones_children), + ("Laser", "laser128", laser_children), + ("Agat", "agat7", agat_children), + ("China Education Computer", None, cec_children), ] env = {'DYLD_FALLBACK_FRAMEWORK_PATH': '../embedded'}