Removed BerkeleyDB dependencies from Java build system, travis

1 files changed, 0 insertions, 79 deletions

diff --git a/scripts/TestUtil.py b/scripts/TestUtil.py
index 6b22fbc1faf..f93748e6cca 100755
--- a/scripts/TestUtil.py
+++ b/scripts/TestUtil.py
@@ -1143,7 +1143,6 @@ def getCommandLine(exe, config, options = "", interpreterOptions = ""):
             output.write("-d64 ")
         if not config.ipv6:
             output.write("-Djava.net.preferIPv4Stack=true ")
-        output.write(getJavaLibraryPath())
         if interpreterOptions:
             output.write(" " + interpreterOptions)
         output.write(" " + exe + " ")
@@ -1795,30 +1794,6 @@ def getCppLibDir(lang = None):
         return libDir
     return None
 
-def getJavaLibraryPath():
-    if isWin32():
-        if iceHome:
-            return "-Djava.library.path=\"%s\" " % os.path.join(iceHome, "bin\\x64" if x64 else "bin")
-        else:
-            return ("-Djava.library.path=\"%s\" " % os.path.join(getIceDir("cpp"), "third-party-packages",
-                    "berkeley.db.java7", "build", "native", "bin", "x64" if x64 else "Win32"))
-    elif isDarwin():
-        if os.path.exists('/usr/local/opt/ice/libexec/lib'):
-            return "-Djava.library.path=/usr/local/opt/ice/libexec/lib "
-        else:
-            return "-Djava.library.path=/usr/local/opt/berkeley-db53/lib "
-    elif isRhel() or isSles():
-        libpath = ("/usr/lib64" if x64 else "/usr/lib")
-        if "LD_LIBRARY_PATH" in os.environ:
-            libpath = os.environ["LD_LIBRARY_PATH"] + ":" + libpath
-        return "-Djava.library.path=%s " % libpath
-    elif isUbuntu():
-        libpath = ("/usr/lib/x86_64-linux-gnu" if x64 else "/usr/lib/i386-linux-gnu")
-        if "LD_LIBRARY_PATH" in os.environ:
-            libpath = os.environ["LD_LIBRARY_PATH"] + ":" + libpath
-        return "-Djava.library.path=%s " % libpath
-    return ''
-
 def getServiceDir():
     global serviceDir
     if serviceDir is None:
@@ -1896,60 +1871,6 @@ def getTestEnv(lang, testdir):
             addPathToEnv("NODE_PATH", os.path.join(getIceDir("js", testdir), "src"), env)
 
     #
-    # DB CLASSPATH, in Windows db.jar come from Ice home or
-    # from Third Party Home
-    #
-    if lang in ["cpp", "java", "csharp", "python", "ruby"]:
-        if isWin32():
-            if iceHome:
-                addClasspath(os.path.join(getIceDir("java", testdir), "lib", "db.jar"), env)
-            else:
-                mode = getBuildMode(os.path.join(getIceDir("cpp"), "bin"))
-                configuration = "Debug" if mode == "debug" else "Release"
-                platform = "x64" if x64 else "Win32"
-                pkgdir = os.path.join(getIceDir("cpp"), "third-party-packages")
-                pkgsubdir = os.path.join("build", "native", "bin", platform)
-
-                if isMINGW():
-                    addPathToEnv("PATH", os.path.join(pkgdir, "bzip2.mingw4.7.2", pkgsubdir), env)
-                else:
-                    platformtoolset = ""
-                    if isVC100():
-                        platformtoolset = "v100"
-                    elif isVC110():
-                        platformtoolset = "v110"
-                    elif isVC120():
-                        platformtoolset = "v120"
-                    elif isVC140():
-                        platformtoolset = "v140"
-
-                    #
-                    # For Debug builds we need to add Release binaries to path to be able to use db_xxx tools and
-                    # bzip2 to be able to use protocol compression with .NET
-                    #
-                    if configuration == "Debug":
-                      addPathToEnv("PATH", os.path.join(pkgdir, "berkeley.db.{0}".format(platformtoolset), pkgsubdir,
-                                   "Release"), env)
-                      addPathToEnv("PATH", os.path.join(pkgdir, "bzip2.{0}".format(platformtoolset), pkgsubdir,
-                                   "Release"), env)
-
-                    for package in ["berkeley.db.{0}", "bzip2.{0}", "expat.{0}"]:
-                      addPathToEnv("PATH", os.path.join(pkgdir, package.format(platformtoolset), pkgsubdir,
-                                   configuration), env)
-
-                    if lang == "java":
-                      addPathToEnv("PATH", os.path.join(pkgdir, "berkeley.db.java7", pkgsubdir), env)
-                      addClasspath(os.path.join(pkgdir, "berkeley.db.java7", "build", "native", "lib", "db.jar"), env)
-
-        elif isDarwin():
-            if os.path.exists('/usr/local/opt/ice/libexec/lib'):
-                addClasspath(os.path.join("/", "usr", "local", "opt", "ice", "libexec", "lib", "db.jar"), env)
-            else:
-                addClasspath(os.path.join("/", "usr", "local", "opt", "berkeley-db53", "db.jar"), env)
-        else:
-            addClasspath(os.path.join("/", "usr", "share", "java", "db.jar"), env)
-
-    #
     # If Ice is installed on the system, set the CLASSPATH for Java and
     # NODE_PATH for JavaScript
     #