diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2008-02-15 10:47:33 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2008-02-15 10:47:33 +0100 |
| commit | 855d56e01bd855147d173e2bdabbb6f3964d3ffe (patch) | |
| tree | 3cc0707567e45122a817f38c34aa52767496b56c | |
| parent | Fix for bug 2690 (diff) | |
| download | ice-855d56e01bd855147d173e2bdabbb6f3964d3ffe.tar.bz2 ice-855d56e01bd855147d173e2bdabbb6f3964d3ffe.tar.xz ice-855d56e01bd855147d173e2bdabbb6f3964d3ffe.zip | |
Minor makedist.py fix and fixed again IceSL Exception.cs
| -rwxr-xr-x | distribution/bin/makebindist.py | 7 | ||||
| -rw-r--r-- | sl/src/Ice/Exception.cs | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/distribution/bin/makebindist.py b/distribution/bin/makebindist.py index 5a4419a3fd2..99ca66ae85c 100755 --- a/distribution/bin/makebindist.py +++ b/distribution/bin/makebindist.py @@ -88,6 +88,13 @@ class BerkeleyDB(ThirdParty): self.languages = ["java"] self.location = jarlocations.get(str(platform), None) + def getJar(self): + if self.location: + if self.location.endswith(".jar"): + return self.location + else: + return os.path.join(self.location, "lib", "db.jar") + def getFiles(self, platform): files = [ os.path.join("lib", "db.jar"), os.path.join("bin", "db_*") ] files += platform.getSharedLibraryFiles(self.location, os.path.join("lib", "*")) diff --git a/sl/src/Ice/Exception.cs b/sl/src/Ice/Exception.cs index e915eac5a35..2820206a414 100644 --- a/sl/src/Ice/Exception.cs +++ b/sl/src/Ice/Exception.cs @@ -25,7 +25,7 @@ namespace IceInternal namespace Ice { - public abstract class Exception : System.ApplicationException, System.ICloneable + public abstract class Exception : System.Exception, System.ICloneable { public object Clone() { |