diff options
Diffstat (limited to 'config/makeprops.py')
| -rwxr-xr-x | config/makeprops.py | 37 |
1 files changed, 32 insertions, 5 deletions
diff --git a/config/makeprops.py b/config/makeprops.py index 4d43f9cb2c0..a73fc803e5f 100755 --- a/config/makeprops.py +++ b/config/makeprops.py @@ -102,6 +102,13 @@ cppSrcPreamble = commonPreamble + """ """ javaPreamble = commonPreamble + """ +package com.zeroc.IceInternal; + +public final class %(classname)s +{ +""" + +javaCompatPreamble = commonPreamble + """ package IceInternal; public final class %(classname)s @@ -116,9 +123,9 @@ namespace IceInternal """ jsPreamble = commonPreamble + """ -var Ice = require("../Ice/Property").Ice; -var %(classname)s = {}; -var Property = Ice.Property; +const Ice = require("../Ice/Property").Ice; +const %(classname)s = {}; +const Property = Ice.Property; """ jsEpilogue = \ @@ -129,7 +136,7 @@ module.exports.Ice = Ice; def usage(): global progname - print >> sys.stderr, "Usage: " + progname + " [--{cpp|java|cs|js} file]" + print >> sys.stderr, "Usage: " + progname + " [--{cpp|java|java-compat|csharp|js} file]" def progError(msg): global progname @@ -456,11 +463,26 @@ class JavaPropertyHandler(PropertyHandler): self.srcFile.write(" };\n\n") def moveFiles(self, location): - dest = os.path.join(location, "java", "src", "Ice", "src", "main", "java", "IceInternal") + dest = os.path.join(location, "java", "src", "Ice", "src", "main", "java", "com", "zeroc", "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 + ".java", dest) +class JavaCompatPropertyHandler(JavaPropertyHandler): + def __init__(self, inputfile, c): + JavaPropertyHandler.__init__(self, inputfile, c) + + def startFiles(self): + self.srcFile = file(self.className + "-compat.java", "wb") + 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) @@ -677,6 +699,8 @@ def main(): lang = "cpp" elif option == "--java": lang = "java" + elif option == "--java-compat": + lang = "java-compat" elif option == "--csharp": lang = "csharp" elif option == "--js": @@ -695,6 +719,7 @@ def main(): contentHandler = MultiHandler(infile, "") contentHandler.addHandlers([CppPropertyHandler(infile, className), JavaPropertyHandler(infile, className), + JavaCompatPropertyHandler(infile, className), CSPropertyHandler(infile, className), JSPropertyHandler(infile, className)]) else: @@ -702,6 +727,8 @@ def main(): 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": |