CLDR-16393 assume cldr-archive is present for tests

tools/cldr-code/src/main/java/org/unicode/cldr/tool/CheckHtmlFiles.java

@@ -214,7 +214,11 @@ private static void checkForDtd(Data target) {
         M4<String, String, DtdType, Boolean> typeToElements =
                 ChainedMap.of(new TreeMap(), new TreeMap(), new TreeMap(), Boolean.class);
         for (DtdType type : DtdType.values()) {
-            if (type == DtdType.ldmlICU) continue;
+            if (type.getStatus() != DtdType.DtdStatus.active) {
+                continue;
+            } else if (type == DtdType.ldmlICU) {
+                continue;
+            }
             DtdData dtdData = DtdData.getInstance(type);
             Set<Element> elements = dtdData.getElements();
             for (Element element : elements) {

tools/cldr-code/src/main/java/org/unicode/cldr/tool/CldrVersion.java

@@ -12,6 +12,7 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.TreeSet;
+import org.unicode.cldr.util.CLDRFile;
 import org.unicode.cldr.util.CLDRPaths;
 import org.unicode.cldr.util.SupplementalDataInfo;
 
@@ -67,6 +68,9 @@ public enum CldrVersion {
     v42_0,
     v43_0,
     v44_0,
+    /**
+     * @see CLDRFile#GEN_VERSION
+     */
     baseline;
 
     private final String baseDirectory;
@@ -98,6 +102,11 @@ public static CldrVersion from(VersionInfo versionInfo) {
     }
 
     public static CldrVersion from(String versionString) {
+        // treat 'current' as baseline
+        if (versionString.equals(CLDRFile.GEN_VERSION)
+                || versionString.equals(CLDRFile.GEN_VERSION + ".0")) {
+            return CldrVersion.baseline;
+        }
         return valueOf(
                 versionString.charAt(0) < 'A'
                         ? "v" + versionString.replace('.', '_')

tools/cldr-code/src/main/java/org/unicode/cldr/tool/GenerateDtd.java

@@ -21,7 +21,9 @@ public static void main(String[] args) throws IOException {
         final DTD2Markdown dtd2md = new DTD2Markdown();
         // System.setProperty("show_all", "true");
         for (DtdType type : DtdType.values()) {
-            if (type == DtdType.ldmlICU) {
+            if (type.getStatus() != DtdType.DtdStatus.active) {
+                continue;
+            } else if (type == DtdType.ldmlICU) {
                 continue;
             }
             DtdData data = DtdData.getInstance(type);

tools/cldr-code/src/main/java/org/unicode/cldr/tool/GenerateItemCounts.java

@@ -197,6 +197,7 @@ private static void checkBadAttributes(Relation<String, String> path2value2, Str
 
         SupplementalDataInfo supp = SUPPLEMENTAL_DATA_INFO;
         for (DtdType dtdType : DtdType.values()) {
+            if (dtdType.getStatus() != DtdType.DtdStatus.active) continue;
             if (dtdType == DtdType.ldmlICU) {
                 continue;
             }

tools/cldr-code/src/main/java/org/unicode/cldr/tool/GenerateReformattedXml.java

@@ -6,6 +6,7 @@
 public class GenerateReformattedXml {
     public static void main(String[] args) {
         for (DtdType dtdType : DtdType.values()) {
+            if (dtdType.getStatus() != DtdType.DtdStatus.active) continue;
             if (args.length > 0 && !dtdType.toString().matches(args[0])) {
                 continue;
             }

tools/cldr-code/src/main/java/org/unicode/cldr/tool/ShowStarredCoverage.java

@@ -134,6 +134,7 @@ public static void main(String[] args) {
             System.out.println("№\tLevel\tStarredPath\tPH Status\t?\tAttributes");
         }
         for (DtdType dtdType : DtdType.values()) {
+            if (dtdType.getStatus() != DtdType.DtdStatus.active) continue;
             if (dtdTypes != null && !dtdTypes.contains(dtdType)) {
                 continue;
             }

tools/cldr-code/src/main/java/org/unicode/cldr/util/CLDRURLS.java

@@ -161,6 +161,8 @@ public enum Special {
     public static final String UPDATING_CURRENCY_CODES =
             "https://cldr.unicode.org/development/updating-codes/update-currency-codes";
 
+    public static final String CLDR_ARCHIVE = "https://cldr.unicode.org/development/creating-the-archive";
+
     /**
      * Get the relative base URL for the SurveyTool. This may be "/cldr-apps", for example.
      *

tools/cldr-code/src/main/java/org/unicode/cldr/util/DtdType.java

@@ -2,6 +2,7 @@
 
 import com.google.common.collect.ImmutableSet;
 import java.lang.annotation.Annotation;
+import java.util.Collections;
 import java.util.Set;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -29,6 +30,7 @@ public enum DtdType {
             "transforms",
             "validity"),
     ldmlBCP47("common/dtd/ldmlBCP47.dtd", "1.7.2", null, "bcp47"),
+    // keyboard 3.0
     keyboard3("keyboards/dtd/ldmlKeyboard3.dtd", "44.0", null, "../keyboards/3.0"),
     keyboardTest3("keyboards/dtd/ldmlKeyboardTest3.dtd", "44.0", null, "../keyboards/test");
 
@@ -48,10 +50,32 @@ public enum DtdType {
     public final String firstVersion;
     public final Set<String> directories;
 
+    private final DtdStatus status;
+
+    /** Get the ststus, whether this is an active DTD or not */
+    public DtdStatus getStatus() {
+        return status;
+    }
+
+    public enum DtdStatus {
+        /** DTD active (default) */
+        active,
+        /** DTD no longer used */
+        removed,
+    };
+
     private DtdType(String dtdPath) {
         this(dtdPath, null, null);
     }
 
+    private DtdType(DtdStatus status, String sinceVersion) {
+        this.directories = Collections.emptySet();
+        this.dtdPath = null;
+        this.rootType = this;
+        this.firstVersion = sinceVersion;
+        this.status = status;
+    }
+
     private DtdType(String dtdPath, DtdType realType) {
         this(dtdPath, null, realType);
     }
@@ -61,6 +85,7 @@ private DtdType(String dtdPath, String firstVersion, DtdType realType, String...
         this.rootType = realType == null ? this : realType;
         this.firstVersion = firstVersion;
         this.directories = ImmutableSet.copyOf(directories);
+        this.status = DtdStatus.active;
     }
 
     public static DtdType fromPath(String elementOrPath) {

tools/cldr-code/src/main/java/org/unicode/cldr/util/ElementAttributeInfo.java

@@ -55,35 +55,7 @@ public static final ElementAttributeInfo getInstance(String commonDirectory, Dtd
                     }
                 }
                 if (result == null) {
-                    result = new HashMap<>();
-                    // pick short files that are in repository
-                    // Add to this when a DTD is added
-                    result.put(
-                            DtdType.ldml,
-                            new ElementAttributeInfo(
-                                    canonicalCommonDirectory + "/main/root.xml", DtdType.ldml));
-                    result.put(
-                            DtdType.supplementalData,
-                            new ElementAttributeInfo(
-                                    canonicalCommonDirectory + "/supplemental/plurals.xml",
-                                    DtdType.supplementalData));
-                    result.put(
-                            DtdType.ldmlBCP47,
-                            new ElementAttributeInfo(
-                                    canonicalCommonDirectory + "/bcp47/calendar.xml",
-                                    DtdType.ldmlBCP47));
-                    result.put(
-                            DtdType.keyboard3,
-                            new ElementAttributeInfo(
-                                    canonicalCommonDirectory
-                                            + "/../keyboards/3.0/fr-t-k0-azerty.xml",
-                                    DtdType.keyboard3));
-                    result.put(
-                            DtdType.keyboardTest3,
-                            new ElementAttributeInfo(
-                                    canonicalCommonDirectory
-                                            + "/../keyboards/test/fr-t-k0-azerty-test.xml",
-                                    DtdType.keyboardTest3));
+                    result = makeElementAttributeInfoMap(canonicalCommonDirectory);
                     cache.put(commonDirectory, result);
                     cache.put(canonicalCommonDirectory, result);
                 }
@@ -101,6 +73,44 @@ public static final ElementAttributeInfo getInstance(String commonDirectory, Dtd
         return eai;
     }
 
+    private static void addElementAttributeInfo(
+            Map<DtdType, ElementAttributeInfo> result, DtdType type, String path)
+            throws IOException {
+        if (!new File(path).canRead()) {
+            System.err.println(
+                    "ElementAttributeInfo: Warning: Sample file did not exist: "
+                            + path
+                            + " for DtdType "
+                            + type.name());
+            return; // file doesn't exist.
+        }
+        result.put(type, new ElementAttributeInfo(path, type));
+    }
+
+    private static Map<DtdType, ElementAttributeInfo> makeElementAttributeInfoMap(
+            String canonicalCommonDirectory) throws IOException {
+        Map<DtdType, ElementAttributeInfo> result;
+        result = new HashMap<>();
+        // pick short files that are in repository
+        // Add to this when a DTD is added
+        addElementAttributeInfo(result, DtdType.ldml, canonicalCommonDirectory + "/main/root.xml");
+        addElementAttributeInfo(
+                result,
+                DtdType.supplementalData,
+                canonicalCommonDirectory + "/supplemental/plurals.xml");
+        addElementAttributeInfo(
+                result, DtdType.ldmlBCP47, canonicalCommonDirectory + "/bcp47/calendar.xml");
+        addElementAttributeInfo(
+                result,
+                DtdType.keyboard3,
+                canonicalCommonDirectory + "/../keyboards/3.0/fr-t-k0-azerty.xml");
+        addElementAttributeInfo(
+                result,
+                DtdType.keyboardTest3,
+                canonicalCommonDirectory + "/../keyboards/test/fr-t-k0-azerty-test.xml");
+        return result;
+    }
+
     // static {
     // try {
     // addFromDTD(CldrUtility.COMMON_DIRECTORY + "main/en.xml", DtdType.ldml);

tools/cldr-code/src/main/java/org/unicode/cldr/util/SupplementalDataInfo.java

@@ -68,6 +68,7 @@
 import org.unicode.cldr.util.Builder.CBuilder;
 import org.unicode.cldr.util.CldrUtility.VariableReplacer;
 import org.unicode.cldr.util.DayPeriodInfo.DayPeriod;
+import org.unicode.cldr.util.DtdType.DtdStatus;
 import org.unicode.cldr.util.GrammarInfo.GrammaticalFeature;
 import org.unicode.cldr.util.GrammarInfo.GrammaticalScope;
 import org.unicode.cldr.util.GrammarInfo.GrammaticalTarget;
@@ -4572,6 +4573,10 @@ public MetaZoneRange getMetaZoneRange(String zone, long date) {
     }
 
     public boolean isDeprecated(DtdType type, String element, String attribute, String value) {
+        if (type.getStatus() == DtdStatus.removed) {
+            // if the DTD was removed, skip
+            return true;
+        }
         return DtdData.getInstance(type).isDeprecated(element, attribute, value);
     }