diff options
author | Brent Eagles <brent@zeroc.com> | 2007-06-15 14:52:34 -0230 |
---|---|---|
committer | Brent Eagles <brent@zeroc.com> | 2007-06-15 14:52:34 -0230 |
commit | 83996c574331cbd6433d4a19e8c9c88cafc52688 (patch) | |
tree | 1e664b2424a3c95235289f49a86fcc9ff042d4cd /cpp/config/makeprops.py | |
parent | Added back bin/.gitcommit and lib/.gitcommit (diff) | |
download | ice-83996c574331cbd6433d4a19e8c9c88cafc52688.tar.bz2 ice-83996c574331cbd6433d4a19e8c9c88cafc52688.tar.xz ice-83996c574331cbd6433d4a19e8c9c88cafc52688.zip |
Squashed commit of the following:
commit d0aa3ed6e86681231443b1c0050dd5d32f17e4a2
Author: Brent Eagles <brent@eagle2.eaglestechnologies.com>
Date: Fri Jun 15 11:30:52 2007 -0230
- Removing generation of the Property class definitions from makeprops.py.
- Fixing java build to work in git repository without requiring
ICE_HOME to be set.
Diffstat (limited to 'cpp/config/makeprops.py')
-rw-r--r-- | cpp/config/makeprops.py | 85 |
1 files changed, 0 insertions, 85 deletions
diff --git a/cpp/config/makeprops.py b/cpp/config/makeprops.py index 344e2cfe376..9fc80a7c705 100644 --- a/cpp/config/makeprops.py +++ b/cpp/config/makeprops.py @@ -102,42 +102,6 @@ cppSrcPreamble = commonPreamble + """ """ -javaPropertyClass = commonPreamble + """ -package IceInternal; - -public class Property -{ - public Property(String pattern, boolean deprecated, String deprecatedBy) - { - _pattern = pattern; - _deprecated = deprecated; - _deprecatedBy = deprecatedBy; - } - - public String - pattern() - { - return _pattern; - } - - public boolean - deprecated() - { - return _deprecated; - } - - public String - deprecatedBy() - { - return _deprecatedBy; - } - - private String _pattern; - private boolean _deprecated; - private String _deprecatedBy; -} -""" - javaPreamble = commonPreamble + """ package IceInternal; @@ -145,43 +109,6 @@ public final class %(classname)s { """ -csPropertyClass = commonPreamble + """ -namespace IceInternal -{ - public sealed class Property - { - public Property(string pattern, bool deprecated, string deprecatedBy) - { - _pattern = pattern; - _deprecated = deprecated; - _deprecatedBy = deprecatedBy; - } - - public string - pattern() - { - return _pattern; - } - - public bool - deprecated() - { - return _deprecated; - } - - public string - deprecatedBy() - { - return _deprecatedBy; - } - - private string _pattern; - private bool _deprecated; - private string _deprecatedBy; - } -} -""" - csPreamble = commonPreamble + """ namespace IceInternal { @@ -465,15 +392,10 @@ class JavaPropertyHandler(PropertyHandler): self.srcFile.close() if os.path.exists(self.className + ".java"): os.remove(self.className + ".java") - if os.path.exists("Property.java"): - os.remove("Property.java") def startFiles(self): self.srcFile = file(self.className + ".java", "w") self.srcFile.write(javaPreamble % {'inputfile' : self.inputfile, 'classname' : self.className}) - propertyClassFile = file("Property.java", "w") - propertyClassFile.write(javaPropertyClass) - propertyClassFile.close() def closeFiles(self): self.srcFile.write("\n public static final Property[] validProps[] = \n" % \ @@ -528,7 +450,6 @@ class JavaPropertyHandler(PropertyHandler): def moveFiles(self, location): shutil.move(self.className + ".java", os.path.join(location, "..", "java", "src", "IceInternal")) - shutil.move("Property.java", os.path.join(location, "..", "java", "src", "IceInternal")) class CSPropertyHandler(PropertyHandler): def __init__(self, inputfile, c): @@ -540,15 +461,10 @@ class CSPropertyHandler(PropertyHandler): self.srcFile.close() if os.path.exists(self.className + ".cs"): os.remove(self.className + ".cs") - if os.path.exists("Property.cs"): - os.remove("Property.cs") def startFiles(self): self.srcFile = file(self.className + ".cs", "w") self.srcFile.write(csPreamble % {'inputfile' : self.inputfile, 'classname' : self.className}) - propertyClassFile = file("Property.cs", "w") - propertyClassFile.write(csPropertyClass) - propertyClassFile.close() def closeFiles(self): self.srcFile.write(" public static Property[][] validProps = \n" % \ @@ -598,7 +514,6 @@ class CSPropertyHandler(PropertyHandler): def moveFiles(self, location): shutil.move(self.className + ".cs", os.path.join(location, "..", "cs", "src", "Ice")) - shutil.move("Property.cs", os.path.join(location, "..", "cs", "src", "Ice")) class MultiHandler(PropertyHandler): def __init__(self, inputfile, c): |