Remove java-compat mapping (#1610)

zeroc-ice · Dec 19, 2023 · 9cad61b · 9cad61b
1 parent 8fa9eaf
commit 9cad61b
Show file tree

Hide file tree

Showing 962 changed files with 15 additions and 152,485 deletions.
diff --git a/README.md b/README.md
@@ -86,7 +86,7 @@ languages.
 
 ## Building Ice from source
 
-[C++](cpp/BUILDING.md) | [C#](csharp/BUILDING.md) | [Java](java/BUILDING.md) | [Java Compat](java-compat/BUILDING.md) | [JavaScript/TypeScript](js/BUILDING.md) | [MATLAB](matlab/BUILDING.md) | [Objective-C](objective-c/BUILDING.md) | [PHP](php/BUILDING.md) | [Python](python/BUILDING.md) | [Ruby](ruby/BUILDING.md) | [Swift](swift/BUILDING.md)
+[C++](cpp/BUILDING.md) | [C#](csharp/BUILDING.md) | [Java](java/BUILDING.md) | [JavaScript/TypeScript](js/BUILDING.md) | [MATLAB](matlab/BUILDING.md) | [Objective-C](objective-c/BUILDING.md) | [PHP](php/BUILDING.md) | [Python](python/BUILDING.md) | [Ruby](ruby/BUILDING.md) | [Swift](swift/BUILDING.md)
 
 ## Copyright and license
 

diff --git a/config/Make.rules b/config/Make.rules
@@ -96,7 +96,7 @@ nodejs := $(shell command -v node 2> /dev/null)
 #
 # Languages, platforms and configurations to build
 #
-supported-languages     ?= $(strip cpp java java-compat python ruby php \
+supported-languages     ?= $(strip cpp java python ruby php \
                                    $(if $(filter %/node,$(nodejs)),js) \
                                    $(if $(filter %/dotnet,$(dotnet)),csharp) \
                                    $(if $(filter Darwin,$(os)),objective-c swift))

diff --git a/config/makeprops.py b/config/makeprops.py
@@ -99,13 +99,6 @@ class %(classname)s
 {
 """
 
-javaCompatPreamble = commonPreamble + """
-package IceInternal;
-
-public final class %(classname)s
-{
-"""
-
 csPreamble = commonPreamble + """
 namespace IceInternal
 {
@@ -131,7 +124,7 @@ class %(classname)s
 
 def usage():
     global progname
-    print >> sys.stderr, "Usage: " + progname + " [--{cpp|java|java-compat|csharp|js} file]"
+    print >> sys.stderr, "Usage: " + progname + " [--{cpp|java|csharp|js} file]"
 
 def progError(msg):
     global progname
@@ -462,20 +455,6 @@ def moveFiles(self, location):
             os.remove(os.path.join(dest, self.className + ".java"))
         shutil.move(self.className + ".java", dest)
 
-class JavaCompatPropertyHandler(JavaPropertyHandler):
-    def __init__(self, inputfile, c):
-        JavaPropertyHandler.__init__(self, inputfile, c)
-
-    def startFiles(self):
-        self.srcFile = open(self.className + "-compat.java", "w")
-        self.srcFile.write(javaCompatPreamble % {'inputfile' : self.inputfile, 'classname' : self.className})
-
-    def moveFiles(self, location):
-        dest = os.path.join(location, "java-compat", "src", "Ice", "src", "main", "java", "IceInternal")
-        if os.path.exists(os.path.join(dest, self.className + ".java")):
-            os.remove(os.path.join(dest, self.className + ".java"))
-        shutil.move(self.className + "-compat.java", os.path.join(dest, self.className + ".java"))
-
 class CSPropertyHandler(PropertyHandler):
     def __init__(self, inputfile, c):
         PropertyHandler.__init__(self, inputfile, c)
@@ -685,8 +664,6 @@ def main():
             lang = "cpp"
         elif option == "--java":
             lang = "java"
-        elif option == "--java-compat":
-            lang = "java-compat"
         elif option == "--csharp":
             lang = "csharp"
         elif option == "--js":
@@ -705,16 +682,13 @@ def main():
         contentHandler = MultiHandler(infile, "")
         contentHandler.addHandlers([CppPropertyHandler(infile, className),
             JavaPropertyHandler(infile, className),
-            JavaCompatPropertyHandler(infile, className),
             CSPropertyHandler(infile, className),
             JSPropertyHandler(infile, className)])
     else:
         if lang == "cpp":
             contentHandler = CppPropertyHandler(infile, className)
         elif lang == "java":
             contentHandler = JavaPropertyHandler(infile, className)
-        elif lang == "java-compat":
-            contentHandler = JavaCompatPropertyHandler(infile, className)
         elif lang == "csharp":
             contentHandler = CSPropertyHandler(infile, className)
         elif lang == "js":